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.86 by root, Tue Jun 3 13:35:13 2008 UTC

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

Diff Legend

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