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

Diff Legend

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