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

Diff Legend

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