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.5 by root, Fri Aug 10 15:58:04 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;
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 if (exists $hdr->{Connection}) {
110 $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";
111 203
112 while (my ($h, $v) = each %$hdr) { 204 while (my ($h, $v) = each %$hdr) {
113 $res .= "$h: $v\015\012" 205 $res .= "$h: $v\015\012"
114 } 206 }
207 $res .= "\015\012";
115 208
116 $res .= "\015\012$content" if defined $content; 209 $res .= $content if defined $content and $self->{method} ne "HEAD";
117 210
118 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";
119 212
213 print $accesslog $log if $accesslog;
214 print STDERR $log;
215
216 $self->{written} +=
120 print {$self->{fh}} $res; 217 print {$self->{fh}} $res;
121} 218}
122 219
123sub err { 220sub err {
124 my $self = shift; 221 my $self = shift;
125 my ($code, $msg, $hdr, $content) = @_; 222 my ($code, $msg, $hdr, $content) = @_;
126 223
127 unless (defined $content) { 224 unless (defined $content) {
128 $content = "$code $msg"; 225 $content = "$code $msg\n";
129 $hdr->{"Content-Type"} = "text/plain"; 226 $hdr->{"Content-Type"} = "text/plain";
130 $hdr->{"Content-Length"} = length $content; 227 $hdr->{"Content-Length"} = length $content;
131 } 228 }
229 $hdr->{"Connection"} = "close";
132 230
133 $self->response($code, $msg, $hdr, $content); 231 $self->response($code, $msg, $hdr, $content);
134 232
135 die bless {}, err::; 233 die bless {}, err::;
136} 234}
137 235
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 { 236sub handle {
161 my $self = shift; 237 my $self = shift;
162 my $fh = $self->{fh}; 238 my $fh = $self->{fh};
163 239
240 my $host;
241
242 $fh->timeout($::REQ_TIMEOUT);
164 #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
165 $self->{h} = {}; 257 $self->{h} = {};
166 258
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); 259 $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 260
189 $req =~ /^(?:\015\012)? 261 $req =~ /^(?:\015\012)?
190 (GET|HEAD) \040+ 262 (GET|HEAD) \040+
191 ([^\040]+) \040+ 263 ([^\040]+) \040+
192 HTTP\/([0-9]+\.[0-9]+) 264 HTTP\/([0-9]+\.[0-9]+)
193 \015\012/gx 265 \015\012/gx
194 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 266 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 267
199 $self->{method} = $1; 268 $self->{method} = $1;
200 $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");
201 274
202 # parse headers 275 # parse headers
203 { 276 {
204 my (%hdr, $h, $v); 277 my (%hdr, $h, $v);
205 278
… …
216 289
217 $self->{h}{$h} = substr $v, 1 290 $self->{h}{$h} = substr $v, 1
218 while ($h, $v) = each %hdr; 291 while ($h, $v) = each %hdr;
219 } 292 }
220 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) {
221 $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 }
222 339
340 $self->{server_name} = $host;
341
342 # enter ourselves into various lists
343 weaken ($conn{$id}{$self*1} = $self);
223 weaken ($uri{$self->{uri}}{$self*1} = $self); 344 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
224 345
346 eval {
225 $self->map_uri; 347 $self->map_uri;
226 $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);
227 #} 360 }
228} 361}
229 362
230# uri => path mapping 363# uri => path mapping
231sub map_uri { 364sub map_uri {
232 my $self = shift; 365 my $self = shift;
233 my $host = $self->{h}{host} || "default"; 366 my $host = $self->{server_name};
234 my $uri = $self->{uri}; 367 my $uri = $self->{uri};
235 368
236 # some massaging, also makes it more secure 369 # some massaging, also makes it more secure
237 $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;
238 $uri =~ s%//+%/%g; 371 $uri =~ s%//+%/%g;
… …
244 377
245 $self->{name} = $uri; 378 $self->{name} = $uri;
246 379
247 # now do the path mapping 380 # now do the path mapping
248 $self->{path} = "$::DOCROOT/$host$uri"; 381 $self->{path} = "$::DOCROOT/$host$uri";
249}
250 382
251sub server_address { 383 $self->access_check;
252 my $self = shift;
253 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
254 or $self->err(500, "unable to get socket name");
255 ((inet_ntoa $iaddr), $port);
256}
257
258sub server_host {
259 my $self = shift;
260 if (exists $self->{h}{host}) {
261 return $self->{h}{host};
262 } else {
263 return (($self->server_address)[0]);
264 }
265}
266
267sub server_hostport {
268 my $self = shift;
269 my ($host, $port);
270 if (exists $self->{h}{host}) {
271 ($host, $port) = ($self->{h}{host}, $self->{server_port});
272 } else {
273 ($host, $port) = $self->server_address;
274 }
275 $port = $port == 80 ? "" : ":$port";
276 $host.$port;
277} 384}
278 385
279sub _cgi { 386sub _cgi {
280 my $self = shift; 387 my $self = shift;
281 my $path = shift; 388 my $path = shift;
… …
284 # no two-way xxx supported 391 # no two-way xxx supported
285 if (0 == fork) { 392 if (0 == fork) {
286 open STDOUT, ">&".fileno($self->{fh}); 393 open STDOUT, ">&".fileno($self->{fh});
287 if (chdir $::DOCROOT) { 394 if (chdir $::DOCROOT) {
288 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 395 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
289 $ENV{HTTP_HOST} = $self->server_host; 396 $ENV{HTTP_HOST} = $self->{server_name};
290 $ENV{HTTP_PORT} = $self->{server_host}; 397 $ENV{HTTP_PORT} = $self->{server_port};
291 $ENV{SCRIPT_NAME} = $self->{name}; 398 $ENV{SCRIPT_NAME} = $self->{name};
292 exec $::INDEXPROG; 399 exec $path;
293 } 400 }
294 Coro::State::_exit(0); 401 Coro::State::_exit(0);
295 } else { 402 } else {
403 die;
296 } 404 }
405}
406
407sub server_hostport {
408 $_[0]{server_port} == 80
409 ? $_[0]{server_name}
410 : "$_[0]{server_name}:$_[0]{server_port}";
297} 411}
298 412
299sub respond { 413sub respond {
300 my $self = shift; 414 my $self = shift;
301 my $path = $self->{path}; 415 my $path = $self->{path};
302 416
303 stat $path 417 stat $path
304 or $self->err(404, "not found"); 418 or $self->err(404, "not found");
419
420 $self->{stat} = [stat _];
305 421
306 # idiotic netscape sends idiotic headers AGAIN 422 # idiotic netscape sends idiotic headers AGAIN
307 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 423 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
308 ? str2time $1 : 0; 424 ? str2time $1 : 0;
309 425
310 if (-d _ && -r _) { 426 if (-d _ && -r _) {
311 # directory 427 # directory
312 if ($path !~ /\/$/) { 428 if ($path !~ /\/$/) {
313 # create a redirect to get the trailing "/" 429 # create a redirect to get the trailing "/"
314 my $host = $self->server_hostport; 430 # we don't try to avoid the :80
315 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 431 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
316 } else { 432 } else {
317 $ims < (stat _)[9] 433 $ims < $self->{stat}[9]
318 or $self->err(304, "not modified"); 434 or $self->err(304, "not modified");
319 435
320 if ($self->{method} eq "GET") {
321 if (-r "$path/index.html") { 436 if (-r "$path/index.html") {
322 $self->{path} .= "/index.html"; 437 # replace directory "size" by index.html filesize
438 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
323 $self->handle_file; 439 $self->handle_file;
324 } else { 440 } else {
325 $self->handle_dir; 441 $self->handle_dir;
326 }
327 } 442 }
328 } 443 }
329 } elsif (-f _ && -r _) { 444 } elsif (-f _ && -r _) {
330 -x _ and $self->err(403, "forbidden"); 445 -x _ and $self->err(403, "forbidden");
331 $self->handle_file; 446 $self->handle_file;
… …
334 } 449 }
335} 450}
336 451
337sub handle_dir { 452sub handle_dir {
338 my $self = shift; 453 my $self = shift;
339 $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);
340} 462}
341 463
342sub handle_file { 464sub handle_file {
343 my $self = shift; 465 my $self = shift;
344 my $length = -s _; 466 my $length = $self->{stat}[7];
467 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
345 my $hdr = { 468 my $hdr = {
346 "Last-Modified" => time2str ((stat _)[9]), 469 "Last-Modified" => time2str ((stat _)[9]),
347 }; 470 };
348 471
349 my @code = (200, "ok"); 472 my @code = (200, "ok");
… …
357 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 480 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
358 } else { 481 } else {
359 ($l, $h) = (0, $length - 1); 482 ($l, $h) = (0, $length - 1);
360 goto ignore; 483 goto ignore;
361 } 484 }
362 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 485 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
363 } 486 }
364 $hdr->{"Content-Range"} = "bytes */$length"; 487 $hdr->{"Content-Range"} = "bytes */$length";
488 $hdr->{"Content-Length"} = $length;
365 $self->err(416, "not satisfiable", $hdr); 489 $self->err(416, "not satisfiable", $hdr, "");
366 490
367satisfiable: 491satisfiable:
368 # check for segmented downloads 492 # check for segmented downloads
369 if ($l && $NO_SEGMENTED) { 493 if ($l && $::NO_SEGMENTED) {
494 my $delay = $::NOW + $::PER_TIMEOUT + 15;
370 if (%{$uri{$self->{uri}}} > 1) { 495 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
371 $self->slog("segmented download refused\n"); 496 if ($delay <= $::NOW) {
372 $self->err(400, "segmented downloads are not allowed"); 497 $self->err_segmented_download;
498 } else {
499 $httpevent->wait;
500 }
373 } 501 }
374 } 502 }
375 503
376 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 504 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
377 @code = (206, "partial content"); 505 @code = (206, "partial content");
… …
380ignore: 508ignore:
381 } else { 509 } else {
382 ($l, $h) = (0, $length - 1); 510 ($l, $h) = (0, $length - 1);
383 } 511 }
384 512
385 if ($self->{path} =~ /\.html$/) { 513 $self->{path} =~ /\.([^.]+)$/;
386 $hdr->{"Content-Type"} = "text/html";
387 } else {
388 $hdr->{"Content-Type"} = "application/octet-stream"; 514 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
389 }
390
391 $hdr->{"Content-Length"} = $length; 515 $hdr->{"Content-Length"} = $length;
392 516
393 $self->response(@code, $hdr, ""); 517 $self->response(@code, $hdr, "");
394 518
395 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
396 my ($fh, $buf); 537 my ($fh, $buf, $r);
538 my $current = $Coro::current;
397 open $fh, "<", $self->{path} 539 open $fh, "<", $self->{path}
398 or die "$self->{path}: late open failure ($!)"; 540 or die "$self->{path}: late open failure ($!)";
399 541
400 if ($l) {
401 sysseek $fh, $l, 0
402 or die "$self->{path}: cannot seek to $l ($!)";
403 }
404
405 $h -= $l - 1; 542 $h -= $l - 1;
406 543
544 if (0) {
545 if ($l) {
546 sysseek $fh, $l, 0;
547 }
548 }
549
407 while ($h > 0) { 550 while ($h > 0) {
551 if (0) {
408 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 552 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
409 $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
410 or last; 564 or last;
565 $::written += $w;
566 $self->{written} += $w;
567 $l += $r;
411 } 568 }
412 }
413 569
414 close $fh; 570 close $fh;
571 }
415} 572}
416 573
4171; 5741;

Diff Legend

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