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

Diff Legend

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