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.52 by root, Fri Nov 30 05:11: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;
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 $queue_small = new transferqueue $MAX_TRANSFERS_SMALL;
40our $queue_large = new transferqueue $MAX_TRANSFERS_LARGE;
41our $queue_index = new transferqueue 5;
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
154 $self->{remote_addr} =
86 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_id} = inet_ntoa $iaddr;
156 $self->{time} = $::NOW;
87 157
88 # enter ourselves into various lists 158 weaken ($Coro::current->{conn} = $self);
89 weaken ($conn{$self->{remote_addr}}{$self*1} = $self); 159
160 $::conns++;
90 161
91 $self; 162 $self;
92} 163}
93 164
94sub DESTROY { 165sub DESTROY {
95 my $self = shift; 166 my $self = shift;
167 $::conns--;
168 $self->eoconn;
169}
170
171# end of connection
172sub eoconn {
173 my $self = shift;
174
175 # clean up hints
96 delete $conn{$self->{remote_addr}}{$self*1}; 176 delete $conn{$self->{remote_id}}{$self*1};
97 delete $uri{$self->{uri}}{$self*1}; 177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
98} 180}
99 181
100sub slog { 182sub slog {
101 my $self = shift; 183 my $self = shift;
102 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
103} 185}
104 186
105sub response { 187sub response {
106 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
107 my $res = "HTTP/1.0 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
108 190
109 $res .= "Connection: close\015\012"; 191 if (exists $hdr->{Connection}) {
110 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 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 }
204
205 $res .= "Date: $HTTP_NOW\015\012";
111 206
112 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
113 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
114 } 209 }
210 $res .= "\015\012";
115 211
116 $res .= "\015\012$content" if defined $content; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
117 213
118 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 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";
119 217
218 print $accesslog $log if $accesslog;
219 print STDERR $log;
220
221 $self->{written} +=
120 print {$self->{fh}} $res; 222 print {$self->{fh}} $res;
121} 223}
122 224
123sub err { 225sub err {
124 my $self = shift; 226 my $self = shift;
125 my ($code, $msg, $hdr, $content) = @_; 227 my ($code, $msg, $hdr, $content) = @_;
126 228
127 unless (defined $content) { 229 unless (defined $content) {
128 $content = "$code $msg"; 230 $content = "$code $msg\n";
129 $hdr->{"Content-Type"} = "text/plain"; 231 $hdr->{"Content-Type"} = "text/plain";
130 $hdr->{"Content-Length"} = length $content; 232 $hdr->{"Content-Length"} = length $content;
131 } 233 }
234 $hdr->{"Connection"} = "close";
132 235
133 $self->response($code, $msg, $hdr, $content); 236 $self->response($code, $msg, $hdr, $content);
134 237
135 die bless {}, err::; 238 die bless {}, err::;
136} 239}
137 240
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 { 241sub handle {
161 my $self = shift; 242 my $self = shift;
162 my $fh = $self->{fh}; 243 my $fh = $self->{fh};
163 244
245 my $host;
246
247 $fh->timeout($::REQ_TIMEOUT);
164 #while() { 248 while() {
249 $self->{reqs}++;
250
251 # read request and parse first line
252 my $req = $fh->readline("\015\012\015\012");
253
254 unless (defined $req) {
255 if (exists $self->{version}) {
256 last;
257 } else {
258 $self->err(408, "request timeout");
259 }
260 }
261
165 $self->{h} = {}; 262 $self->{h} = {};
166 263
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); 264 $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 265
189 $req =~ /^(?:\015\012)? 266 $req =~ /^(?:\015\012)?
190 (GET|HEAD) \040+ 267 (GET|HEAD) \040+
191 ([^\040]+) \040+ 268 ([^\040]+) \040+
192 HTTP\/([0-9]+\.[0-9]+) 269 HTTP\/([0-9]+\.[0-9]+)
193 \015\012/gx 270 \015\012/gx
194 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 271 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 272
199 $self->{method} = $1; 273 $self->{method} = $1;
200 $self->{uri} = $2; 274 $self->{uri} = $2;
275 $self->{version} = $3;
276
277 $3 =~ /^1\./
278 or $self->err(506, "http protocol version $3 not supported");
201 279
202 # parse headers 280 # parse headers
203 { 281 {
204 my (%hdr, $h, $v); 282 my (%hdr, $h, $v);
205 283
216 294
217 $self->{h}{$h} = substr $v, 1 295 $self->{h}{$h} = substr $v, 1
218 while ($h, $v) = each %hdr; 296 while ($h, $v) = each %hdr;
219 } 297 }
220 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 if ($blocked{$id}) {
311 $self->err_blocked($blocked{$id})
312 if $blocked{$id} > $::NOW;
313
314 delete $blocked{$id};
315 }
316
317 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
318 my $delay = $::PER_TIMEOUT + $::NOW + 15;
319 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
320 if ($delay < $::NOW) {
321 $self->slog(2, "blocked ip $id");
322 $self->err_blocked;
323 } else {
324 $httpevent->wait;
325 }
326 }
327 }
328
329 # find out server name and port
330 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
331 $host = $1;
332 } else {
333 $host = $self->{h}{host};
334 }
335
336 if (defined $host) {
221 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 337 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
338 } else {
339 ($self->{server_port}, $host)
340 = unpack_sockaddr_in $self->{fh}->sockname
341 or $self->err(500, "unable to get socket name");
342 $host = inet_ntoa $host;
343 }
222 344
345 $self->{server_name} = $host;
346
347 # enter ourselves into various lists
348 weaken ($conn{$id}{$self*1} = $self);
223 weaken ($uri{$self->{uri}}{$self*1} = $self); 349 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
224 350
351 eval {
225 $self->map_uri; 352 $self->map_uri;
226 $self->respond; 353 $self->respond;
354 };
355
356 $self->eoconn;
357
358 die if $@ && !ref $@;
359
360 last if $self->{h}{connection} =~ /close/;
361
362 $httpevent->broadcast;
363
364 $fh->timeout($::PER_TIMEOUT);
227 #} 365 }
228} 366}
229 367
230# uri => path mapping 368# uri => path mapping
231sub map_uri { 369sub map_uri {
232 my $self = shift; 370 my $self = shift;
233 my $host = $self->{h}{host} || "default"; 371 my $host = $self->{server_name};
234 my $uri = $self->{uri}; 372 my $uri = $self->{uri};
235 373
236 # some massaging, also makes it more secure 374 # some massaging, also makes it more secure
237 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 375 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
238 $uri =~ s%//+%/%g; 376 $uri =~ s%//+%/%g;
244 382
245 $self->{name} = $uri; 383 $self->{name} = $uri;
246 384
247 # now do the path mapping 385 # now do the path mapping
248 $self->{path} = "$::DOCROOT/$host$uri"; 386 $self->{path} = "$::DOCROOT/$host$uri";
249}
250 387
251sub server_address { 388 $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} 389}
278 390
279sub _cgi { 391sub _cgi {
280 my $self = shift; 392 my $self = shift;
281 my $path = shift; 393 my $path = shift;
284 # no two-way xxx supported 396 # no two-way xxx supported
285 if (0 == fork) { 397 if (0 == fork) {
286 open STDOUT, ">&".fileno($self->{fh}); 398 open STDOUT, ">&".fileno($self->{fh});
287 if (chdir $::DOCROOT) { 399 if (chdir $::DOCROOT) {
288 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 400 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
289 $ENV{HTTP_HOST} = $self->server_host; 401 $ENV{HTTP_HOST} = $self->{server_name};
290 $ENV{HTTP_PORT} = $self->{server_host}; 402 $ENV{HTTP_PORT} = $self->{server_port};
291 $ENV{SCRIPT_NAME} = $self->{name}; 403 $ENV{SCRIPT_NAME} = $self->{name};
292 exec $::INDEXPROG; 404 exec $path;
293 } 405 }
294 Coro::State::_exit(0); 406 Coro::State::_exit(0);
295 } else { 407 } else {
408 die;
296 } 409 }
410}
411
412sub server_hostport {
413 $_[0]{server_port} == 80
414 ? $_[0]{server_name}
415 : "$_[0]{server_name}:$_[0]{server_port}";
297} 416}
298 417
299sub respond { 418sub respond {
300 my $self = shift; 419 my $self = shift;
301 my $path = $self->{path}; 420 my $path = $self->{path};
302 421
303 stat $path 422 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
304 or $self->err(404, "not found"); 423 if ($::internal{$1}) {
305 424 $::internal{$1}->($self);
306 # idiotic netscape sends idiotic headers AGAIN
307 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
308 ? str2time $1 : 0;
309
310 if (-d _ && -r _) {
311 # directory
312 if ($path !~ /\/$/) {
313 # create a redirect to get the trailing "/"
314 my $host = $self->server_hostport;
315 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
316 } else { 425 } else {
317 $ims < (stat _)[9] 426 $self->err(404, "not found");
427 }
428 } else {
429
430 stat $path
431 or $self->err(404, "not found");
432
433 $self->{stat} = [stat _];
434
435 # idiotic netscape sends idiotic headers AGAIN
436 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
437 ? str2time $1 : 0;
438
439 if (-d _ && -r _) {
440 # directory
441 if ($path !~ /\/$/) {
442 # create a redirect to get the trailing "/"
443 # we don't try to avoid the :80
444 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
445 } else {
446 $ims < $self->{stat}[9]
318 or $self->err(304, "not modified"); 447 or $self->err(304, "not modified");
319 448
320 if ($self->{method} eq "GET") {
321 if (-r "$path/index.html") { 449 if (-r "$path/index.html") {
322 $self->{path} .= "/index.html"; 450 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
323 $self->handle_file; 452 $self->handle_file($queue_index);
324 } else { 453 } else {
325 $self->handle_dir; 454 $self->handle_dir;
326 } 455 }
327 } 456 }
328 }
329 } elsif (-f _ && -r _) { 457 } elsif (-f _ && -r _) {
330 -x _ and $self->err(403, "forbidden"); 458 -x _ and $self->err(403, "forbidden");
331 $self->handle_file; 459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small);
332 } else { 460 } else {
333 $self->err(404, "not found"); 461 $self->err(404, "not found");
462 }
334 } 463 }
335} 464}
336 465
337sub handle_dir { 466sub handle_dir {
338 my $self = shift; 467 my $self = shift;
339 $self->_cgi($::INDEXPROG); 468 my $idx = $self->diridx;
469
470 $self->response(200, "ok",
471 {
472 "Content-Type" => "text/html",
473 "Content-Length" => length $idx,
474 #d# directories change all the time, so X-
475 "X-Last-Modified" => time2str ((stat _)[9]),
476 },
477 $idx);
340} 478}
341 479
342sub handle_file { 480sub handle_file {
343 my $self = shift; 481 my ($self, $queue) = @_;
344 my $length = -s _; 482 my $length = $self->{stat}[7];
345 my $hdr = { 483 my $hdr = {
346 "Last-Modified" => time2str ((stat _)[9]), 484 "Last-Modified" => time2str ((stat _)[9]),
347 }; 485 };
348 486
349 my @code = (200, "ok"); 487 my @code = (200, "ok");
357 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 495 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
358 } else { 496 } else {
359 ($l, $h) = (0, $length - 1); 497 ($l, $h) = (0, $length - 1);
360 goto ignore; 498 goto ignore;
361 } 499 }
362 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 500 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
363 } 501 }
364 $hdr->{"Content-Range"} = "bytes */$length"; 502 $hdr->{"Content-Range"} = "bytes */$length";
503 $hdr->{"Content-Length"} = $length;
365 $self->err(416, "not satisfiable", $hdr); 504 $self->err(416, "not satisfiable", $hdr, "");
366 505
367satisfiable: 506satisfiable:
368 # check for segmented downloads 507 # check for segmented downloads
369 if ($l && $NO_SEGMENTED) { 508 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15;
370 if (%{$uri{$self->{uri}}} > 1) { 510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
371 $self->slog("segmented download refused\n"); 511 if ($delay <= $::NOW) {
372 $self->err(400, "segmented downloads are not allowed"); 512 $self->err_segmented_download;
513 } else {
514 $httpevent->wait;
515 }
373 } 516 }
374 } 517 }
375 518
376 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 519 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
377 @code = (206, "partial content"); 520 @code = (206, "partial content");
380ignore: 523ignore:
381 } else { 524 } else {
382 ($l, $h) = (0, $length - 1); 525 ($l, $h) = (0, $length - 1);
383 } 526 }
384 527
385 if ($self->{path} =~ /\.html$/) { 528 $self->{path} =~ /\.([^.]+)$/;
386 $hdr->{"Content-Type"} = "text/html";
387 } else {
388 $hdr->{"Content-Type"} = "application/octet-stream"; 529 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
389 }
390
391 $hdr->{"Content-Length"} = $length; 530 $hdr->{"Content-Length"} = $length;
392 531
393 $self->response(@code, $hdr, ""); 532 $self->response(@code, $hdr, "");
394 533
395 if ($self->{method} eq "GET") { 534 if ($self->{method} eq "GET") {
535 $self->{time} = $::NOW;
536
537 my $current = $Coro::current;
538
396 my ($fh, $buf); 539 my ($fh, $buf, $r);
540
397 open $fh, "<", $self->{path} 541 open $fh, "<", $self->{path}
398 or die "$self->{path}: late open failure ($!)"; 542 or die "$self->{path}: late open failure ($!)";
399 543
400 if ($l) {
401 sysseek $fh, $l, 0
402 or die "$self->{path}: cannot seek to $l ($!)";
403 }
404
405 $h -= $l - 1; 544 $h -= $l - 1;
406 545
546 if (0) { # !AIO
547 if ($l) {
548 sysseek $fh, $l, 0;
549 }
550 }
551
552 my $transfer = $queue->start_transfer;
553 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
555
407 while ($h > 0) { 556 while ($h > 0) {
408 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 557 unless ($locked) {
409 $self->{fh}->syswrite($buf) 558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW;
561 }
562 }
563
564 if (0) { # !AIO
565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
566 or last;
567 } else {
568 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
569 $buf, 0, sub {
570 $r = $_[0];
571 Coro::ready($current);
572 });
573 &Coro::schedule;
574 last unless $r;
575 }
576 my $w = syswrite $self->{fh}, $buf
410 or last; 577 or last;
578 $::written += $w;
579 $self->{written} += $w;
580 $l += $r;
411 } 581 }
412 }
413 582
414 close $fh; 583 close $fh;
584 }
415} 585}
416 586
4171; 5871;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines