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

Diff Legend

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