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.79 by root, Fri Dec 1 03:53:33 2006 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;
6use Coro::AIO ();
7
8use HTTP::Date;
9use POSIX ();
10
11use Compress::Zlib ();
5 12
6no utf8; 13no utf8;
7use bytes; 14use bytes;
8 15
9# at least on my machine, this thingy serves files 16# at least on my machine, this thingy serves files
10# quite a bit faster than apache, ;) 17# quite a bit faster than apache, ;)
11# and quite a bit slower than thttpd :( 18# and quite a bit slower than thttpd :(
12 19
13$SIG{PIPE} = 'IGNORE'; 20$SIG{PIPE} = 'IGNORE';
14 21
22our $accesslog;
23our $errorlog;
24
25our $NOW;
26our $HTTP_NOW;
27
28Event->timer(interval => 1, hard => 1, cb => sub {
29 $NOW = time;
30 $HTTP_NOW = time2str $NOW;
31})->now;
32
33if ($ERROR_LOG) {
34 use IO::Handle;
35 open $errorlog, ">>$ERROR_LOG"
36 or die "$ERROR_LOG: $!";
37 $errorlog->autoflush(1);
38}
39
40if ($ACCESS_LOG) {
41 use IO::Handle;
42 open $accesslog, ">>$ACCESS_LOG"
43 or die "$ACCESS_LOG: $!";
44 $accesslog->autoflush(1);
45}
46
15sub slog { 47sub slog {
16 my $level = shift; 48 my $level = shift;
17 my $format = shift; 49 my $format = shift;
50 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
18 printf "---: $format\n", @_; 51 printf "$NOW: $format\n", @_;
52 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
19} 53}
20 54
21my $connections = new Coro::Semaphore $MAX_CONNECTS; 55our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
56our $httpevent = new Coro::Signal;
57
58our $queue_file = new transferqueue $MAX_TRANSFERS;
59our $queue_index = new transferqueue 10;
60
61our $tbf_top = new tbf rate => $TBF_RATE || 100000;
62
63my $unused_bytes = 0;
64my $unused_last = time;
65
66sub unused_bandwidth {
67 $unused_bytes += $_[0];
68 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
69 $unused_last = $NOW;
70 $unused_bytes = 0;
71 $queue_file->force_wake_next;
72 slog 1, "forced filetransfer due to unused bandwidth";
73 }
74}
22 75
23my @newcons; 76my @newcons;
24my @pool; 77my @pool;
25 78
26# one "execution thread" 79# one "execution thread"
27sub handler { 80sub handler {
28 while () { 81 while () {
29 my $new = pop @newcons;
30 if ($new) { 82 if (@newcons) {
31 eval { 83 eval {
32 conn->new(@$new)->handle; 84 conn->new(@{pop @newcons})->handle;
33 }; 85 };
34 slog 1, "$@" if $@ && !ref $@; 86 slog 1, "$@" if $@ && !ref $@;
87
88 $httpevent->broadcast; # only for testing, but doesn't matter much
89
35 $connections->up; 90 $connections->up;
36 } else { 91 } else {
37 last if @pool >= $MAX_POOL; 92 last if @pool >= $MAX_POOL;
38 push @pool, $Coro::current; 93 push @pool, $Coro::current;
39 schedule; 94 schedule;
40 } 95 }
41 } 96 }
97}
98
99sub listen_on {
100 my $listen = $_[0];
101
102 push @listen_sockets, $listen;
103
104 # the "main thread"
105 async {
106 slog 1, "accepting connections";
107 while () {
108 $connections->down;
109 push @newcons, [$listen->accept];
110 #slog 3, "accepted @$connections ".scalar(@pool);
111 if (@pool) {
112 (pop @pool)->ready;
113 } else {
114 async \&handler;
115 }
116 }
117 };
42} 118}
43 119
44my $http_port = new Coro::Socket 120my $http_port = new Coro::Socket
45 LocalAddr => $SERVER_HOST, 121 LocalAddr => $SERVER_HOST,
46 LocalPort => $SERVER_PORT, 122 LocalPort => $SERVER_PORT,
47 ReuseAddr => 1, 123 ReuseAddr => 1,
48 Listen => 50, 124 Listen => 50,
49 or die "unable to start server"; 125 or die "unable to start server";
50 126
51push @listen_sockets, $http_port; 127listen_on $http_port;
52 128
53# the "main thread" 129if ($SERVER_PORT2) {
54async { 130 my $http_port = new Coro::Socket
55 slog 1, "accepting connections"; 131 LocalAddr => $SERVER_HOST,
56 while () { 132 LocalPort => $SERVER_PORT2,
57 $connections->down; 133 ReuseAddr => 1,
58 push @newcons, [$http_port->accept]; 134 Listen => 50,
59 #slog 3, "accepted @$connections ".scalar(@pool); 135 or die "unable to start server";
60 $::NOW = time;
61 if (@pool) {
62 (pop @pool)->ready;
63 } else {
64 async \&handler;
65 }
66 136
67 } 137 listen_on $http_port;
68}; 138}
69 139
70package conn; 140package conn;
71 141
72use Socket; 142use Socket;
73use HTTP::Date; 143use HTTP::Date;
74use Convert::Scalar 'weaken'; 144use Convert::Scalar 'weaken';
75use Linux::AIO; 145use IO::AIO;
76 146
77Linux::AIO::min_parallel $::AIO_PARALLEL; 147IO::AIO::min_parallel $::AIO_PARALLEL;
78 148
79Event->io(fd => Linux::AIO::poll_fileno, 149Event->io (fd => IO::AIO::poll_fileno,
80 poll => 'r', async => 1, 150 poll => 'r', async => 1,
81 cb => \&Linux::AIO::poll_cb); 151 cb => \&IO::AIO::poll_cb);
82my $scheduler = Event->idle(
83 max => 0, min => 0, prio => 6, parked => 1,
84 cb => \&Coro::schedule);
85 152
86our %conn; # $conn{ip}{fh} => connobj 153our %conn; # $conn{ip}{self} => connobj
154our %uri; # $uri{ip}{uri}{self}
87our %blocked; 155our %blocked;
88our %mimetype; 156our %mimetype;
89 157
90sub read_mimetypes { 158sub read_mimetypes {
91 local *M; 159 local *M;
… …
102 170
103read_mimetypes; 171read_mimetypes;
104 172
105sub new { 173sub new {
106 my $class = shift; 174 my $class = shift;
175 my $fh = shift;
107 my $peername = shift; 176 my $peername = shift;
108 my $fh = shift;
109 my $self = bless { fh => $fh }, $class; 177 my $self = bless { fh => $fh }, $class;
110 my (undef, $iaddr) = unpack_sockaddr_in $peername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
111 or $self->err(500, "unable to decode peername"); 179 or $self->err(500, "unable to decode peername");
112 180
181 $self->{remote_addr} =
113 $self->{remote_addr} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
183
114 $self->{time} = $::NOW; 184 $self->{time} = $::NOW;
115 185
116 # enter ourselves into various lists 186 weaken ($Coro::current->{conn} = $self);
117 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
118 187
119 $::conns++; 188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
120 190
121 $self; 191 $self;
122} 192}
123 193
124sub DESTROY { 194sub DESTROY {
125 my $self = shift; 195 #my $self = shift;
126
127 $::conns--; 196 $::conns--;
128
129 $self->eoconn;
130 delete $conn{$self->{remote_addr}}{$self*1};
131} 197}
132 198
133# end of connection 199sub prune_cache {
134sub eoconn { 200 my $hash = $_[0];
135 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 201
202 for (keys %$hash) {
203 if (ref $hash->{$_} eq HASH::) {
204 prune_cache($hash->{$_});
205 unless (scalar keys %{$hash->{$_}}) {
206 delete $hash->{$_};
207 $d2++;
208 }
209 }
210 }
136} 211}
212
213sub prune_caches {
214 prune_cache \%conn;
215 prune_cache \%uri;
216
217 for (keys %blocked) {
218 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
219 }
220}
221
222Event->timer(interval => 60, cb => \&prune_caches);
137 223
138sub slog { 224sub slog {
139 my $self = shift; 225 my $self = shift;
140 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 226 main::slog($_[0], "$self->{remote_id}> $_[1]");
141} 227}
142 228
143sub response { 229sub response {
144 my ($self, $code, $msg, $hdr, $content) = @_; 230 my ($self, $code, $msg, $hdr, $content) = @_;
145 my $res = "HTTP/1.1 $code $msg\015\012"; 231 my $res = "HTTP/1.1 $code $msg\015\012";
232 my $GZ = "";
146 233
147 #$res .= "Connection: close\015\012"; 234 if (exists $hdr->{Connection}) {
148 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 235 if ($hdr->{Connection} =~ /close/) {
236 $self->{h}{connection} = "close"
237 }
238 } else {
239 if ($self->{version} < 1.1) {
240 if ($self->{h}{connection} =~ /keep-alive/i) {
241 $hdr->{Connection} = "Keep-Alive";
242 } else {
243 $self->{h}{connection} = "close"
244 }
245 }
246 }
247
248 if ($self->{method} ne "HEAD"
249 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
250 && 400 < length $content
251 && $hdr->{"Content-Length"} == length $content
252 && !exists $hdr->{"Content-Encoding"}
253 ) {
254 my $orig = length $content;
255 $hdr->{"Content-Encoding"} = "gzip";
256 $content = Compress::Zlib::memGzip(\$content);
257 $hdr->{"Content-Length"} = length $content;
258 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
259 }
260
261 $res .= "Date: $HTTP_NOW\015\012";
262 $res .= "Server: $::NAME\015\012";
149 263
150 while (my ($h, $v) = each %$hdr) { 264 while (my ($h, $v) = each %$hdr) {
151 $res .= "$h: $v\015\012" 265 $res .= "$h: $v\015\012"
152 } 266 }
153 $res .= "\015\012"; 267 $res .= "\015\012";
154 268
155 $res .= $content if defined $content and $self->{method} ne "HEAD"; 269 $res .= $content if defined $content and $self->{method} ne "HEAD";
156 270
157 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 271 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
272 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
273 " \"$self->{h}{referer}\"\n";
158 274
159 $self->{written} += 275 print $::accesslog $log if $::accesslog;
160 print {$self->{fh}} $res; 276 print STDERR $log;
277
278 $tbf_top->request(length $res, 1e6);
279 $self->{written} += print {$self->{fh}} $res;
161} 280}
162 281
163sub err { 282sub err {
164 my $self = shift; 283 my $self = shift;
165 my ($code, $msg, $hdr, $content) = @_; 284 my ($code, $msg, $hdr, $content) = @_;
166 285
167 unless (defined $content) { 286 unless (defined $content) {
168 $content = "$code $msg"; 287 $content = "$code $msg\n";
169 $hdr->{"Content-Type"} = "text/plain"; 288 $hdr->{"Content-Type"} = "text/plain";
170 $hdr->{"Content-Length"} = length $content; 289 $hdr->{"Content-Length"} = length $content;
171 } 290 }
172 $hdr->{"Connection"} = "close"; 291 $hdr->{"Connection"} = "close";
173 292
174 $self->response($code, $msg, $hdr, $content); 293 $self->response($code, $msg, $hdr, $content);
175 294
176 die bless {}, err::; 295 die bless {}, err::;
177} 296}
178 297
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 { 298sub handle {
207 my $self = shift; 299 my $self = shift;
208 my $fh = $self->{fh}; 300 my $fh = $self->{fh};
301
302 my $host;
209 303
210 $fh->timeout($::REQ_TIMEOUT); 304 $fh->timeout($::REQ_TIMEOUT);
211 while() { 305 while() {
212 $self->{reqs}++; 306 $self->{reqs}++;
213 307
… …
223 } 317 }
224 318
225 $self->{h} = {}; 319 $self->{h} = {};
226 320
227 $fh->timeout($::RES_TIMEOUT); 321 $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 322
242 $req =~ /^(?:\015\012)? 323 $req =~ /^(?:\015\012)?
243 (GET|HEAD) \040+ 324 (GET|HEAD) \040+
244 ([^\040]+) \040+ 325 ([^\040]+) \040+
245 HTTP\/([0-9]+\.[0-9]+) 326 HTTP\/([0-9]+\.[0-9]+)
… …
258 my (%hdr, $h, $v); 339 my (%hdr, $h, $v);
259 340
260 $hdr{lc $1} .= ",$2" 341 $hdr{lc $1} .= ",$2"
261 while $req =~ /\G 342 while $req =~ /\G
262 ([^:\000-\040]+): 343 ([^:\000-\040]+):
263 [\008\040]* 344 [\011\040]*
264 ((?: [^\015\012]+ | \015\012[\008\040] )*) 345 ((?: [^\015\012]+ | \015\012[\011\040] )*)
265 \015\012 346 \015\012
266 /gxc; 347 /gxc;
267 348
268 $req =~ /\G\015\012$/ 349 $req =~ /\G\015\012$/
269 or $self->err(400, "bad request"); 350 or $self->err(400, "bad request");
270 351
271 $self->{h}{$h} = substr $v, 1 352 $self->{h}{$h} = substr $v, 1
272 while ($h, $v) = each %hdr; 353 while ($h, $v) = each %hdr;
273 } 354 }
274 355
356 # remote id should be unique per user
357 my $id = $self->{remote_addr};
358
359 if (exists $self->{h}{"client-ip"}) {
360 $id .= "[".$self->{h}{"client-ip"}."]";
361 } elsif (exists $self->{h}{"x-forwarded-for"}) {
362 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
363 }
364
365 $self->{remote_id} = $id;
366
367 weaken (local $conn{$id}{$self*1} = $self);
368
369 if ($blocked{$id}) {
370 $self->err_blocked
371 if $blocked{$id}[0] > $::NOW;
372
373 delete $blocked{$id};
374 }
375
376 # find out server name and port
377 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
378 $host = $1;
379 } else {
380 $host = $self->{h}{host};
381 }
382
383 if (defined $host) {
275 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 384 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
385 } else {
386 ($self->{server_port}, $host)
387 = unpack_sockaddr_in $self->{fh}->sockname
388 or $self->err(500, "unable to get socket name");
389 $host = inet_ntoa $host;
390 }
276 391
392 $self->{server_name} = $host;
393
277 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 394 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
278 395
396 eval {
279 $self->map_uri; 397 $self->map_uri;
280 $self->respond; 398 $self->respond;
399 };
281 400
282 $self->eoconn; 401 die if $@ && !ref $@;
283 402
284 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 403 last if $self->{h}{connection} =~ /close/i;
285 404
286 $self->slog(9, "persistent connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 405 $httpevent->broadcast;
406
287 $fh->timeout($::PER_TIMEOUT); 407 $fh->timeout($::PER_TIMEOUT);
288 } 408 }
409}
410
411sub block {
412 my $self = shift;
413
414 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
415 $self->slog(2, "blocked ip $self->{remote_id}");
416 $self->err_blocked;
289} 417}
290 418
291# uri => path mapping 419# uri => path mapping
292sub map_uri { 420sub map_uri {
293 my $self = shift; 421 my $self = shift;
294 my $host = $self->{h}{host} || "default"; 422 my $host = $self->{server_name};
295 my $uri = $self->{uri}; 423 my $uri = $self->{uri};
296 424
297 # some massaging, also makes it more secure 425 # some massaging, also makes it more secure
298 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 426 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
299 $uri =~ s%//+%/%g; 427 $uri =~ s%//+%/%g;
… …
309 $self->{path} = "$::DOCROOT/$host$uri"; 437 $self->{path} = "$::DOCROOT/$host$uri";
310 438
311 $self->access_check; 439 $self->access_check;
312} 440}
313 441
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 { 442sub _cgi {
343 my $self = shift; 443 my $self = shift;
344 my $path = shift; 444 my $path = shift;
345 my $fh; 445 my $fh;
346 446
347 # no two-way xxx supported 447 # no two-way xxx supported
348 if (0 == fork) { 448 if (0 == fork) {
349 open STDOUT, ">&".fileno($self->{fh}); 449 open STDOUT, ">&".fileno($self->{fh});
350 if (chdir $::DOCROOT) { 450 if (chdir $::DOCROOT) {
351 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 451 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
352 $ENV{HTTP_HOST} = $self->server_host; 452 $ENV{HTTP_HOST} = $self->{server_name};
353 $ENV{HTTP_PORT} = $self->{server_host}; 453 $ENV{HTTP_PORT} = $self->{server_port};
354 $ENV{SCRIPT_NAME} = $self->{name}; 454 $ENV{SCRIPT_NAME} = $self->{name};
355 exec $path; 455 exec $path;
356 } 456 }
357 Coro::State::_exit(0); 457 Coro::State::_exit(0);
358 } else { 458 } else {
459 die;
359 } 460 }
461}
462
463sub server_hostport {
464 $_[0]{server_port} == 80
465 ? $_[0]{server_name}
466 : "$_[0]{server_name}:$_[0]{server_port}";
360} 467}
361 468
362sub respond { 469sub respond {
363 my $self = shift; 470 my $self = shift;
364 my $path = $self->{path}; 471 my $path = $self->{path};
365 472
366 stat $path 473 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
367 or $self->err(404, "not found"); 474 if ($::internal{$1}) {
368 475 $::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 { 476 } else {
477 $self->err(404, "not found");
478 }
479 } else {
480
481 stat $path
482 or $self->err(404, "not found");
483
484 $self->{stat} = [stat _];
485
486 # idiotic netscape sends idiotic headers AGAIN
487 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
488 ? str2time $1 : 0;
489
490 if (-d _ && -r _) {
491 # directory
492 if ($path !~ /\/$/) {
493 # create a redirect to get the trailing "/"
494 # we don't try to avoid the :80
495 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
496 } else {
382 $ims < $self->{stat}[9] 497 $ims < $self->{stat}[9]
383 or $self->err(304, "not modified"); 498 or $self->err(304, "not modified");
384 499
385 if ($self->{method} eq "GET") {
386 if (-r "$path/index.html") { 500 if (-r "$path/index.html") {
501 # replace directory "size" by index.html filesize
387 $self->{path} .= "/index.html"; 502 $self->{stat} = [stat ($self->{path} .= "/index.html")];
388 $self->handle_file; 503 $self->handle_file($queue_index, $tbf_top);
389 } else { 504 } else {
390 $self->handle_dir; 505 $self->handle_dir;
391 } 506 }
392 } 507 }
393 }
394 } elsif (-f _ && -r _) { 508 } elsif (-f _ && -r _) {
395 -x _ and $self->err(403, "forbidden"); 509 -x _ and $self->err(403, "forbidden");
396 $self->handle_file; 510
511 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
512 my $timeout = $::NOW + 10;
513 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
514 if ($timeout < $::NOW) {
515 $self->block($::BLOCKTIME, "too many connections");
516 } else {
517 $httpevent->wait;
518 }
519 }
520 }
521
522 $self->handle_file($queue_file, $tbf_top);
397 } else { 523 } else {
398 $self->err(404, "not found"); 524 $self->err(404, "not found");
525 }
399 } 526 }
400} 527}
401 528
402sub handle_dir { 529sub handle_dir {
403 my $self = shift; 530 my $self = shift;
404 my $idx = $self->diridx; 531 my $idx = $self->diridx;
405 532
406 $self->response(200, "ok", 533 $self->response(200, "ok",
407 { 534 {
408 "Content-Type" => "text/html", 535 "Content-Type" => "text/html; charset=utf-8",
409 "Content-Length" => length $idx, 536 "Content-Length" => length $idx,
537 "Last-Modified" => time2str ($self->{stat}[9]),
410 }, 538 },
411 $idx); 539 $idx);
412} 540}
413 541
414sub handle_file { 542sub handle_file {
415 my $self = shift; 543 my ($self, $queue, $tbf) = @_;
416 my $length = -s _; 544 my $length = $self->{stat}[7];
417 my $hdr = { 545 my $hdr = {
418 "Last-Modified" => time2str ((stat _)[9]), 546 "Last-Modified" => time2str ((stat _)[9]),
547 "Accept-Ranges" => "bytes",
419 }; 548 };
420 549
421 my @code = (200, "ok"); 550 my @code = (200, "ok");
422 my ($l, $h); 551 my ($l, $h);
423 552
… …
429 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 558 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
430 } else { 559 } else {
431 ($l, $h) = (0, $length - 1); 560 ($l, $h) = (0, $length - 1);
432 goto ignore; 561 goto ignore;
433 } 562 }
434 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 563 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
435 } 564 }
436 $hdr->{"Content-Range"} = "bytes */$length"; 565 $hdr->{"Content-Range"} = "bytes */$length";
437 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")"); 566 $hdr->{"Content-Length"} = $length;
438 $self->err(416, "not satisfiable", $hdr); 567 $self->err(416, "not satisfiable", $hdr, "");
439 568
440satisfiable: 569satisfiable:
441 # check for segmented downloads 570 # check for segmented downloads
442 if ($l && $::NO_SEGMENTED) { 571 if ($l && $::NO_SEGMENTED) {
572 my $timeout = $::NOW + 15;
443 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 573 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
444 Coro::Event::do_timer(after => 15); 574 if ($timeout <= $::NOW) {
445 575 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
446 $self->err(400, "segmented downloads are not allowed"); 576 #$self->err_segmented_download;
577 } else {
578 $httpevent->wait;
579 }
447 } 580 }
448 } 581 }
449 582
450 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 583 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
451 @code = (206, "partial content"); 584 @code = (206, "partial content");
… …
461 $hdr->{"Content-Length"} = $length; 594 $hdr->{"Content-Length"} = $length;
462 595
463 $self->response(@code, $hdr, ""); 596 $self->response(@code, $hdr, "");
464 597
465 if ($self->{method} eq "GET") { 598 if ($self->{method} eq "GET") {
599 $self->{time} = $::NOW;
600 $self->{written} = 0;
601
602 my $current = $Coro::current;
603
466 my ($fh, $buf, $r); 604 my ($fh, $buf, $r);
467 my $current = $Coro::current; 605
468 open $fh, "<", $self->{path} 606 open $fh, "<", $self->{path}
469 or die "$self->{path}: late open failure ($!)"; 607 or die "$self->{path}: late open failure ($!)";
470 608
471 $h -= $l - 1; 609 $h -= $l - 1;
472 610
473 if (0) { 611 if (0) { # !AIO
474 if ($l) { 612 if ($l) {
475 sysseek $fh, $l, 0; 613 sysseek $fh, $l, 0;
476 } 614 }
477 } 615 }
616
617 my $transfer = $queue->start_transfer($h);
618 my $locked;
619 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
478 620
479 while ($h > 0) { 621 while ($h > 0) {
480 if (0) { 622 unless ($locked) {
481 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 623 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
624 $bufsize = $::BUFSIZE;
625 $self->{time} = $::NOW;
626 $self->{written} = 0;
627 }
628 }
629
630 if ($blocked{$self->{remote_id}}) {
631 $self->{h}{connection} = "close";
632 die bless {}, err::;
633 }
634
635 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), $buf, 0
482 or last; 636 or last;
483 } else { 637
484 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 638 $tbf->request (length $buf);
485 $buf, 0, sub { 639 my $w = syswrite $self->{fh}, $buf
486 $r = $_[0];
487 $current->ready;
488 $scheduler->now;
489 });
490 &Coro::schedule;
491 last unless $r;
492 }
493 my $w = $self->{fh}->syswrite($buf)
494 or last; 640 or last;
495 $::written += $w; 641 $::written += $w;
496 $self->{written} += $w; 642 $self->{written} += $w;
497 $l += $r; 643 $l += $r;
498 } 644 }
499 }
500 645
501 close $fh; 646 close $fh;
647 }
502} 648}
503 649
5041; 6501
651

Diff Legend

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