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.60 by root, Mon Dec 10 21:18:31 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;
166
121 $self->{time} = $::NOW; 167 $self->{time} = $::NOW;
122 168
123 # enter ourselves into various lists 169 weaken ($Coro::current->{conn} = $self);
124 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
125 170
126 $::conns++; 171 $::conns++;
172 $::maxconns = $::conns if $::conns > $::maxconns;
127 173
128 $self; 174 $self;
129} 175}
130 176
131sub DESTROY { 177sub DESTROY {
132 my $self = shift; 178 #my $self = shift;
133
134 $::conns--; 179 $::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} 180}
145 181
146sub slog { 182sub slog {
147 my $self = shift; 183 my $self = shift;
148 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
149} 185}
150 186
151sub response { 187sub response {
152 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
153 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
154 190
155 $self->{h}{connection} ||= $hdr->{Connection}; 191 if (exists $hdr->{Connection}) {
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 }
156 204
157 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 205 $res .= "Date: $HTTP_NOW\015\012";
158 206
159 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
160 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
161 } 209 }
162 $res .= "\015\012"; 210 $res .= "\015\012";
163 211
164 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
165 213
166 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
216 " \"$self->{h}{referer}\"\n";
167 217
168 print $accesslog $log if $accesslog; 218 print $accesslog $log if $accesslog;
169 print STDERR $log; 219 print STDERR $log;
170 220
171 $self->{written} += 221 $self->{written} +=
… …
175sub err { 225sub err {
176 my $self = shift; 226 my $self = shift;
177 my ($code, $msg, $hdr, $content) = @_; 227 my ($code, $msg, $hdr, $content) = @_;
178 228
179 unless (defined $content) { 229 unless (defined $content) {
180 $content = "$code $msg"; 230 $content = "$code $msg\n";
181 $hdr->{"Content-Type"} = "text/plain"; 231 $hdr->{"Content-Type"} = "text/plain";
182 $hdr->{"Content-Length"} = length $content; 232 $hdr->{"Content-Length"} = length $content;
183 } 233 }
184 $hdr->{"Connection"} = "close"; 234 $hdr->{"Connection"} = "close";
185 235
186 $self->response($code, $msg, $hdr, $content); 236 $self->response($code, $msg, $hdr, $content);
187 237
188 die bless {}, err::; 238 die bless {}, err::;
189} 239}
190 240
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 { 241sub handle {
226 my $self = shift; 242 my $self = shift;
227 my $fh = $self->{fh}; 243 my $fh = $self->{fh};
244
245 my $host;
228 246
229 $fh->timeout($::REQ_TIMEOUT); 247 $fh->timeout($::REQ_TIMEOUT);
230 while() { 248 while() {
231 $self->{reqs}++; 249 $self->{reqs}++;
232 250
… …
242 } 260 }
243 261
244 $self->{h} = {}; 262 $self->{h} = {};
245 263
246 $fh->timeout($::RES_TIMEOUT); 264 $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 265
261 $req =~ /^(?:\015\012)? 266 $req =~ /^(?:\015\012)?
262 (GET|HEAD) \040+ 267 (GET|HEAD) \040+
263 ([^\040]+) \040+ 268 ([^\040]+) \040+
264 HTTP\/([0-9]+\.[0-9]+) 269 HTTP\/([0-9]+\.[0-9]+)
… …
289 294
290 $self->{h}{$h} = substr $v, 1 295 $self->{h}{$h} = substr $v, 1
291 while ($h, $v) = each %hdr; 296 while ($h, $v) = each %hdr;
292 } 297 }
293 298
299 # remote id should be unique per user
300 my $id = $self->{remote_addr};
301
302 if (exists $self->{h}{"client-ip"}) {
303 $id .= "[".$self->{h}{"client-ip"}."]";
304 } elsif (exists $self->{h}{"x-forwarded-for"}) {
305 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
306 }
307
308 $self->{remote_id} = $id;
309
310 weaken (local $conn{$id}{$self*1} = $self);
311
312 if ($blocked{$id}) {
313 $self->err_blocked
314 if $blocked{$id}[0] > $::NOW;
315
316 delete $blocked{$id};
317 }
318
319 # find out server name and port
320 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
321 $host = $1;
322 } else {
323 $host = $self->{h}{host};
324 }
325
326 if (defined $host) {
294 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 327 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
328 } else {
329 ($self->{server_port}, $host)
330 = unpack_sockaddr_in $self->{fh}->sockname
331 or $self->err(500, "unable to get socket name");
332 $host = inet_ntoa $host;
333 }
295 334
335 $self->{server_name} = $host;
336
296 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 337 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
297 338
298 eval { 339 eval {
299 $self->map_uri; 340 $self->map_uri;
300 $self->respond; 341 $self->respond;
301 }; 342 };
302 343
303 $self->eoconn;
304
305 die if $@ && !ref $@; 344 die if $@ && !ref $@;
306 345
307 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 346 last if $self->{h}{connection} =~ /close/i;
308 347
309 $self->slog(9, "persistent connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 348 $httpevent->broadcast;
349
310 $fh->timeout($::PER_TIMEOUT); 350 $fh->timeout($::PER_TIMEOUT);
311 } 351 }
352}
353
354sub block {
355 my $self = shift;
356
357 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
358 $self->slog(2, "blocked ip $self->{remote_id}");
359 $self->err_blocked;
312} 360}
313 361
314# uri => path mapping 362# uri => path mapping
315sub map_uri { 363sub map_uri {
316 my $self = shift; 364 my $self = shift;
317 my $host = $self->{h}{host} || "default"; 365 my $host = $self->{server_name};
318 my $uri = $self->{uri}; 366 my $uri = $self->{uri};
319 367
320 # some massaging, also makes it more secure 368 # some massaging, also makes it more secure
321 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 369 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
322 $uri =~ s%//+%/%g; 370 $uri =~ s%//+%/%g;
… …
332 $self->{path} = "$::DOCROOT/$host$uri"; 380 $self->{path} = "$::DOCROOT/$host$uri";
333 381
334 $self->access_check; 382 $self->access_check;
335} 383}
336 384
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 { 385sub _cgi {
366 my $self = shift; 386 my $self = shift;
367 my $path = shift; 387 my $path = shift;
368 my $fh; 388 my $fh;
369 389
370 # no two-way xxx supported 390 # no two-way xxx supported
371 if (0 == fork) { 391 if (0 == fork) {
372 open STDOUT, ">&".fileno($self->{fh}); 392 open STDOUT, ">&".fileno($self->{fh});
373 if (chdir $::DOCROOT) { 393 if (chdir $::DOCROOT) {
374 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 394 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
375 $ENV{HTTP_HOST} = $self->server_host; 395 $ENV{HTTP_HOST} = $self->{server_name};
376 $ENV{HTTP_PORT} = $self->{server_host}; 396 $ENV{HTTP_PORT} = $self->{server_port};
377 $ENV{SCRIPT_NAME} = $self->{name}; 397 $ENV{SCRIPT_NAME} = $self->{name};
378 exec $path; 398 exec $path;
379 } 399 }
380 Coro::State::_exit(0); 400 Coro::State::_exit(0);
381 } else { 401 } else {
402 die;
382 } 403 }
404}
405
406sub server_hostport {
407 $_[0]{server_port} == 80
408 ? $_[0]{server_name}
409 : "$_[0]{server_name}:$_[0]{server_port}";
383} 410}
384 411
385sub respond { 412sub respond {
386 my $self = shift; 413 my $self = shift;
387 my $path = $self->{path}; 414 my $path = $self->{path};
388 415
389 stat $path 416 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
390 or $self->err(404, "not found"); 417 if ($::internal{$1}) {
391 418 $::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 { 419 } else {
405 $ims < $self->{stat}[9] 420 $self->err(404, "not found");
421 }
422 } else {
423
424 stat $path
406 or $self->err(304, "not modified"); 425 or $self->err(404, "not found");
407 426
408 if (-r "$path/index.html") { 427 $self->{stat} = [stat _];
409 $self->{path} .= "/index.html"; 428
410 $self->handle_file; 429 # idiotic netscape sends idiotic headers AGAIN
430 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
431 ? str2time $1 : 0;
432
433 if (-d _ && -r _) {
434 # directory
435 if ($path !~ /\/$/) {
436 # create a redirect to get the trailing "/"
437 # we don't try to avoid the :80
438 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
411 } else { 439 } else {
440 $ims < $self->{stat}[9]
441 or $self->err(304, "not modified");
442
443 if (-r "$path/index.html") {
444 # replace directory "size" by index.html filesize
445 $self->{stat} = [stat ($self->{path} .= "/index.html")];
446 $self->handle_file($queue_index);
447 } else {
412 $self->handle_dir; 448 $self->handle_dir;
413 } 449 }
414 } 450 }
415 } elsif (-f _ && -r _) { 451 } elsif (-f _ && -r _) {
416 -x _ and $self->err(403, "forbidden"); 452 -x _ and $self->err(403, "forbidden");
453
454 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
455 my $timeout = $::NOW + 10;
456 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
457 if ($timeout < $::NOW) {
458 $self->block($::BLOCKTIME, "too many connections");
459 } else {
460 $httpevent->wait;
461 }
462 }
463 }
464
417 $self->handle_file; 465 $self->handle_file($queue_file);
418 } else { 466 } else {
419 $self->err(404, "not found"); 467 $self->err(404, "not found");
468 }
420 } 469 }
421} 470}
422 471
423sub handle_dir { 472sub handle_dir {
424 my $self = shift; 473 my $self = shift;
… …
426 475
427 $self->response(200, "ok", 476 $self->response(200, "ok",
428 { 477 {
429 "Content-Type" => "text/html", 478 "Content-Type" => "text/html",
430 "Content-Length" => length $idx, 479 "Content-Length" => length $idx,
480 "Last-Modified" => time2str ($self->{stat}[9]),
431 }, 481 },
432 $idx); 482 $idx);
433} 483}
434 484
435sub handle_file { 485sub handle_file {
436 my $self = shift; 486 my ($self, $queue) = @_;
437 my $length = -s _; 487 my $length = $self->{stat}[7];
438 my $hdr = { 488 my $hdr = {
439 "Last-Modified" => time2str ((stat _)[9]), 489 "Last-Modified" => time2str ((stat _)[9]),
440 }; 490 };
441 491
442 my @code = (200, "ok"); 492 my @code = (200, "ok");
… …
454 } 504 }
455 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 505 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
456 } 506 }
457 $hdr->{"Content-Range"} = "bytes */$length"; 507 $hdr->{"Content-Range"} = "bytes */$length";
458 $hdr->{"Content-Length"} = $length; 508 $hdr->{"Content-Length"} = $length;
459 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
460 $self->err(416, "not satisfiable", $hdr, ""); 509 $self->err(416, "not satisfiable", $hdr, "");
461 510
462satisfiable: 511satisfiable:
463 # check for segmented downloads 512 # check for segmented downloads
464 if ($l && $::NO_SEGMENTED) { 513 if ($l && $::NO_SEGMENTED) {
514 my $timeout = $::NOW + 15;
465 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 515 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
466 $self->err(400, "segmented downloads are not allowed", 516 if ($timeout <= $::NOW) {
467 { "Content-Type" => "text/html", Connection => "close" }, <<EOF); 517 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
468<html> 518 #$self->err_segmented_download;
469<head> 519 } else {
470<title>Segmented downloads are not allowed</title> 520 $httpevent->wait;
471</head> 521 }
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 } 522 }
481 } 523 }
482 524
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 525 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
484 @code = (206, "partial content"); 526 @code = (206, "partial content");
… …
494 $hdr->{"Content-Length"} = $length; 536 $hdr->{"Content-Length"} = $length;
495 537
496 $self->response(@code, $hdr, ""); 538 $self->response(@code, $hdr, "");
497 539
498 if ($self->{method} eq "GET") { 540 if ($self->{method} eq "GET") {
541 $self->{time} = $::NOW;
542
543 my $current = $Coro::current;
544
499 my ($fh, $buf, $r); 545 my ($fh, $buf, $r);
500 my $current = $Coro::current; 546
501 open $fh, "<", $self->{path} 547 open $fh, "<", $self->{path}
502 or die "$self->{path}: late open failure ($!)"; 548 or die "$self->{path}: late open failure ($!)";
503 549
504 $h -= $l - 1; 550 $h -= $l - 1;
505 551
506 if (0) { 552 if (0) { # !AIO
507 if ($l) { 553 if ($l) {
508 sysseek $fh, $l, 0; 554 sysseek $fh, $l, 0;
509 } 555 }
510 } 556 }
557
558 my $transfer = $queue->start_transfer($h);
559 my $locked;
560 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
511 561
512 while ($h > 0) { 562 while ($h > 0) {
563 unless ($locked) {
564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
565 $bufsize = $::BUFSIZE;
566 $self->{time} = $::NOW;
567 }
568 }
569
570 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close";
572 die bless {}, err::;
573 }
574
513 if (0) { 575 if (0) { # !AIO
514 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
515 or last; 577 or last;
516 } else { 578 } else {
517 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 579 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
518 $buf, 0, sub { 580 $buf, 0, sub {
519 $r = $_[0]; 581 $r = $_[0];
520 $current->ready; 582 Coro::ready($current);
521 }); 583 });
522 &Coro::schedule; 584 &Coro::schedule;
523 last unless $r; 585 last unless $r;
524 } 586 }
525 my $w = $self->{fh}->syswrite($buf) 587 my $w = syswrite $self->{fh}, $buf
526 or last; 588 or last;
527 $::written += $w; 589 $::written += $w;
528 $self->{written} += $w; 590 $self->{written} += $w;
529 $l += $r; 591 $l += $r;
530 } 592 }
531 }
532 593
533 close $fh; 594 close $fh;
595 }
534} 596}
535 597
5361; 5981;

Diff Legend

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