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

Diff Legend

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