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

Diff Legend

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