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

Diff Legend

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