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

Diff Legend

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