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

Diff Legend

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