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