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.92 by root, Tue Mar 9 16:46:23 2010 UTC

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

Diff Legend

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