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

Diff Legend

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