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

Diff Legend

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