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

Diff Legend

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