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

Diff Legend

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