ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.27 by root, Sun Aug 19 23:57:52 2001 UTC vs.
Revision 1.71 by root, Mon Jul 29 21:41:54 2002 UTC

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

Diff Legend

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