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

Diff Legend

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