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

Diff Legend

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