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

Diff Legend

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