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

Diff Legend

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