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.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
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;
20
21if ($ACCESS_LOG) {
22 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!";
25 $accesslog->autoflush(1);
26}
27
22sub slog { 28sub slog {
23 my $level = shift; 29 my $level = shift;
24 my $format = shift; 30 my $format = shift;
25 printf "---: $format\n", @_; 31 printf "---: $format\n", @_;
26} 32}
27 33
28my $connections = new Coro::Semaphore $MAX_CONNECTS; 34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal;
29 36
30my @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;
31my @pool; 44my @pool;
32 45
33# one "execution thread" 46# one "execution thread"
34sub handler { 47sub handler {
35 while () { 48 while () {
36 my $fh = pop @fh; 49 if (@newcons) {
37 if ($fh) {
38 eval { 50 eval {
39 conn->new($fh)->handle; 51 conn->new(@{pop @newcons})->handle;
40 }; 52 };
41 close $fh;
42 slog 1, "$@" if $@ && !ref $@; 53 slog 1, "$@" if $@ && !ref $@;
43 $connections->up; 54 $connections->up;
44 } else { 55 } else {
45 last if @pool >= $MAX_POOL; 56 last if @pool >= $MAX_POOL;
46 push @pool, $Coro::current; 57 push @pool, $Coro::current;
47 schedule; 58 schedule;
48 } 59 }
49 } 60 }
50} 61}
51 62
63sub listen_on {
64 my $listen = $_[0];
65
66 push @listen_sockets, $listen;
67
52# the "main thread" 68 # the "main thread"
53async { 69 async {
54 slog 1, "accepting connections"; 70 slog 1, "accepting connections";
55 while () { 71 while () {
56 $connections->down; 72 $connections->down;
57 push @fh, $port->accept; 73 push @newcons, [$listen->accept];
58 #slog 3, "accepted @$connections ".scalar(@pool); 74 #slog 3, "accepted @$connections ".scalar(@pool);
59 $::NOW = time;
60 if (@pool) { 75 if (@pool) {
61 (pop @pool)->ready; 76 (pop @pool)->ready;
62 } else { 77 } else {
63 async \&handler; 78 async \&handler;
64 } 79 }
65 80
81 }
66 } 82 };
67}; 83}
68 84
69loop; 85my $http_port = new Coro::Socket
70print "ende\n";#d# 86 LocalAddr => $SERVER_HOST,
87 LocalPort => $SERVER_PORT,
88 ReuseAddr => 1,
89 Listen => 50,
90 or die "unable to start server";
91
92listen_on $http_port;
93
94if ($SERVER_PORT2) {
95 my $http_port = new Coro::Socket
96 LocalAddr => $SERVER_HOST,
97 LocalPort => $SERVER_PORT2,
98 ReuseAddr => 1,
99 Listen => 50,
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 {
109 $NOW = time;
110 $HTTP_NOW = time2str $NOW;
111})->now;
71 112
72package conn; 113package conn;
73 114
74use Socket; 115use Socket;
75use HTTP::Date; 116use HTTP::Date;
76use Convert::Scalar 'weaken'; 117use Convert::Scalar 'weaken';
118use Linux::AIO;
77 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
78our %conn; # $conn{ip}{fh} => connobj 126our %conn; # $conn{ip}{self} => connobj
127our %uri; # $uri{ip}{uri}{self}
79our %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;
80 145
81sub new { 146sub new {
82 my $class = shift; 147 my $class = shift;
83 my $fh = shift; 148 my $fh = shift;
149 my $peername = shift;
84 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
85 my (undef, $iaddr) = unpack_sockaddr_in $fh->getpeername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
86 or $self->err(500, "unable to get peername"); 152 or $self->err(500, "unable to decode peername");
153
154 $self->{remote_addr} =
87 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_id} = inet_ntoa $iaddr;
156 $self->{time} = $::NOW;
88 157
89 # enter ourselves into various lists 158 weaken ($Coro::current->{conn} = $self);
90 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
91 159
92 print "$self->{remote_addr}: ".($self*1)." > ".%{$conn{$self->{remote_addr}}},"\n"; 160 $::conns++;
161
93 $self; 162 $self;
94} 163}
95 164
96sub DESTROY { 165sub DESTROY {
97 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
98 delete $conn{$self->{remote_addr}}{$self*1}; 176 delete $conn{$self->{remote_id}}{$self*1};
99 delete $uri{$self->{uri}}{$self*1}; 177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
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 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) {
213 $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 }
214 344
345 $self->{server_name} = $host;
346
347 # enter ourselves into various lists
348 weaken ($conn{$id}{$self*1} = $self);
215 weaken ($uri{$self->{uri}}{$self*1} = $self); 349 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
216 350
351 eval {
217 $self->map_uri; 352 $self->map_uri;
218
219 Coro::Event::do_timer(after => 5);
220
221 $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);
222 #} 365 }
223} 366}
224 367
225# uri => path mapping 368# uri => path mapping
226sub map_uri { 369sub map_uri {
227 my $self = shift; 370 my $self = shift;
228 my $host = $self->{h}{host} || "default"; 371 my $host = $self->{server_name};
229 my $uri = $self->{uri}; 372 my $uri = $self->{uri};
230 373
231 # some massaging, also makes it more secure 374 # some massaging, also makes it more secure
232 $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;
233 $uri =~ s%//+%/%g; 376 $uri =~ s%//+%/%g;
239 382
240 $self->{name} = $uri; 383 $self->{name} = $uri;
241 384
242 # now do the path mapping 385 # now do the path mapping
243 $self->{path} = "$::DOCROOT/$host$uri"; 386 $self->{path} = "$::DOCROOT/$host$uri";
244}
245 387
246sub server_address { 388 $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} 389}
273 390
274sub _cgi { 391sub _cgi {
275 my $self = shift; 392 my $self = shift;
276 my $path = shift; 393 my $path = shift;
279 # no two-way xxx supported 396 # no two-way xxx supported
280 if (0 == fork) { 397 if (0 == fork) {
281 open STDOUT, ">&".fileno($self->{fh}); 398 open STDOUT, ">&".fileno($self->{fh});
282 if (chdir $::DOCROOT) { 399 if (chdir $::DOCROOT) {
283 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 400 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
284 $ENV{HTTP_HOST} = $self->server_host; 401 $ENV{HTTP_HOST} = $self->{server_name};
285 $ENV{HTTP_PORT} = $self->{server_host}; 402 $ENV{HTTP_PORT} = $self->{server_port};
286 $ENV{SCRIPT_NAME} = $self->{name}; 403 $ENV{SCRIPT_NAME} = $self->{name};
287 exec $::INDEXPROG; 404 exec $path;
288 } 405 }
289 Coro::State::_exit(0); 406 Coro::State::_exit(0);
290 } else { 407 } else {
408 die;
291 } 409 }
410}
411
412sub server_hostport {
413 $_[0]{server_port} == 80
414 ? $_[0]{server_name}
415 : "$_[0]{server_name}:$_[0]{server_port}";
292} 416}
293 417
294sub respond { 418sub respond {
295 my $self = shift; 419 my $self = shift;
296 my $path = $self->{path}; 420 my $path = $self->{path};
297 421
298 stat $path 422 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
299 or $self->err(404, "not found"); 423 if ($::internal{$1}) {
300 424 $::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 { 425 } else {
312 $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]
313 or $self->err(304, "not modified"); 447 or $self->err(304, "not modified");
314 448
315 if ($self->{method} eq "GET") {
316 if (-r "$path/index.html") { 449 if (-r "$path/index.html") {
317 $self->{path} .= "/index.html"; 450 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
318 $self->handle_file; 452 $self->handle_file($queue_index);
319 } else { 453 } else {
320 $self->handle_dir; 454 $self->handle_dir;
321 } 455 }
322 } 456 }
323 }
324 } elsif (-f _ && -r _) { 457 } elsif (-f _ && -r _) {
325 -x _ and $self->err(403, "forbidden"); 458 -x _ and $self->err(403, "forbidden");
326 $self->handle_file; 459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small);
327 } else { 460 } else {
328 $self->err(404, "not found"); 461 $self->err(404, "not found");
462 }
329 } 463 }
330} 464}
331 465
332sub handle_dir { 466sub handle_dir {
333 my $self = shift; 467 my $self = shift;
334 $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);
335} 478}
336 479
337sub handle_file { 480sub handle_file {
338 my $self = shift; 481 my ($self, $queue) = @_;
339 my $length = -s _; 482 my $length = $self->{stat}[7];
340 my $hdr = { 483 my $hdr = {
341 "Last-Modified" => time2str ((stat _)[9]), 484 "Last-Modified" => time2str ((stat _)[9]),
342 }; 485 };
343 486
344 my @code = (200, "ok"); 487 my @code = (200, "ok");
352 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 495 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
353 } else { 496 } else {
354 ($l, $h) = (0, $length - 1); 497 ($l, $h) = (0, $length - 1);
355 goto ignore; 498 goto ignore;
356 } 499 }
357 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 500 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
358 } 501 }
359 $hdr->{"Content-Range"} = "bytes */$length"; 502 $hdr->{"Content-Range"} = "bytes */$length";
503 $hdr->{"Content-Length"} = $length;
360 $self->err(416, "not satisfiable", $hdr); 504 $self->err(416, "not satisfiable", $hdr, "");
361 505
362satisfiable: 506satisfiable:
507 # check for segmented downloads
508 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15;
510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
511 if ($delay <= $::NOW) {
512 $self->err_segmented_download;
513 } else {
514 $httpevent->wait;
515 }
516 }
517 }
518
363 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 519 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
364 @code = (206, "partial content"); 520 @code = (206, "partial content");
365 $length = $h - $l + 1; 521 $length = $h - $l + 1;
366 522
367ignore: 523ignore:
368 } else { 524 } else {
369 ($l, $h) = (0, $length - 1); 525 ($l, $h) = (0, $length - 1);
370 } 526 }
371 527
372 if ($self->{path} =~ /\.html$/) { 528 $self->{path} =~ /\.([^.]+)$/;
373 $hdr->{"Content-Type"} = "text/html";
374 } else {
375 $hdr->{"Content-Type"} = "application/octet-stream"; 529 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
376 }
377
378 $hdr->{"Content-Length"} = $length; 530 $hdr->{"Content-Length"} = $length;
379 531
380 $self->print_response(@code, $hdr, ""); 532 $self->response(@code, $hdr, "");
381 533
382 if ($self->{method} eq "GET") { 534 if ($self->{method} eq "GET") {
535 $self->{time} = $::NOW;
536
537 my $current = $Coro::current;
538
383 my ($fh, $buf); 539 my ($fh, $buf, $r);
540
384 open $fh, "<", $self->{path} 541 open $fh, "<", $self->{path}
385 or die "$self->{path}: late open failure ($!)"; 542 or die "$self->{path}: late open failure ($!)";
386 543
387 if ($l) {
388 sysseek $fh, $l, 0
389 or die "$self->{path}: cannot seek to $l ($!)";
390 }
391
392 $h -= $l - 1; 544 $h -= $l - 1;
393 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
394 while ($h > 0) { 556 while ($h > 0) {
395 $h -= sysread $fh, $buf, $h > 4096 ? 4096 : $h; 557 unless ($locked) {
396 print {$self->{fh}} $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
397 or last; 577 or last;
578 $::written += $w;
579 $self->{written} += $w;
580 $l += $r;
398 } 581 }
399 }
400 582
401 close $fh; 583 close $fh;
584 }
402} 585}
403 586
4041; 5871;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines