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

Diff Legend

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