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

Diff Legend

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