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

Diff Legend

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