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

Diff Legend

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