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.36 by root, Sun Sep 2 00:54:00 2001 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

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

Diff Legend

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