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

Diff Legend

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