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

Diff Legend

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