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

Diff Legend

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