ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.33 by root, Wed Aug 29 01:40:44 2001 UTC vs.
Revision 1.93 by root, Sun Mar 21 00:21:14 2010 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::SemaphoreSet;
3use Coro::Event; 4use Coro::EV;
4use Coro::Socket; 5use Coro::Socket;
6use Coro::Signal;
7use Coro::AIO ();
5 8
9use Fcntl;
6use HTTP::Date; 10use HTTP::Date;
11use POSIX ();
7 12
8no utf8; 13use Compress::Zlib ();
9use bytes;
10 14
11our @wait_time = (); # used to calculcate avg. waiting time 15use common::sense;
12our $wait_time_length = 25;
13 16
14# at least on my machine, this thingy serves files 17# at least on my machine, this thingy serves files
15# quite a bit faster than apache, ;) 18# quite a bit faster than apache, ;)
16# and quite a bit slower than thttpd :( 19# and quite a bit slower than thttpd :(
17 20
18$SIG{PIPE} = 'IGNORE'; 21$SIG{PIPE} = 'IGNORE';
19 22
20our $accesslog; 23our $accesslog;
24our $errorlog;
25our @listen_sockets;
26
27our $NOW;
28our $HTTP_NOW;
29
30our $ERROR_LOG;
31our $ACCESS_LOG;
32our $TRANSFER_LOCK = new Coro::SemaphoreSet; # lock to be acquired per ip
33
34our $update_time = EV::periodic 0, 1, undef, sub {
35 $NOW = time;
36 $HTTP_NOW = time2str $NOW;
37};
38$update_time->invoke;
39
40if ($ERROR_LOG) {
41 use IO::Handle;
42 open $errorlog, ">>$ERROR_LOG"
43 or die "$ERROR_LOG: $!";
44 $errorlog->autoflush(1);
45}
21 46
22if ($ACCESS_LOG) { 47if ($ACCESS_LOG) {
23 use IO::Handle; 48 use IO::Handle;
24 open $accesslog, ">>$ACCESS_LOG" 49 open $accesslog, ">>$ACCESS_LOG"
25 or die "$ACCESS_LOG: $!"; 50 or die "$ACCESS_LOG: $!";
… …
27} 52}
28 53
29sub slog { 54sub slog {
30 my $level = shift; 55 my $level = shift;
31 my $format = shift; 56 my $format = shift;
57
58 $format = sprintf $format, @_ if @_;
59
60 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
32 printf "---: $format\n", @_; 61 print "$NOW: $format\n";
62 print $errorlog "$NOW: $format\n", @_ if $errorlog;
33} 63}
34 64
35our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 65our $connections = new Coro::Semaphore $::MAX_CONNECTS || 250;
36our $transfers = new Coro::Semaphore $MAX_TRANSFER || 50; 66our $httpevent = new Coro::Signal;
37 67
38my @newcons; 68our $queue_file = new transferqueue $::MAX_TRANSFERS;
39my @pool; 69our $queue_index = new transferqueue 10;
40 70
41# one "execution thread" 71our $tbf_top = new tbf rate => $::TBF_RATE || 100000;
42sub handler { 72
73my $unused_bytes = 0;
74my $unused_last = time;
75
76sub unused_bandwidth {
77 $unused_bytes += $_[0];
78 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
79 $unused_last = $NOW;
80 $unused_bytes = 0;
81 $queue_file->force_wake_next
82 and slog 1, "forced filetransfer due to unused bandwidth";
83 }
84}
85
86sub listen_on {
87 my $listen = $_[0];
88
89 push @listen_sockets, $listen;
90
91 # the "main thread"
92 async {
93 slog 1, "accepting connections";
43 while () { 94 while () {
44 my $new = pop @newcons; 95 $connections->down;
45 if ($new) { 96 my @conn = $listen->accept;
97 #slog 3, "accepted @$connections ".scalar(@pool);
98
99 async_pool {
46 eval { 100 eval {
47 conn->new(@$new)->handle; 101 conn->new (@conn)->handle;
48 }; 102 };
49 slog 1, "$@" if $@ && !ref $@; 103 slog 1, "$@" if $@ && !ref $@;
104
105 $httpevent->broadcast; # only for testing, but doesn't matter much
106
50 $connections->up; 107 $connections->up;
51 } else {
52 last if @pool >= $MAX_POOL;
53 push @pool, $Coro::current;
54 schedule;
55 } 108 }
109 }
56 } 110 };
57} 111}
58 112
59my $http_port = new Coro::Socket 113my $http_port = new Coro::Socket
60 LocalAddr => $SERVER_HOST, 114 LocalAddr => $::SERVER_HOST,
61 LocalPort => $SERVER_PORT, 115 LocalPort => $::SERVER_PORT,
62 ReuseAddr => 1, 116 ReuseAddr => 1,
63 Listen => 50, 117 Listen => 50,
64 or die "unable to start server"; 118 or die "unable to start server";
65 119
66push @listen_sockets, $http_port; 120listen_on $http_port;
67 121
68our $NOW; 122if ($::SERVER_PORT2) {
69our $HTTP_NOW; 123 my $http_port = new Coro::Socket
124 LocalAddr => $::SERVER_HOST,
125 LocalPort => $::SERVER_PORT2,
126 ReuseAddr => 1,
127 Listen => 50,
128 or die "unable to start server";
70 129
71Event->timer(interval => 1, hard => 1, cb => sub { 130 listen_on $http_port;
72 $NOW = time; 131}
73 $HTTP_NOW = time2str $NOW;
74});
75
76# the "main thread"
77async {
78 slog 1, "accepting connections";
79 while () {
80 $connections->down;
81 push @newcons, [$http_port->accept];
82 #slog 3, "accepted @$connections ".scalar(@pool);
83 if (@pool) {
84 (pop @pool)->ready;
85 } else {
86 async \&handler;
87 }
88
89 }
90};
91 132
92package conn; 133package conn;
134
135use common::sense;
93 136
94use Socket; 137use Socket;
95use HTTP::Date; 138use HTTP::Date;
96use Convert::Scalar 'weaken'; 139use Convert::Scalar 'weaken';
97use Linux::AIO; 140use IO::AIO;
98 141
99Linux::AIO::min_parallel $::AIO_PARALLEL; 142IO::AIO::min_parallel $::AIO_PARALLEL;
100 143
101my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4; 144our $AIO_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
102
103Event->io(fd => Linux::AIO::poll_fileno,
104 poll => 'r', async => 1,
105 cb => \&Linux::AIO::poll_cb);
106 145
107our %conn; # $conn{ip}{self} => connobj 146our %conn; # $conn{ip}{self} => connobj
108our %uri; # $uri{ip}{uri}{self} 147our %uri; # $uri{ip}{uri}{self}
109our %blocked; 148our %blocked;
110our %mimetype; 149our %mimetype;
111 150
112sub read_mimetypes { 151sub read_mimetypes {
113 local *M;
114 if (open M, "<mime_types") { 152 if (open my $fh, "<mime_types") {
115 while (<M>) { 153 while (<$fh>) {
116 if (/^([^#]\S+)\t+(\S+)$/) { 154 if (/^([^#]\S+)\t+(\S+)$/) {
117 $mimetype{lc $1} = $2; 155 $mimetype{lc $1} = $2;
118 } 156 }
119 } 157 }
120 } else { 158 } else {
… …
124 162
125read_mimetypes; 163read_mimetypes;
126 164
127sub new { 165sub new {
128 my $class = shift; 166 my $class = shift;
167 my $fh = shift;
129 my $peername = shift; 168 my $peername = shift;
130 my $fh = shift;
131 my $self = bless { fh => $fh }, $class; 169 my $self = bless { fh => $fh }, $class;
132 my (undef, $iaddr) = unpack_sockaddr_in $peername 170 my (undef, $iaddr) = unpack_sockaddr_in $peername
133 or $self->err(500, "unable to decode peername"); 171 or $self->err (500, "unable to decode peername");
134 172
173 $self->{remote_addr} =
135 $self->{remote_addr} = inet_ntoa $iaddr; 174 $self->{remote_id} = inet_ntoa $iaddr;
175
136 $self->{time} = $::NOW; 176 $self->{time} = $::NOW;
137 177
138 # enter ourselves into various lists 178 weaken ($Coro::current->{conn} = $self);
139 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
140 179
141 $::conns++; 180 ++$::conns;
181 $::maxconns = $::conns if $::conns > $::maxconns;
142 182
143 $self; 183 $self
144} 184}
145 185
146sub DESTROY { 186sub DESTROY {
147 my $self = shift; 187 my $self = shift;
148 188
149 $::conns--; 189 --$::conns;
150
151 $self->eoconn;
152 delete $conn{$self->{remote_addr}}{$self*1};
153} 190}
154 191
155# end of connection 192sub prune_cache {
156sub eoconn { 193 my $hash = $_[0];
157 my $self = shift; 194
158 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 195 for (keys %$hash) {
196 if (ref $hash->{$_} eq HASH::) {
197 prune_cache($hash->{$_});
198 unless (scalar keys %{$hash->{$_}}) {
199 delete $hash->{$_};
200 }
201 }
202 }
159} 203}
204
205sub prune_caches {
206 prune_cache \%conn;
207 prune_cache \%uri;
208
209 for (keys %blocked) {
210 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
211 }
212}
213
214our $PRUNE_WATCHER = EV::timer 60, 60, \&prune_caches;
160 215
161sub slog { 216sub slog {
162 my $self = shift; 217 my $self = shift;
163 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 218 main::slog($_[0], "$self->{remote_id}> $_[1]");
164} 219}
165 220
166sub response { 221sub response {
167 my ($self, $code, $msg, $hdr, $content) = @_; 222 my ($self, $code, $msg, $hdr, $content) = @_;
168 my $res = "HTTP/1.1 $code $msg\015\012"; 223 my $res = "HTTP/1.1 $code $msg\015\012";
224 my $GZ = "";
169 225
170 $self->{h}{connection} ||= $hdr->{Connection}; 226 if (exists $hdr->{Connection}) {
227 if ($hdr->{Connection} =~ /close/) {
228 $self->{h}{connection} = "close"
229 }
230 } else {
231 if ($self->{version} < 1.1) {
232 if ($self->{h}{connection} =~ /keep-alive/i) {
233 $hdr->{Connection} = "Keep-Alive";
234 } else {
235 $self->{h}{connection} = "close"
236 }
237 }
238 }
239
240 if ($self->{method} ne "HEAD"
241 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
242 && 400 < length $content
243 && $hdr->{"Content-Length"} == length $content
244 && !exists $hdr->{"Content-Encoding"}
245 ) {
246 my $orig = length $content;
247 $hdr->{"Content-Encoding"} = "gzip";
248 $content = Compress::Zlib::memGzip(\$content);
249 $hdr->{"Content-Length"} = length $content;
250 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
251 }
171 252
172 $res .= "Date: $HTTP_NOW\015\012"; 253 $res .= "Date: $HTTP_NOW\015\012";
254 $res .= "Server: $::NAME\015\012";
173 255
174 while (my ($h, $v) = each %$hdr) { 256 while (my ($h, $v) = each %$hdr) {
175 $res .= "$h: $v\015\012" 257 $res .= "$h: $v\015\012"
176 } 258 }
177 $res .= "\015\012"; 259 $res .= "\015\012";
178 260
179 $res .= $content if defined $content and $self->{method} ne "HEAD"; 261 $res .= $content if defined $content and $self->{method} ne "HEAD";
180 262
181 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 263 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
264 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
265 " \"$self->{h}{referer}\"\n";
182 266
183 print $accesslog $log if $accesslog; 267 print $::accesslog $log if $::accesslog;
184 print STDERR $log; 268 print STDERR $log;
185 269
186 $self->{written} += 270 $tbf_top->request(length $res, 1e6);
187 print {$self->{fh}} $res; 271 $self->{written} += print {$self->{fh}} $res;
188} 272}
189 273
190sub err { 274sub err {
191 my $self = shift; 275 my $self = shift;
192 my ($code, $msg, $hdr, $content) = @_; 276 my ($code, $msg, $hdr, $content) = @_;
193 277
194 unless (defined $content) { 278 unless (defined $content) {
195 $content = "$code $msg"; 279 $content = "$code $msg\n";
196 $hdr->{"Content-Type"} = "text/plain"; 280 $hdr->{"Content-Type"} = "text/plain";
197 $hdr->{"Content-Length"} = length $content; 281 $hdr->{"Content-Length"} = length $content;
198 } 282 }
199 $hdr->{"Connection"} = "close"; 283 $hdr->{"Connection"} = "close";
200 284
201 $self->response($code, $msg, $hdr, $content); 285 $self->response ($code, $msg, $hdr, $content);
202 286
203 die bless {}, err::; 287 die bless {}, err::
204} 288}
205 289
206sub handle { 290sub handle {
207 my $self = shift; 291 my $self = shift;
208 my $fh = $self->{fh}; 292 my $fh = $self->{fh};
209 293
210 my $host; 294 my $host;
211 295
212 $fh->timeout($::REQ_TIMEOUT); 296 $fh->timeout($::REQ_TIMEOUT);
213 while() { 297 while () {
214 $self->{reqs}++; 298 $self->{reqs}++;
215 299
216 # read request and parse first line 300 # read request and parse first line
217 my $req = $fh->readline("\015\012\015\012"); 301 my $req = $fh->readline("\015\012\015\012");
218 302
… …
225 } 309 }
226 310
227 $self->{h} = {}; 311 $self->{h} = {};
228 312
229 $fh->timeout($::RES_TIMEOUT); 313 $fh->timeout($::RES_TIMEOUT);
230 my $ip = $self->{remote_addr};
231
232 if ($blocked{$ip}) {
233 $self->err_blocked($blocked{$ip})
234 if $blocked{$ip} > $::NOW;
235
236 delete $blocked{$ip};
237 }
238
239 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
240 my $delay = 120;
241 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
242 if ($delay <= 0) {
243 $self->slog(2, "blocked ip $ip");
244 $self->err_blocked;
245 } else {
246 Coro::Event::do_timer(after => 3);
247 $delay -= 3;
248 }
249 }
250 }
251 314
252 $req =~ /^(?:\015\012)? 315 $req =~ /^(?:\015\012)?
253 (GET|HEAD) \040+ 316 (GET|HEAD) \040+
254 ([^\040]+) \040+ 317 ([^\040]+) \040+
255 HTTP\/([0-9]+\.[0-9]+) 318 HTTP\/([0-9]+\.[0-9]+)
… …
268 my (%hdr, $h, $v); 331 my (%hdr, $h, $v);
269 332
270 $hdr{lc $1} .= ",$2" 333 $hdr{lc $1} .= ",$2"
271 while $req =~ /\G 334 while $req =~ /\G
272 ([^:\000-\040]+): 335 ([^:\000-\040]+):
273 [\008\040]* 336 [\011\040]*
274 ((?: [^\015\012]+ | \015\012[\008\040] )*) 337 ((?: [^\015\012]+ | \015\012[\011\040] )*)
275 \015\012 338 \015\012
276 /gxc; 339 /gxc;
277 340
278 $req =~ /\G\015\012$/ 341 $req =~ /\G\015\012$/
279 or $self->err(400, "bad request"); 342 or $self->err(400, "bad request");
280 343
281 $self->{h}{$h} = substr $v, 1 344 $self->{h}{$h} = substr $v, 1
282 while ($h, $v) = each %hdr; 345 while ($h, $v) = each %hdr;
346 }
347
348 # remote id should be unique per user
349 my $id = $self->{remote_addr};
350
351 if (exists $self->{h}{"client-ip"}) {
352 $id .= "[".$self->{h}{"client-ip"}."]";
353 } elsif (exists $self->{h}{"x-forwarded-for"}) {
354 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
355 }
356
357 $self->{remote_id} = $id;
358
359 weaken (local $conn{$id}{$self*1} = $self);
360
361 if ($blocked{$id}) {
362 $self->err_blocked
363 if $blocked{$id}[0] > $::NOW;
364
365 delete $blocked{$id};
283 } 366 }
284 367
285 # find out server name and port 368 # find out server name and port
286 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 369 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
287 $host = $1; 370 $host = $1;
… …
291 374
292 if (defined $host) { 375 if (defined $host) {
293 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 376 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
294 } else { 377 } else {
295 ($self->{server_port}, $host) 378 ($self->{server_port}, $host)
296 = unpack_sockaddr_in $self->{fh}->getsockname 379 = unpack_sockaddr_in $self->{fh}->sockname
297 or $self->err(500, "unable to get socket name"); 380 or $self->err(500, "unable to get socket name");
298 $host = inet_ntoa $host; 381 $host = inet_ntoa $host;
299 } 382 }
300 383
301 $self->{server_name} = $host; 384 $self->{server_name} = $host;
302 385
303 # remote id should be unique per user
304 $self->{remote_id} = $self->{remote_addr};
305
306 if (exists $self->{h}{"client-ip"}) {
307 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
308 } elsif (exists $self->{h}{"x-forwarded-for"}) {
309 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
310 }
311
312 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 386 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
313 387
314 eval { 388 eval {
315 $self->map_uri; 389 $self->map_uri;
316 $self->respond; 390 $self->respond;
317 }; 391 };
318 392
319 $self->eoconn;
320
321 die if $@ && !ref $@; 393 die if $@ && !ref $@;
322 394
323 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 395 last if $self->{h}{connection} =~ /close/i;
396
397 $httpevent->broadcast;
324 398
325 $fh->timeout($::PER_TIMEOUT); 399 $fh->timeout($::PER_TIMEOUT);
326 } 400 }
401}
402
403sub block {
404 my $self = shift;
405
406 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
407 $self->slog(2, "blocked ip $self->{remote_id}");
408 $self->err_blocked;
327} 409}
328 410
329# uri => path mapping 411# uri => path mapping
330sub map_uri { 412sub map_uri {
331 my $self = shift; 413 my $self = shift;
332 my $host = $self->{server_name}; 414 my $host = $self->{server_name};
333 my $uri = $self->{uri}; 415 my $uri = $self->{uri};
416
417 $host =~ /[\/\\]/
418 and $self->err(400, "bad request");
334 419
335 # some massaging, also makes it more secure 420 # some massaging, also makes it more secure
336 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 421 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
337 $uri =~ s%//+%/%g; 422 $uri =~ s%//+%/%g;
338 $uri =~ s%/\.(?=/|$)%%g; 423 $uri =~ s%/\.(?=/|$)%%g;
… …
378 463
379sub respond { 464sub respond {
380 my $self = shift; 465 my $self = shift;
381 my $path = $self->{path}; 466 my $path = $self->{path};
382 467
383 stat $path 468 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
384 or $self->err(404, "not found"); 469 if ($::internal{$1}) {
385 470 $::internal{$1}->($self);
386 $self->{stat} = [stat _];
387
388 # idiotic netscape sends idiotic headers AGAIN
389 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
390 ? str2time $1 : 0;
391
392 if (-d _ && -r _) {
393 # directory
394 if ($path !~ /\/$/) {
395 # create a redirect to get the trailing "/"
396 # we don't try to avoid the :80
397 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
398 } else { 471 } else {
399 $ims < $self->{stat}[9]
400 or $self->err(304, "not modified"); 472 $self->err (404, "not found");
473 }
474 } else {
401 475
402 if (-r "$path/index.html") { 476 Coro::AIO::aio_stat $path
403 $self->{path} .= "/index.html"; 477 and $self->err (404, "not found");
404 $self->handle_file; 478
479 $self->{stat} = [stat _];
480
481 # idiotic netscape sends idiotic headers AGAIN
482 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
483 ? str2time $1 : 0;
484
485 if (-d _ && -r _) {
486 # directory
487 if ($path !~ /\/$/) {
488 # create a redirect to get the trailing "/"
489 # we don't try to avoid the :80
490 $self->err (301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
405 } else { 491 } else {
492 $ims < $self->{stat}[9]
493 or $self->err (304, "not modified");
494
495 if (-r "$path/index.html") {
496 # replace directory "size" by index.html filesize
497 $self->{stat} = [stat ($self->{path} .= "/index.html")];
498 $self->handle_file ($queue_index, $tbf_top);
499 } else {
406 $self->handle_dir; 500 $self->handle_dir;
407 } 501 }
408 } 502 }
409 } elsif (-f _ && -r _) { 503 } elsif (-f _ && -r _) {
410 -x _ and $self->err(403, "forbidden"); 504 -x _ and $self->err (403, "forbidden");
411 $self->handle_file; 505
506 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
507 my $timeout = $::NOW + 10;
508 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
509 if ($timeout < $::NOW) {
510 $self->block($::BLOCKTIME, "too many connections");
511 } else {
512 $httpevent->wait;
513 }
514 }
515 }
516
517 $self->handle_file ($queue_file, $tbf_top);
412 } else { 518 } else {
413 $self->err(404, "not found"); 519 $self->err (404, "not found");
520 }
414 } 521 }
415} 522}
416 523
417sub handle_dir { 524sub handle_dir {
418 my $self = shift; 525 my $self = shift;
419 my $idx = $self->diridx; 526 my $idx = $self->diridx;
420 527
421 $self->response(200, "ok", 528 $self->response (200, "ok",
422 { 529 {
423 "Content-Type" => "text/html", 530 "Content-Type" => "text/html; charset=utf-8",
424 "Content-Length" => length $idx, 531 "Content-Length" => length $idx,
532 "Last-Modified" => time2str ($self->{stat}[9]),
425 }, 533 },
426 $idx); 534 $idx);
427} 535}
428 536
429sub handle_file { 537sub handle_file {
430 my $self = shift; 538 my ($self, $queue, $tbf) = @_;
431 my $length = -s _; 539 my $length = $self->{stat}[7];
432 my $hdr = { 540 my $hdr = {
433 "Last-Modified" => time2str ((stat _)[9]), 541 "Last-Modified" => time2str ((stat _)[9]),
542 "Accept-Ranges" => "bytes",
434 }; 543 };
435 544
436 my @code = (200, "ok"); 545 my @code = (200, "ok");
437 my ($l, $h); 546 my ($l, $h);
438 547
439 if ($self->{h}{range} =~ /^bytes=(.*)$/) { 548 if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
440 for (split /,/, $1) { 549 for (split /,/, $1) {
441 if (/^-(\d+)$/) { 550 if (/^-(\d+)$/) {
442 ($l, $h) = ($length - $1, $length - 1); 551 ($l, $h) = ($length - $1, $length - 1);
443 } elsif (/^(\d+)-(\d*)$/) { 552 } elsif (/^(\d+)-(\d*)$/) {
444 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 553 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
… …
448 } 557 }
449 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 558 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
450 } 559 }
451 $hdr->{"Content-Range"} = "bytes */$length"; 560 $hdr->{"Content-Range"} = "bytes */$length";
452 $hdr->{"Content-Length"} = $length; 561 $hdr->{"Content-Length"} = $length;
453 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
454 $self->err(416, "not satisfiable", $hdr, ""); 562 $self->err (416, "not satisfiable", $hdr, "");
455 563
456satisfiable: 564satisfiable:
457 # check for segmented downloads 565 # check for segmented downloads
458 if ($l && $::NO_SEGMENTED) { 566 if ($l && $::NO_SEGMENTED) {
459 my $delay = 180; 567 my $timeout = $::NOW + 15;
460 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 568 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
461 if ($delay <= 0) { 569 if ($timeout <= $::NOW) {
570 $self->block ($::BLOCKTIME, "segmented downloads are forbidden");
462 $self->err_segmented_download; 571 #$self->err_segmented_download;
463 } else { 572 } else {
464 Coro::Event::do_timer(after => 3); $delay -= 3; 573 $httpevent->wait;
465 } 574 }
466 } 575 }
467 } 576 }
468 577
469 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 578 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
477 586
478 $self->{path} =~ /\.([^.]+)$/; 587 $self->{path} =~ /\.([^.]+)$/;
479 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream"; 588 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
480 $hdr->{"Content-Length"} = $length; 589 $hdr->{"Content-Length"} = $length;
481 590
482 $self->response(@code, $hdr, ""); 591 $self->response (@code, $hdr, "");
483 592
484 if ($self->{method} eq "GET") { 593 if ($self->{method} eq "GET") {
485 $self->{time} = $::NOW; 594 $self->{time} = $::NOW;
486
487 my $transfer = $::transfers->guard;
488 $self->{fh}->writable or return;
489
490 push @::wait_time, $::NOW - $self->{time};
491 shift @::wait_time if @wait_time > $wait_time_length;
492 $self->{time} = $::NOW; 595 $self->{written} = 0;
493 596
494 my ($fh, $buf, $r); 597 my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
495 my $current = $Coro::current;
496 open $fh, "<", $self->{path}
497 or die "$self->{path}: late open failure ($!)"; 598 or die "$self->{path}: late open failure ($!)";
498 599
499 $h -= $l - 1; 600 $h -= $l - 1;
500 601
501 if (0) { 602 my $transfer = $queue->start_transfer ($h);
502 if ($l) { 603 my $locked;
503 sysseek $fh, $l, 0; 604 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
504 }
505 }
506 605
507 while ($h > 0) { 606 while ($h > 0) {
508 if (0) { 607 Coro::cede;
509 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 608 my $transfer_lock = $TRANSFER_LOCK->guard ($self->{remote_id});
609
610 unless ($locked) {
611 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
612 $bufsize = $::BUFSIZE;
613 $self->{time} = $::NOW;
614 $self->{written} = 0;
615 }
616 }
617
618 if ($blocked{$self->{remote_id}}) {
619 $self->{h}{connection} = "close";
620 die bless {}, err::;
621 }
622
623 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
510 or last; 624 or last;
511 } else { 625
512 undef $buf; 626 $tbf->request (length $buf);
513 $aio_requests->down;
514 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
515 $buf, 0, sub {
516 $r = $_[0];
517 $current->ready;
518 });
519 &Coro::schedule;
520 $aio_requests->up;
521 last unless $r;
522 }
523 my $w = $self->{fh}->syswrite($buf) 627 my $w = $self->{fh}->syswrite ($buf)
524 or last; 628 or last;
525 $::written += $w; 629 $::written += $w;
526 $self->{written} += $w; 630 $self->{written} += $w;
527 $l += $r; 631 $l += $w;
528 } 632 }
529 633
530 close $fh; 634 close $fh;
531 } 635 }
532} 636}
533 637
5341; 6381
639

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines