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

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.16 by root, Tue Aug 14 19:38:25 2001 UTC vs.
Revision 1.79 by root, Fri Dec 1 03:53:33 2006 UTC

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

Diff Legend

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