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.45 by root, Sun Nov 11 03:32:19 2001 UTC vs.
Revision 1.92 by root, Tue Mar 9 16:46:23 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;
11use POSIX ();
8 12
9no utf8; 13use Compress::Zlib ();
10use bytes; 14
15use common::sense;
11 16
12# at least on my machine, this thingy serves files 17# at least on my machine, this thingy serves files
13# quite a bit faster than apache, ;) 18# quite a bit faster than apache, ;)
14# and quite a bit slower than thttpd :( 19# and quite a bit slower than thttpd :(
15 20
16$SIG{PIPE} = 'IGNORE'; 21$SIG{PIPE} = 'IGNORE';
17 22
18our $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}
19 46
20if ($ACCESS_LOG) { 47if ($ACCESS_LOG) {
21 use IO::Handle; 48 use IO::Handle;
22 open $accesslog, ">>$ACCESS_LOG" 49 open $accesslog, ">>$ACCESS_LOG"
23 or die "$ACCESS_LOG: $!"; 50 or die "$ACCESS_LOG: $!";
… …
25} 52}
26 53
27sub slog { 54sub slog {
28 my $level = shift; 55 my $level = shift;
29 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);
30 printf "---: $format\n", @_; 61 print "$NOW: $format\n";
62 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
31} 63}
32 64
33our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 65our $connections = new Coro::Semaphore $::MAX_CONNECTS || 250;
34our $httpevent = new Coro::Signal; 66our $httpevent = new Coro::Signal;
35 67
36our $wait_factor = 0.95; 68our $queue_file = new transferqueue $::MAX_TRANSFERS;
69our $queue_index = new transferqueue 10;
37 70
38our @transfers = ( 71our $tbf_top = new tbf rate => $::TBF_RATE || 100000;
39 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
40 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
41);
42 72
43my @newcons; 73my $unused_bytes = 0;
44my @pool; 74my $unused_last = time;
45 75
46# one "execution thread" 76sub unused_bandwidth {
47sub handler { 77 $unused_bytes += $_[0];
48 while () { 78 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
49 if (@newcons) { 79 $unused_last = $NOW;
50 eval { 80 $unused_bytes = 0;
51 conn->new(@{pop @newcons})->handle; 81 $queue_file->force_wake_next
52 }; 82 and slog 1, "forced filetransfer due to unused bandwidth";
53 slog 1, "$@" if $@ && !ref $@;
54 $connections->up;
55 } else {
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
173 $self->{remote_addr} =
154 $self->{remote_addr} = inet_ntoa $iaddr; 174 $self->{remote_id} = inet_ntoa $iaddr;
175
155 $self->{time} = $::NOW; 176 $self->{time} = $::NOW;
156 177
178 weaken ($Coro::current->{conn} = $self);
179
157 $::conns++; 180 ++$::conns;
181 $::maxconns = $::conns if $::conns > $::maxconns;
158 182
159 $self; 183 $self
160} 184}
161 185
162sub DESTROY { 186sub DESTROY {
163 my $self = shift; 187 my $self = shift;
188
164 $::conns--; 189 --$::conns;
165 $self->eoconn;
166} 190}
167 191
168# end of connection 192sub prune_cache {
169sub eoconn { 193 my $hash = $_[0];
170 my $self = shift;
171 194
172 # clean up hints 195 for (keys %$hash) {
173 delete $conn{$self->{remote_id}}{$self*1}; 196 if (ref $hash->{$_} eq HASH::) {
174 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 197 prune_cache($hash->{$_});
175 198 unless (scalar keys %{$hash->{$_}}) {
176 $httpevent->broadcast; 199 delete $hash->{$_};
200 }
201 }
202 }
177} 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;
178 215
179sub slog { 216sub slog {
180 my $self = shift; 217 my $self = shift;
181 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 218 main::slog($_[0], "$self->{remote_id}> $_[1]");
182} 219}
183 220
184sub response { 221sub response {
185 my ($self, $code, $msg, $hdr, $content) = @_; 222 my ($self, $code, $msg, $hdr, $content) = @_;
186 my $res = "HTTP/1.1 $code $msg\015\012"; 223 my $res = "HTTP/1.1 $code $msg\015\012";
224 my $GZ = "";
187 225
226 if (exists $hdr->{Connection}) {
227 if ($hdr->{Connection} =~ /close/) {
188 $self->{h}{connection} = "close" 228 $self->{h}{connection} = "close"
189 if exists $hdr->{Connection} # to avoid "empty" header lines due to vivification 229 }
190 and $hdr->{Connection} =~ /close/; 230 } else {
231 if ($self->{version} < 1.1) {
232 if ($self->{h}{connection} =~ /keep-alive/i) {
233 $hdr->{Connection} = "Keep-Alive";
234 } else {
235 $self->{h}{connection} = "close"
236 }
237 }
238 }
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 }
191 252
192 $res .= "Date: $HTTP_NOW\015\012"; 253 $res .= "Date: $HTTP_NOW\015\012";
254 $res .= "Server: $::NAME\015\012";
193 255
194 while (my ($h, $v) = each %$hdr) { 256 while (my ($h, $v) = each %$hdr) {
195 $res .= "$h: $v\015\012" 257 $res .= "$h: $v\015\012"
196 } 258 }
197 $res .= "\015\012"; 259 $res .= "\015\012";
198 260
199 $res .= $content if defined $content and $self->{method} ne "HEAD"; 261 $res .= $content if defined $content and $self->{method} ne "HEAD";
200 262
201 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 263 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
264 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
265 " \"$self->{h}{referer}\"\n";
202 266
203 print $accesslog $log if $accesslog; 267 print $::accesslog $log if $::accesslog;
204 print STDERR $log; 268 print STDERR $log;
205 269
206 $self->{written} += 270 $tbf_top->request(length $res, 1e6);
207 print {$self->{fh}} $res; 271 $self->{written} += print {$self->{fh}} $res;
208} 272}
209 273
210sub err { 274sub err {
211 my $self = shift; 275 my $self = shift;
212 my ($code, $msg, $hdr, $content) = @_; 276 my ($code, $msg, $hdr, $content) = @_;
… …
216 $hdr->{"Content-Type"} = "text/plain"; 280 $hdr->{"Content-Type"} = "text/plain";
217 $hdr->{"Content-Length"} = length $content; 281 $hdr->{"Content-Length"} = length $content;
218 } 282 }
219 $hdr->{"Connection"} = "close"; 283 $hdr->{"Connection"} = "close";
220 284
221 $self->response($code, $msg, $hdr, $content); 285 $self->response ($code, $msg, $hdr, $content);
222 286
223 die bless {}, err::; 287 die bless {}, err::
224} 288}
225 289
226sub handle { 290sub handle {
227 my $self = shift; 291 my $self = shift;
228 my $fh = $self->{fh}; 292 my $fh = $self->{fh};
229 293
230 my $host; 294 my $host;
231 295
232 $fh->timeout($::REQ_TIMEOUT); 296 $fh->timeout($::REQ_TIMEOUT);
233 while() { 297 while () {
234 $self->{reqs}++; 298 $self->{reqs}++;
235 299
236 # read request and parse first line 300 # read request and parse first line
237 my $req = $fh->readline("\015\012\015\012"); 301 my $req = $fh->readline("\015\012\015\012");
238 302
… …
267 my (%hdr, $h, $v); 331 my (%hdr, $h, $v);
268 332
269 $hdr{lc $1} .= ",$2" 333 $hdr{lc $1} .= ",$2"
270 while $req =~ /\G 334 while $req =~ /\G
271 ([^:\000-\040]+): 335 ([^:\000-\040]+):
272 [\008\040]* 336 [\011\040]*
273 ((?: [^\015\012]+ | \015\012[\008\040] )*) 337 ((?: [^\015\012]+ | \015\012[\011\040] )*)
274 \015\012 338 \015\012
275 /gxc; 339 /gxc;
276 340
277 $req =~ /\G\015\012$/ 341 $req =~ /\G\015\012$/
278 or $self->err(400, "bad request"); 342 or $self->err(400, "bad request");
… …
290 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 354 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
291 } 355 }
292 356
293 $self->{remote_id} = $id; 357 $self->{remote_id} = $id;
294 358
359 weaken (local $conn{$id}{$self*1} = $self);
360
295 if ($blocked{$id}) { 361 if ($blocked{$id}) {
296 $self->err_blocked($blocked{$id}) 362 $self->err_blocked
297 if $blocked{$id} > $::NOW; 363 if $blocked{$id}[0] > $::NOW;
298 364
299 delete $blocked{$id}; 365 delete $blocked{$id};
300 }
301
302 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
303 my $delay = $::PER_TIMEOUT + $::NOW + 15;
304 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
305 if ($delay < $::NOW) {
306 $self->slog(2, "blocked ip $id");
307 $self->err_blocked;
308 } else {
309 $httpevent->wait;
310 }
311 }
312 } 366 }
313 367
314 # find out server name and port 368 # find out server name and port
315 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 369 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
316 $host = $1; 370 $host = $1;
… …
327 $host = inet_ntoa $host; 381 $host = inet_ntoa $host;
328 } 382 }
329 383
330 $self->{server_name} = $host; 384 $self->{server_name} = $host;
331 385
332 # enter ourselves into various lists
333 weaken ($conn{$id}{$self*1} = $self);
334 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 386 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
335 387
336 eval { 388 eval {
337 $self->map_uri; 389 $self->map_uri;
338 $self->respond; 390 $self->respond;
339 }; 391 };
340 392
341 $self->eoconn;
342
343 die if $@ && !ref $@; 393 die if $@ && !ref $@;
344 394
345 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 395 last if $self->{h}{connection} =~ /close/i;
346 396
347 $httpevent->broadcast; 397 $httpevent->broadcast;
348 398
349 $fh->timeout($::PER_TIMEOUT); 399 $fh->timeout($::PER_TIMEOUT);
350 } 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;
351} 409}
352 410
353# uri => path mapping 411# uri => path mapping
354sub map_uri { 412sub map_uri {
355 my $self = shift; 413 my $self = shift;
356 my $host = $self->{server_name}; 414 my $host = $self->{server_name};
357 my $uri = $self->{uri}; 415 my $uri = $self->{uri};
416
417 $host =~ /[\/\\]/
418 and $self->err(400, "bad request");
358 419
359 # some massaging, also makes it more secure 420 # some massaging, also makes it more secure
360 $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;
361 $uri =~ s%//+%/%g; 422 $uri =~ s%//+%/%g;
362 $uri =~ s%/\.(?=/|$)%%g; 423 $uri =~ s%/\.(?=/|$)%%g;
… …
402 463
403sub respond { 464sub respond {
404 my $self = shift; 465 my $self = shift;
405 my $path = $self->{path}; 466 my $path = $self->{path};
406 467
407 stat $path 468 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
408 or $self->err(404, "not found"); 469 if ($::internal{$1}) {
409 470 $::internal{$1}->($self);
410 $self->{stat} = [stat _];
411
412 # idiotic netscape sends idiotic headers AGAIN
413 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
414 ? str2time $1 : 0;
415
416 if (-d _ && -r _) {
417 # directory
418 if ($path !~ /\/$/) {
419 # create a redirect to get the trailing "/"
420 # we don't try to avoid the :80
421 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
422 } else { 471 } else {
423 $ims < $self->{stat}[9]
424 or $self->err(304, "not modified"); 472 $self->err (404, "not found");
473 }
474 } else {
425 475
426 if (-r "$path/index.html") { 476 Coro::AIO::aio_stat $path
427 # replace directory "size" by index.html filesize 477 and $self->err (404, "not found");
428 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 478
429 $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}/" });
430 } 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 {
431 $self->handle_dir; 500 $self->handle_dir;
432 } 501 }
433 } 502 }
434 } elsif (-f _ && -r _) { 503 } elsif (-f _ && -r _) {
435 -x _ and $self->err(403, "forbidden"); 504 -x _ and $self->err (403, "forbidden");
436 $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);
437 } else { 518 } else {
438 $self->err(404, "not found"); 519 $self->err (404, "not found");
520 }
439 } 521 }
440} 522}
441 523
442sub handle_dir { 524sub handle_dir {
443 my $self = shift; 525 my $self = shift;
444 my $idx = $self->diridx; 526 my $idx = $self->diridx;
445 527
446 $self->response(200, "ok", 528 $self->response (200, "ok",
447 { 529 {
448 "Content-Type" => "text/html", 530 "Content-Type" => "text/html; charset=utf-8",
449 "Content-Length" => length $idx, 531 "Content-Length" => length $idx,
532 "Last-Modified" => time2str ($self->{stat}[9]),
450 }, 533 },
451 $idx); 534 $idx);
452} 535}
453 536
454sub handle_file { 537sub handle_file {
455 my $self = shift; 538 my ($self, $queue, $tbf) = @_;
456 my $length = $self->{stat}[7]; 539 my $length = $self->{stat}[7];
457 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
458 my $hdr = { 540 my $hdr = {
459 "Last-Modified" => time2str ((stat _)[9]), 541 "Last-Modified" => time2str ((stat _)[9]),
542 "Accept-Ranges" => "bytes",
460 }; 543 };
461 544
462 my @code = (200, "ok"); 545 my @code = (200, "ok");
463 my ($l, $h); 546 my ($l, $h);
464 547
465 if ($self->{h}{range} =~ /^bytes=(.*)$/) { 548 if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
466 for (split /,/, $1) { 549 for (split /,/, $1) {
467 if (/^-(\d+)$/) { 550 if (/^-(\d+)$/) {
468 ($l, $h) = ($length - $1, $length - 1); 551 ($l, $h) = ($length - $1, $length - 1);
469 } elsif (/^(\d+)-(\d*)$/) { 552 } elsif (/^(\d+)-(\d*)$/) {
470 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 553 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
… …
474 } 557 }
475 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 558 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
476 } 559 }
477 $hdr->{"Content-Range"} = "bytes */$length"; 560 $hdr->{"Content-Range"} = "bytes */$length";
478 $hdr->{"Content-Length"} = $length; 561 $hdr->{"Content-Length"} = $length;
479 $self->err(416, "not satisfiable", $hdr, ""); 562 $self->err (416, "not satisfiable", $hdr, "");
480 563
481satisfiable: 564satisfiable:
482 # check for segmented downloads 565 # check for segmented downloads
483 if ($l && $::NO_SEGMENTED) { 566 if ($l && $::NO_SEGMENTED) {
484 my $delay = $::NOW + $::PER_TIMEOUT + 15; 567 my $timeout = $::NOW + 15;
485 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 568 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
486 if ($delay <= $::NOW) { 569 if ($timeout <= $::NOW) {
570 $self->block ($::BLOCKTIME, "segmented downloads are forbidden");
487 $self->err_segmented_download; 571 #$self->err_segmented_download;
488 } else { 572 } else {
489 $httpevent->broadcast; 573 $httpevent->wait;
490 } 574 }
491 } 575 }
492 } 576 }
493 577
494 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 578 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
502 586
503 $self->{path} =~ /\.([^.]+)$/; 587 $self->{path} =~ /\.([^.]+)$/;
504 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream"; 588 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
505 $hdr->{"Content-Length"} = $length; 589 $hdr->{"Content-Length"} = $length;
506 590
507 $self->response(@code, $hdr, ""); 591 $self->response (@code, $hdr, "");
508 592
509 if ($self->{method} eq "GET") { 593 if ($self->{method} eq "GET") {
510 $self->{time} = $::NOW; 594 $self->{time} = $::NOW;
511
512 my $fudge = $queue->[0]->waiters;
513 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
514
515 $queue->[1] *= $fudge;
516 my $transfer = $queue->[0]->guard;
517
518 if ($fudge != 1) {
519 $queue->[1] /= $fudge;
520 $queue->[1] = $queue->[1] * $::wait_factor
521 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
522 }
523 $self->{time} = $::NOW; 595 $self->{written} = 0;
524 596
525 $self->{fh}->writable or return; 597 my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
526
527 my ($fh, $buf, $r);
528 my $current = $Coro::current;
529 open $fh, "<", $self->{path}
530 or die "$self->{path}: late open failure ($!)"; 598 or die "$self->{path}: late open failure ($!)";
531 599
532 $h -= $l - 1; 600 $h -= $l - 1;
533 601
534 if (0) { 602 my $transfer = $queue->start_transfer ($h);
535 if ($l) { 603 my $locked;
536 sysseek $fh, $l, 0; 604 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
537 }
538 }
539 605
540 while ($h > 0) { 606 while ($h > 0) {
541 if (0) { 607 Coro::cede;
542 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 608 my $transfer_lock = $TRANSFER_LOCK->guard ($self->{remote_id});
609
610 unless ($locked) {
611 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
612 $bufsize = $::BUFSIZE;
613 $self->{time} = $::NOW;
614 $self->{written} = 0;
615 }
616 }
617
618 if ($blocked{$self->{remote_id}}) {
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
543 or last; 624 or last;
544 } else { 625
545 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 626 $tbf->request (length $buf);
546 $buf, 0, sub { 627 my $w = $self->{fh}->syswrite ($buf)
547 $r = $_[0];
548 Coro::ready($current);
549 });
550 &Coro::schedule;
551 last unless $r;
552 }
553 my $w = syswrite $self->{fh}, $buf
554 or last; 628 or last;
555 $::written += $w; 629 $::written += $w;
556 $self->{written} += $w; 630 $self->{written} += $w;
557 $l += $r; 631 $l += $w;
558 } 632 }
559 633
560 close $fh; 634 close $fh;
561 } 635 }
562} 636}
563 637
5641; 6381
639

Diff Legend

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