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.20 by root, Thu Aug 16 21:55:35 2001 UTC vs.
Revision 1.84 by root, Sat Dec 8 21:01:16 2007 UTC

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

Diff Legend

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