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

Diff Legend

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