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

Diff Legend

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