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

Diff Legend

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