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.28 by root, Mon Aug 20 16:58:19 2001 UTC vs.
Revision 1.69 by root, Wed May 22 00:33:26 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 => 150000;
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 $self->{h}{connection} ||= $hdr->{Connection}; 209 if (exists $hdr->{Connection}) {
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 }
156 222
157 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 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";
158 237
159 while (my ($h, $v) = each %$hdr) { 238 while (my ($h, $v) = each %$hdr) {
160 $res .= "$h: $v\015\012" 239 $res .= "$h: $v\015\012"
161 } 240 }
162 $res .= "\015\012"; 241 $res .= "\015\012";
163 242
164 $res .= $content if defined $content and $self->{method} ne "HEAD"; 243 $res .= $content if defined $content and $self->{method} ne "HEAD";
165 244
166 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 245 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
246 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
247 " \"$self->{h}{referer}\"\n";
167 248
168 print $accesslog $log if $accesslog; 249 print $::accesslog $log if $::accesslog;
169 print STDERR $log; 250 print STDERR $log;
170 251
171 $self->{written} += 252 $tbf_top->request(length $res, 1e6);
172 print {$self->{fh}} $res; 253 $self->{written} += print {$self->{fh}} $res;
173} 254}
174 255
175sub err { 256sub err {
176 my $self = shift; 257 my $self = shift;
177 my ($code, $msg, $hdr, $content) = @_; 258 my ($code, $msg, $hdr, $content) = @_;
178 259
179 unless (defined $content) { 260 unless (defined $content) {
180 $content = "$code $msg"; 261 $content = "$code $msg\n";
181 $hdr->{"Content-Type"} = "text/plain"; 262 $hdr->{"Content-Type"} = "text/plain";
182 $hdr->{"Content-Length"} = length $content; 263 $hdr->{"Content-Length"} = length $content;
183 } 264 }
184 $hdr->{"Connection"} = "close"; 265 $hdr->{"Connection"} = "close";
185 266
186 $self->response($code, $msg, $hdr, $content); 267 $self->response($code, $msg, $hdr, $content);
187 268
188 die bless {}, err::; 269 die bless {}, err::;
189} 270}
190 271
191sub err_blocked {
192 my $self = shift;
193 my $ip = $self->{remote_addr};
194 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
195
196 Coro::Event::do_timer(after => 20*rand);
197
198 $self->err(401, "too many connections",
199 {
200 "Content-Type" => "text/html",
201 "Retry-After" => $::BLOCKTIME,
202 "Warning" => "Please do NOT retry, you have been blocked",
203 "WWW-Authenticate" => "Basic realm=\"Please do NOT retry, you have been blocked\"",
204 "Connection" => "close",
205 },
206 <<EOF);
207<html>
208<head>
209<title>Too many connections</title>
210</head>
211<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000">
212
213<p>You have been blocked because you opened too many connections. You
214may retry at</p>
215
216 <p><blockquote>$time.</blockquote></p>
217
218<p>Until then, each new access will renew the block. You might want to have a
219look at the <a href="http://www.goof.com/pcg/marc/animefaq.html#connectionlimit">FAQ</a>.</p>
220
221</body></html>
222EOF
223}
224
225sub handle { 272sub handle {
226 my $self = shift; 273 my $self = shift;
227 my $fh = $self->{fh}; 274 my $fh = $self->{fh};
275
276 my $host;
228 277
229 $fh->timeout($::REQ_TIMEOUT); 278 $fh->timeout($::REQ_TIMEOUT);
230 while() { 279 while() {
231 $self->{reqs}++; 280 $self->{reqs}++;
232 281
… …
242 } 291 }
243 292
244 $self->{h} = {}; 293 $self->{h} = {};
245 294
246 $fh->timeout($::RES_TIMEOUT); 295 $fh->timeout($::RES_TIMEOUT);
247 my $ip = $self->{remote_addr};
248
249 if ($blocked{$ip}) {
250 $self->err_blocked($blocked{$ip})
251 if $blocked{$ip} > $::NOW;
252
253 delete $blocked{$ip};
254 }
255
256 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
257 $self->slog(2, "blocked ip $ip");
258 $self->err_blocked;
259 }
260 296
261 $req =~ /^(?:\015\012)? 297 $req =~ /^(?:\015\012)?
262 (GET|HEAD) \040+ 298 (GET|HEAD) \040+
263 ([^\040]+) \040+ 299 ([^\040]+) \040+
264 HTTP\/([0-9]+\.[0-9]+) 300 HTTP\/([0-9]+\.[0-9]+)
… …
277 my (%hdr, $h, $v); 313 my (%hdr, $h, $v);
278 314
279 $hdr{lc $1} .= ",$2" 315 $hdr{lc $1} .= ",$2"
280 while $req =~ /\G 316 while $req =~ /\G
281 ([^:\000-\040]+): 317 ([^:\000-\040]+):
282 [\008\040]* 318 [\011\040]*
283 ((?: [^\015\012]+ | \015\012[\008\040] )*) 319 ((?: [^\015\012]+ | \015\012[\011\040] )*)
284 \015\012 320 \015\012
285 /gxc; 321 /gxc;
286 322
287 $req =~ /\G\015\012$/ 323 $req =~ /\G\015\012$/
288 or $self->err(400, "bad request"); 324 or $self->err(400, "bad request");
289 325
290 $self->{h}{$h} = substr $v, 1 326 $self->{h}{$h} = substr $v, 1
291 while ($h, $v) = each %hdr; 327 while ($h, $v) = each %hdr;
292 } 328 }
293 329
330 # remote id should be unique per user
331 my $id = $self->{remote_addr};
332
333 if (exists $self->{h}{"client-ip"}) {
334 $id .= "[".$self->{h}{"client-ip"}."]";
335 } elsif (exists $self->{h}{"x-forwarded-for"}) {
336 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
337 }
338
339 $self->{remote_id} = $id;
340
341 weaken (local $conn{$id}{$self*1} = $self);
342
343 if ($blocked{$id}) {
344 $self->err_blocked
345 if $blocked{$id}[0] > $::NOW;
346
347 delete $blocked{$id};
348 }
349
350 # find out server name and port
351 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
352 $host = $1;
353 } else {
354 $host = $self->{h}{host};
355 }
356
357 if (defined $host) {
294 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 358 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
359 } else {
360 ($self->{server_port}, $host)
361 = unpack_sockaddr_in $self->{fh}->sockname
362 or $self->err(500, "unable to get socket name");
363 $host = inet_ntoa $host;
364 }
295 365
366 $self->{server_name} = $host;
367
296 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 368 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
297 369
298 eval { 370 eval {
299 $self->map_uri; 371 $self->map_uri;
300 $self->respond; 372 $self->respond;
301 }; 373 };
302 374
303 $self->eoconn;
304
305 die if $@ && !ref $@; 375 die if $@ && !ref $@;
306 376
307 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 377 last if $self->{h}{connection} =~ /close/i;
308 378
309 $self->slog(9, "persistent connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 379 $httpevent->broadcast;
380
310 $fh->timeout($::PER_TIMEOUT); 381 $fh->timeout($::PER_TIMEOUT);
311 } 382 }
383}
384
385sub block {
386 my $self = shift;
387
388 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
389 $self->slog(2, "blocked ip $self->{remote_id}");
390 $self->err_blocked;
312} 391}
313 392
314# uri => path mapping 393# uri => path mapping
315sub map_uri { 394sub map_uri {
316 my $self = shift; 395 my $self = shift;
317 my $host = $self->{h}{host} || "default"; 396 my $host = $self->{server_name};
318 my $uri = $self->{uri}; 397 my $uri = $self->{uri};
319 398
320 # some massaging, also makes it more secure 399 # some massaging, also makes it more secure
321 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 400 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
322 $uri =~ s%//+%/%g; 401 $uri =~ s%//+%/%g;
… …
332 $self->{path} = "$::DOCROOT/$host$uri"; 411 $self->{path} = "$::DOCROOT/$host$uri";
333 412
334 $self->access_check; 413 $self->access_check;
335} 414}
336 415
337sub server_address {
338 my $self = shift;
339 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
340 or $self->err(500, "unable to get socket name");
341 ((inet_ntoa $iaddr), $port);
342}
343
344sub server_host {
345 my $self = shift;
346 if (exists $self->{h}{host}) {
347 return $self->{h}{host};
348 } else {
349 return (($self->server_address)[0]);
350 }
351}
352
353sub server_hostport {
354 my $self = shift;
355 my ($host, $port);
356 if (exists $self->{h}{host}) {
357 ($host, $port) = ($self->{h}{host}, $self->{server_port});
358 } else {
359 ($host, $port) = $self->server_address;
360 }
361 $port = $port == 80 ? "" : ":$port";
362 $host.$port;
363}
364
365sub _cgi { 416sub _cgi {
366 my $self = shift; 417 my $self = shift;
367 my $path = shift; 418 my $path = shift;
368 my $fh; 419 my $fh;
369 420
370 # no two-way xxx supported 421 # no two-way xxx supported
371 if (0 == fork) { 422 if (0 == fork) {
372 open STDOUT, ">&".fileno($self->{fh}); 423 open STDOUT, ">&".fileno($self->{fh});
373 if (chdir $::DOCROOT) { 424 if (chdir $::DOCROOT) {
374 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 425 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
375 $ENV{HTTP_HOST} = $self->server_host; 426 $ENV{HTTP_HOST} = $self->{server_name};
376 $ENV{HTTP_PORT} = $self->{server_host}; 427 $ENV{HTTP_PORT} = $self->{server_port};
377 $ENV{SCRIPT_NAME} = $self->{name}; 428 $ENV{SCRIPT_NAME} = $self->{name};
378 exec $path; 429 exec $path;
379 } 430 }
380 Coro::State::_exit(0); 431 Coro::State::_exit(0);
381 } else { 432 } else {
433 die;
382 } 434 }
435}
436
437sub server_hostport {
438 $_[0]{server_port} == 80
439 ? $_[0]{server_name}
440 : "$_[0]{server_name}:$_[0]{server_port}";
383} 441}
384 442
385sub respond { 443sub respond {
386 my $self = shift; 444 my $self = shift;
387 my $path = $self->{path}; 445 my $path = $self->{path};
388 446
389 stat $path 447 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
390 or $self->err(404, "not found"); 448 if ($::internal{$1}) {
391 449 $::internal{$1}->($self);
392 $self->{stat} = [stat _];
393
394 # idiotic netscape sends idiotic headers AGAIN
395 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
396 ? str2time $1 : 0;
397
398 if (-d _ && -r _) {
399 # directory
400 if ($path !~ /\/$/) {
401 # create a redirect to get the trailing "/"
402 my $host = $self->server_hostport;
403 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
404 } else { 450 } else {
405 $ims < $self->{stat}[9] 451 $self->err(404, "not found");
452 }
453 } else {
454
455 stat $path
406 or $self->err(304, "not modified"); 456 or $self->err(404, "not found");
407 457
408 if (-r "$path/index.html") { 458 $self->{stat} = [stat _];
409 $self->{path} .= "/index.html"; 459
410 $self->handle_file; 460 # idiotic netscape sends idiotic headers AGAIN
461 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
462 ? str2time $1 : 0;
463
464 if (-d _ && -r _) {
465 # directory
466 if ($path !~ /\/$/) {
467 # create a redirect to get the trailing "/"
468 # we don't try to avoid the :80
469 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
411 } else { 470 } else {
471 $ims < $self->{stat}[9]
472 or $self->err(304, "not modified");
473
474 if (-r "$path/index.html") {
475 # replace directory "size" by index.html filesize
476 $self->{stat} = [stat ($self->{path} .= "/index.html")];
477 $self->handle_file($queue_index, $tbf_top);
478 } else {
412 $self->handle_dir; 479 $self->handle_dir;
413 } 480 }
414 } 481 }
415 } elsif (-f _ && -r _) { 482 } elsif (-f _ && -r _) {
416 -x _ and $self->err(403, "forbidden"); 483 -x _ and $self->err(403, "forbidden");
417 $self->handle_file; 484
485 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
486 my $timeout = $::NOW + 10;
487 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
488 if ($timeout < $::NOW) {
489 $self->block($::BLOCKTIME, "too many connections");
490 } else {
491 $httpevent->wait;
492 }
493 }
494 }
495
496 $self->handle_file($queue_file, $tbf_top);
418 } else { 497 } else {
419 $self->err(404, "not found"); 498 $self->err(404, "not found");
499 }
420 } 500 }
421} 501}
422 502
423sub handle_dir { 503sub handle_dir {
424 my $self = shift; 504 my $self = shift;
… …
426 506
427 $self->response(200, "ok", 507 $self->response(200, "ok",
428 { 508 {
429 "Content-Type" => "text/html", 509 "Content-Type" => "text/html",
430 "Content-Length" => length $idx, 510 "Content-Length" => length $idx,
511 "Last-Modified" => time2str ($self->{stat}[9]),
431 }, 512 },
432 $idx); 513 $idx);
433} 514}
434 515
435sub handle_file { 516sub handle_file {
436 my $self = shift; 517 my ($self, $queue, $tbf) = @_;
437 my $length = -s _; 518 my $length = $self->{stat}[7];
438 my $hdr = { 519 my $hdr = {
439 "Last-Modified" => time2str ((stat _)[9]), 520 "Last-Modified" => time2str ((stat _)[9]),
440 }; 521 };
441 522
442 my @code = (200, "ok"); 523 my @code = (200, "ok");
… …
454 } 535 }
455 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 536 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
456 } 537 }
457 $hdr->{"Content-Range"} = "bytes */$length"; 538 $hdr->{"Content-Range"} = "bytes */$length";
458 $hdr->{"Content-Length"} = $length; 539 $hdr->{"Content-Length"} = $length;
459 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
460 $self->err(416, "not satisfiable", $hdr, ""); 540 $self->err(416, "not satisfiable", $hdr, "");
461 541
462satisfiable: 542satisfiable:
463 # check for segmented downloads 543 # check for segmented downloads
464 if ($l && $::NO_SEGMENTED) { 544 if ($l && $::NO_SEGMENTED) {
545 my $timeout = $::NOW + 15;
465 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 546 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
466 $self->err(400, "segmented downloads are not allowed", 547 if ($timeout <= $::NOW) {
467 { "Content-Type" => "text/html", Connection => "close" }, <<EOF); 548 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
468<html> 549 #$self->err_segmented_download;
469<head> 550 } else {
470<title>Segmented downloads are not allowed</title> 551 $httpevent->wait;
471</head> 552 }
472<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000">
473
474<p>Segmented downloads are not allowed on this server. Please refer to the
475<a href="http://www.goof.com/pcg/marc/animefaq.html#segmented_downloads">FAQ</a>.</p>
476
477</body></html>
478EOF
479EOF
480 } 553 }
481 } 554 }
482 555
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 556 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
484 @code = (206, "partial content"); 557 @code = (206, "partial content");
… …
494 $hdr->{"Content-Length"} = $length; 567 $hdr->{"Content-Length"} = $length;
495 568
496 $self->response(@code, $hdr, ""); 569 $self->response(@code, $hdr, "");
497 570
498 if ($self->{method} eq "GET") { 571 if ($self->{method} eq "GET") {
572 $self->{time} = $::NOW;
573
574 my $current = $Coro::current;
575
499 my ($fh, $buf, $r); 576 my ($fh, $buf, $r);
500 my $current = $Coro::current; 577
501 open $fh, "<", $self->{path} 578 open $fh, "<", $self->{path}
502 or die "$self->{path}: late open failure ($!)"; 579 or die "$self->{path}: late open failure ($!)";
503 580
504 $h -= $l - 1; 581 $h -= $l - 1;
505 582
506 if (0) { 583 if (0) { # !AIO
507 if ($l) { 584 if ($l) {
508 sysseek $fh, $l, 0; 585 sysseek $fh, $l, 0;
509 } 586 }
510 } 587 }
588
589 my $transfer = $queue->start_transfer($h);
590 my $locked;
591 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
511 592
512 while ($h > 0) { 593 while ($h > 0) {
594 unless ($locked) {
595 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
596 $bufsize = $::BUFSIZE;
597 $self->{time} = $::NOW;
598 }
599 }
600
601 if ($blocked{$self->{remote_id}}) {
602 $self->{h}{connection} = "close";
603 die bless {}, err::;
604 }
605
513 if (0) { 606 if (0) { # !AIO
514 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 607 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
515 or last; 608 or last;
516 } else { 609 } else {
517 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 610 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
518 $buf, 0, sub { 611 $buf, 0, sub {
519 $r = $_[0]; 612 $r = $_[0];
520 $current->ready; 613 Coro::ready($current);
521 }); 614 });
522 &Coro::schedule; 615 &Coro::schedule;
523 last unless $r; 616 last unless $r;
524 } 617 }
525 my $w = $self->{fh}->syswrite($buf) 618
619 $tbf->request(length $buf);
620 my $w = syswrite $self->{fh}, $buf
526 or last; 621 or last;
527 $::written += $w; 622 $::written += $w;
528 $self->{written} += $w; 623 $self->{written} += $w;
529 $l += $r; 624 $l += $r;
530 } 625 }
531 }
532 626
533 close $fh; 627 close $fh;
628 }
534} 629}
535 630
5361; 6311;

Diff Legend

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