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.55 by root, Fri Nov 30 06:20:43 2001 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

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

Diff Legend

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