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

Diff Legend

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