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.16 by root, Tue Aug 14 19:38:25 2001 UTC vs.
Revision 1.55 by root, Fri Nov 30 06:20:43 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;
… …
75use Linux::AIO; 118use Linux::AIO;
76 119
77Linux::AIO::min_parallel $::AIO_PARALLEL; 120Linux::AIO::min_parallel $::AIO_PARALLEL;
78 121
79Event->io(fd => Linux::AIO::poll_fileno, 122Event->io(fd => Linux::AIO::poll_fileno,
80 poll => 'r', 123 poll => 'r', async => 1,
81 async => 1,
82 cb => \&Linux::AIO::poll_cb ); 124 cb => \&Linux::AIO::poll_cb);
83 125
84Event->add_hooks(prepare => sub {
85 &Coro::cede while &Coro::nready;
86 1e6;
87});
88
89our %conn; # $conn{ip}{fh} => connobj 126our %conn; # $conn{ip}{self} => connobj
127our %uri; # $uri{ip}{uri}{self}
90our %blocked; 128our %blocked;
91our %mimetype; 129our %mimetype;
92 130
93sub read_mimetypes { 131sub read_mimetypes {
94 local *M; 132 local *M;
… …
105 143
106read_mimetypes; 144read_mimetypes;
107 145
108sub new { 146sub new {
109 my $class = shift; 147 my $class = shift;
148 my $fh = shift;
110 my $peername = shift; 149 my $peername = shift;
111 my $fh = shift;
112 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
113 my (undef, $iaddr) = unpack_sockaddr_in $peername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
114 or $self->err(500, "unable to decode peername"); 152 or $self->err(500, "unable to decode peername");
115 153
154 $self->{remote_addr} =
116 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_id} = inet_ntoa $iaddr;
117 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
118 157
119 # enter ourselves into various lists 158 weaken ($Coro::current->{conn} = $self);
120 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
121 159
122 $::conns++; 160 $::conns++;
161 $::maxconns = $::conns if $::conns > $::maxconns;
123 162
124 $self; 163 $self;
125} 164}
126 165
127sub DESTROY { 166sub DESTROY {
128 my $self = shift; 167 my $self = shift;
129
130 $::conns--; 168 $::conns--;
169 $self->eoconn;
170}
131 171
172# end of connection
173sub eoconn {
174 my $self = shift;
175
176 # clean up hints
132 delete $conn{$self->{remote_addr}}{$self*1}; 177 delete $conn{$self->{remote_id}}{$self*1};
133 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
179
180 $httpevent->broadcast;
134} 181}
135 182
136sub slog { 183sub slog {
137 my $self = shift; 184 my $self = shift;
138 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 185 main::slog($_[0], "$self->{remote_id}> $_[1]");
139} 186}
140 187
141sub response { 188sub response {
142 my ($self, $code, $msg, $hdr, $content) = @_; 189 my ($self, $code, $msg, $hdr, $content) = @_;
143 my $res = "HTTP/1.0 $code $msg\015\012"; 190 my $res = "HTTP/1.1 $code $msg\015\012";
144 191
145 $res .= "Connection: close\015\012"; 192 if (exists $hdr->{Connection}) {
146 $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";
147 207
148 while (my ($h, $v) = each %$hdr) { 208 while (my ($h, $v) = each %$hdr) {
149 $res .= "$h: $v\015\012" 209 $res .= "$h: $v\015\012"
150 } 210 }
151 $res .= "\015\012"; 211 $res .= "\015\012";
152 212
153 $res .= $content if defined $content and $self->{method} ne "HEAD"; 213 $res .= $content if defined $content and $self->{method} ne "HEAD";
154 214
155 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;
156 221
157 $self->{written} += 222 $self->{written} +=
158 print {$self->{fh}} $res; 223 print {$self->{fh}} $res;
159} 224}
160 225
161sub err { 226sub err {
162 my $self = shift; 227 my $self = shift;
163 my ($code, $msg, $hdr, $content) = @_; 228 my ($code, $msg, $hdr, $content) = @_;
164 229
165 unless (defined $content) { 230 unless (defined $content) {
166 $content = "$code $msg"; 231 $content = "$code $msg\n";
167 $hdr->{"Content-Type"} = "text/plain"; 232 $hdr->{"Content-Type"} = "text/plain";
168 $hdr->{"Content-Length"} = length $content; 233 $hdr->{"Content-Length"} = length $content;
169 } 234 }
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};
204 245
246 my $host;
247
248 $fh->timeout($::REQ_TIMEOUT);
205 #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
206 $self->{h} = {}; 263 $self->{h} = {};
207 264
208 # read request and parse first line
209 $fh->timeout($::REQ_TIMEOUT);
210 my $req = $fh->readline("\015\012\015\012");
211 $fh->timeout($::RES_TIMEOUT); 265 $fh->timeout($::RES_TIMEOUT);
212
213 defined $req or
214 $self->err(408, "request timeout");
215
216 my $ip = $self->{remote_addr};
217
218 if ($blocked{$ip}) {
219 $self->err_blocked($blocked{$ip})
220 if $blocked{$ip} > $::NOW;
221
222 delete $blocked{$ip};
223 }
224
225 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
226 $self->slog(2, "blocked ip $ip");
227 $self->err_blocked;
228 }
229 266
230 $req =~ /^(?:\015\012)? 267 $req =~ /^(?:\015\012)?
231 (GET|HEAD) \040+ 268 (GET|HEAD) \040+
232 ([^\040]+) \040+ 269 ([^\040]+) \040+
233 HTTP\/([0-9]+\.[0-9]+) 270 HTTP\/([0-9]+\.[0-9]+)
234 \015\012/gx 271 \015\012/gx
235 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" }); 272 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
236 273
237 $2 ne "1.0"
238 or $self->err(506, "http protocol version not supported");
239
240 $self->{method} = $1; 274 $self->{method} = $1;
241 $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");
242 280
243 # parse headers 281 # parse headers
244 { 282 {
245 my (%hdr, $h, $v); 283 my (%hdr, $h, $v);
246 284
… …
257 295
258 $self->{h}{$h} = substr $v, 1 296 $self->{h}{$h} = substr $v, 1
259 while ($h, $v) = each %hdr; 297 while ($h, $v) = each %hdr;
260 } 298 }
261 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) {
262 $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 }
263 345
346 $self->{server_name} = $host;
347
348 # enter ourselves into various lists
349 weaken ($conn{$id}{$self*1} = $self);
264 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 350 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
265 351
352 eval {
266 $self->map_uri; 353 $self->map_uri;
267 $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);
268 #} 366 }
269} 367}
270 368
271# uri => path mapping 369# uri => path mapping
272sub map_uri { 370sub map_uri {
273 my $self = shift; 371 my $self = shift;
274 my $host = $self->{h}{host} || "default"; 372 my $host = $self->{server_name};
275 my $uri = $self->{uri}; 373 my $uri = $self->{uri};
276 374
277 # some massaging, also makes it more secure 375 # some massaging, also makes it more secure
278 $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;
279 $uri =~ s%//+%/%g; 377 $uri =~ s%//+%/%g;
… …
289 $self->{path} = "$::DOCROOT/$host$uri"; 387 $self->{path} = "$::DOCROOT/$host$uri";
290 388
291 $self->access_check; 389 $self->access_check;
292} 390}
293 391
294sub server_address {
295 my $self = shift;
296 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
297 or $self->err(500, "unable to get socket name");
298 ((inet_ntoa $iaddr), $port);
299}
300
301sub server_host {
302 my $self = shift;
303 if (exists $self->{h}{host}) {
304 return $self->{h}{host};
305 } else {
306 return (($self->server_address)[0]);
307 }
308}
309
310sub server_hostport {
311 my $self = shift;
312 my ($host, $port);
313 if (exists $self->{h}{host}) {
314 ($host, $port) = ($self->{h}{host}, $self->{server_port});
315 } else {
316 ($host, $port) = $self->server_address;
317 }
318 $port = $port == 80 ? "" : ":$port";
319 $host.$port;
320}
321
322sub _cgi { 392sub _cgi {
323 my $self = shift; 393 my $self = shift;
324 my $path = shift; 394 my $path = shift;
325 my $fh; 395 my $fh;
326 396
327 # no two-way xxx supported 397 # no two-way xxx supported
328 if (0 == fork) { 398 if (0 == fork) {
329 open STDOUT, ">&".fileno($self->{fh}); 399 open STDOUT, ">&".fileno($self->{fh});
330 if (chdir $::DOCROOT) { 400 if (chdir $::DOCROOT) {
331 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 401 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
332 $ENV{HTTP_HOST} = $self->server_host; 402 $ENV{HTTP_HOST} = $self->{server_name};
333 $ENV{HTTP_PORT} = $self->{server_host}; 403 $ENV{HTTP_PORT} = $self->{server_port};
334 $ENV{SCRIPT_NAME} = $self->{name}; 404 $ENV{SCRIPT_NAME} = $self->{name};
335 exec $path; 405 exec $path;
336 } 406 }
337 Coro::State::_exit(0); 407 Coro::State::_exit(0);
338 } else { 408 } else {
409 die;
339 } 410 }
411}
412
413sub server_hostport {
414 $_[0]{server_port} == 80
415 ? $_[0]{server_name}
416 : "$_[0]{server_name}:$_[0]{server_port}";
340} 417}
341 418
342sub respond { 419sub respond {
343 my $self = shift; 420 my $self = shift;
344 my $path = $self->{path}; 421 my $path = $self->{path};
345 422
346 stat $path 423 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
347 or $self->err(404, "not found"); 424 if ($::internal{$1}) {
348 425 $::internal{$1}->($self);
349 $self->{stat} = [stat _];
350
351 # idiotic netscape sends idiotic headers AGAIN
352 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
353 ? str2time $1 : 0;
354
355 if (-d _ && -r _) {
356 # directory
357 if ($path !~ /\/$/) {
358 # create a redirect to get the trailing "/"
359 my $host = $self->server_hostport;
360 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
361 } 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 {
362 $ims < $self->{stat}[9] 447 $ims < $self->{stat}[9]
363 or $self->err(304, "not modified"); 448 or $self->err(304, "not modified");
364 449
365 if ($self->{method} eq "GET") {
366 if (-r "$path/index.html") { 450 if (-r "$path/index.html") {
451 # replace directory "size" by index.html filesize
367 $self->{path} .= "/index.html"; 452 $self->{stat} = [stat ($self->{path} .= "/index.html")];
368 $self->handle_file; 453 $self->handle_file($queue_index);
369 } else { 454 } else {
370 $self->handle_dir; 455 $self->handle_dir;
371 } 456 }
372 } 457 }
373 }
374 } elsif (-f _ && -r _) { 458 } elsif (-f _ && -r _) {
375 -x _ and $self->err(403, "forbidden"); 459 -x _ and $self->err(403, "forbidden");
376 $self->handle_file; 460 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small);
377 } else { 461 } else {
378 $self->err(404, "not found"); 462 $self->err(404, "not found");
463 }
379 } 464 }
380} 465}
381 466
382sub handle_dir { 467sub handle_dir {
383 my $self = shift; 468 my $self = shift;
… …
385 470
386 $self->response(200, "ok", 471 $self->response(200, "ok",
387 { 472 {
388 "Content-Type" => "text/html", 473 "Content-Type" => "text/html",
389 "Content-Length" => length $idx, 474 "Content-Length" => length $idx,
475 "Last-Modified" => time2str ($self->{stat}[9]),
390 }, 476 },
391 $idx); 477 $idx);
392} 478}
393 479
394sub handle_file { 480sub handle_file {
395 my $self = shift; 481 my ($self, $queue) = @_;
396 my $length = -s _; 482 my $length = $self->{stat}[7];
397 my $hdr = { 483 my $hdr = {
398 "Last-Modified" => time2str ((stat _)[9]), 484 "Last-Modified" => time2str ((stat _)[9]),
399 }; 485 };
400 486
401 my @code = (200, "ok"); 487 my @code = (200, "ok");
… …
409 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 495 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
410 } else { 496 } else {
411 ($l, $h) = (0, $length - 1); 497 ($l, $h) = (0, $length - 1);
412 goto ignore; 498 goto ignore;
413 } 499 }
414 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 500 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
415 } 501 }
416 $hdr->{"Content-Range"} = "bytes */$length"; 502 $hdr->{"Content-Range"} = "bytes */$length";
503 $hdr->{"Content-Length"} = $length;
417 $self->err(416, "not satisfiable", $hdr); 504 $self->err(416, "not satisfiable", $hdr, "");
418 505
419satisfiable: 506satisfiable:
420 # check for segmented downloads 507 # check for segmented downloads
421 if ($l && $::NO_SEGMENTED) { 508 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15;
422 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
423 Coro::Event::do_timer(after => 15); 511 if ($delay <= $::NOW) {
424 512 $self->err_segmented_download;
425 $self->err(400, "segmented downloads are not allowed"); 513 } else {
514 $httpevent->wait;
515 }
426 } 516 }
427 } 517 }
428 518
429 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 519 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
430 @code = (206, "partial content"); 520 @code = (206, "partial content");
… …
440 $hdr->{"Content-Length"} = $length; 530 $hdr->{"Content-Length"} = $length;
441 531
442 $self->response(@code, $hdr, ""); 532 $self->response(@code, $hdr, "");
443 533
444 if ($self->{method} eq "GET") { 534 if ($self->{method} eq "GET") {
535 $self->{time} = $::NOW;
536
537 my $current = $Coro::current;
538
445 my ($fh, $buf, $r); 539 my ($fh, $buf, $r);
446 my $current = $Coro::current; 540
447 open $fh, "<", $self->{path} 541 open $fh, "<", $self->{path}
448 or die "$self->{path}: late open failure ($!)"; 542 or die "$self->{path}: late open failure ($!)";
449 543
450 $h -= $l - 1; 544 $h -= $l - 1;
451 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
452 while ($h > 0) { 556 while ($h > 0) {
453 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 557 unless ($locked) {
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),
454 $buf, 0, sub { 569 $buf, 0, sub {
455 $r = $_[0]; 570 $r = $_[0];
456 $current->ready; 571 Coro::ready($current);
457 }); 572 });
458 &Coro::schedule; 573 &Coro::schedule;
459 last unless $r; 574 last unless $r;
460 my $w = $self->{fh}->syswrite($buf) 575 }
576 my $w = syswrite $self->{fh}, $buf
461 or last; 577 or last;
462 $::written += $w; 578 $::written += $w;
463 $self->{written} += $w; 579 $self->{written} += $w;
464 $l += $r; 580 $l += $r;
465 } 581 }
466 }
467 582
468 close $fh; 583 close $fh;
584 }
469} 585}
470 586
4711; 5871;

Diff Legend

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