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

Diff Legend

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