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

Diff Legend

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