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

Diff Legend

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