ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.8 by root, Sat Aug 11 03:41:01 2001 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

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

Diff Legend

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