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.10 by root, Sat Aug 11 16:34:47 2001 UTC vs.
Revision 1.91 by root, Thu Feb 4 22:35:47 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 and 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 => 1, 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';
137use IO::AIO;
75 138
139IO::AIO::min_parallel $::AIO_PARALLEL;
140
141our $AIO_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
142
76our %conn; # $conn{ip}{fh} => connobj 143our %conn; # $conn{ip}{self} => connobj
144our %uri; # $uri{ip}{uri}{self}
77our %blocked; 145our %blocked;
78our %mimetype; 146our %mimetype;
79 147
80sub read_mimetypes { 148sub read_mimetypes {
81 local *M;
82 if (open M, "<mime_types") { 149 if (open my $fh, "<mime_types") {
83 while (<M>) { 150 while (<$fh>) {
84 if (/^([^#]\S+)\t+(\S+)$/) { 151 if (/^([^#]\S+)\t+(\S+)$/) {
85 $mimetype{lc $1} = $2; 152 $mimetype{lc $1} = $2;
86 } 153 }
87 } 154 }
88 } else { 155 } else {
… …
92 159
93read_mimetypes; 160read_mimetypes;
94 161
95sub new { 162sub new {
96 my $class = shift; 163 my $class = shift;
164 my $fh = shift;
97 my $peername = shift; 165 my $peername = shift;
98 my $fh = shift;
99 my $self = bless { fh => $fh }, $class; 166 my $self = bless { fh => $fh }, $class;
100 my (undef, $iaddr) = unpack_sockaddr_in $peername 167 my (undef, $iaddr) = unpack_sockaddr_in $peername
101 or $self->err(500, "unable to decode peername"); 168 or $self->err (500, "unable to decode peername");
102 169
170 $self->{remote_addr} =
103 $self->{remote_addr} = inet_ntoa $iaddr; 171 $self->{remote_id} = inet_ntoa $iaddr;
104 172
105 # enter ourselves into various lists 173 $self->{time} = $::NOW;
106 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
107 174
175 weaken ($Coro::current->{conn} = $self);
176
177 ++$::conns;
178 $::maxconns = $::conns if $::conns > $::maxconns;
179
108 $self; 180 $self
109} 181}
110 182
111sub DESTROY { 183sub DESTROY {
112 my $self = shift; 184 my $self = shift;
113 delete $conn{$self->{remote_addr}}{$self*1}; 185
114 delete $uri{$self->{uri}}{$self*1}; 186 --$::conns;
115} 187}
188
189sub prune_cache {
190 my $hash = $_[0];
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 }
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;
116 212
117sub slog { 213sub slog {
118 my $self = shift; 214 my $self = shift;
119 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 215 main::slog($_[0], "$self->{remote_id}> $_[1]");
120} 216}
121 217
122sub response { 218sub response {
123 my ($self, $code, $msg, $hdr, $content) = @_; 219 my ($self, $code, $msg, $hdr, $content) = @_;
124 my $res = "HTTP/1.0 $code $msg\015\012"; 220 my $res = "HTTP/1.1 $code $msg\015\012";
221 my $GZ = "";
125 222
126 $res .= "Connection: close\015\012"; 223 if (exists $hdr->{Connection}) {
127 $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";
128 252
129 while (my ($h, $v) = each %$hdr) { 253 while (my ($h, $v) = each %$hdr) {
130 $res .= "$h: $v\015\012" 254 $res .= "$h: $v\015\012"
131 } 255 }
132 $res .= "\015\012"; 256 $res .= "\015\012";
133 257
134 $res .= $content if defined $content and $self->{method} eq "GET"; 258 $res .= $content if defined $content and $self->{method} ne "HEAD";
135 259
136 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";
137 263
138 print {$self->{fh}} $res; 264 print $::accesslog $log if $::accesslog;
265 print STDERR $log;
266
267 $tbf_top->request(length $res, 1e6);
268 $self->{written} += print {$self->{fh}} $res;
139} 269}
140 270
141sub err { 271sub err {
142 my $self = shift; 272 my $self = shift;
143 my ($code, $msg, $hdr, $content) = @_; 273 my ($code, $msg, $hdr, $content) = @_;
144 274
145 unless (defined $content) { 275 unless (defined $content) {
146 $content = "$code $msg"; 276 $content = "$code $msg\n";
147 $hdr->{"Content-Type"} = "text/plain"; 277 $hdr->{"Content-Type"} = "text/plain";
148 $hdr->{"Content-Length"} = length $content; 278 $hdr->{"Content-Length"} = length $content;
149 } 279 }
280 $hdr->{"Connection"} = "close";
150 281
151 $self->response($code, $msg, $hdr, $content); 282 $self->response ($code, $msg, $hdr, $content);
152 283
153 die bless {}, err::; 284 die bless {}, err::
154}
155
156sub err_blocked {
157 my $self = shift;
158 my $ip = $self->{remote_addr};
159 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
160
161 Coro::Event::do_timer(after => 5);
162
163 $self->err(403, "too many connections",
164 {
165 "Content-Type" => "text/html",
166 "Retry-After" => $::BLOCKTIME
167 },
168 <<EOF);
169<html><p>
170You have been blocked because you opened too many connections. You
171may retry at</p>
172
173 <p><blockquote>$time.</blockquote></p>
174
175<p>Until then, each new access will renew the block. You might want to have a
176look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
177</html>
178EOF
179} 285}
180 286
181sub handle { 287sub handle {
182 my $self = shift; 288 my $self = shift;
183 my $fh = $self->{fh}; 289 my $fh = $self->{fh};
184 290
291 my $host;
292
293 $fh->timeout($::REQ_TIMEOUT);
185 #while() { 294 while () {
295 $self->{reqs}++;
296
297 # read request and parse first line
298 my $req = $fh->readline("\015\012\015\012");
299
300 unless (defined $req) {
301 if (exists $self->{version}) {
302 last;
303 } else {
304 $self->err(408, "request timeout");
305 }
306 }
307
186 $self->{h} = {}; 308 $self->{h} = {};
187 309
188 # read request and parse first line
189 $fh->timeout($::REQ_TIMEOUT);
190 my $req = $fh->readline("\015\012\015\012");
191 $fh->timeout($::RES_TIMEOUT); 310 $fh->timeout($::RES_TIMEOUT);
192
193 defined $req or
194 $self->err(408, "request timeout");
195
196 my $ip = $self->{remote_addr};
197
198 if ($blocked{$ip}) {
199 $self->err_blocked($blocked{$ip})
200 if $blocked{$ip} > $::NOW;
201
202 delete $blocked{$ip};
203 }
204
205 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
206 $self->slog("blocked ip $ip");
207 $self->err_blocked;
208 }
209 311
210 $req =~ /^(?:\015\012)? 312 $req =~ /^(?:\015\012)?
211 (GET|HEAD) \040+ 313 (GET|HEAD) \040+
212 ([^\040]+) \040+ 314 ([^\040]+) \040+
213 HTTP\/([0-9]+\.[0-9]+) 315 HTTP\/([0-9]+\.[0-9]+)
214 \015\012/gx 316 \015\012/gx
215 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 317 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
216
217 $2 ne "1.0"
218 or $self->err(506, "http protocol version not supported");
219 318
220 $self->{method} = $1; 319 $self->{method} = $1;
221 $self->{uri} = $2; 320 $self->{uri} = $2;
321 $self->{version} = $3;
322
323 $3 =~ /^1\./
324 or $self->err(506, "http protocol version $3 not supported");
222 325
223 # parse headers 326 # parse headers
224 { 327 {
225 my (%hdr, $h, $v); 328 my (%hdr, $h, $v);
226 329
227 $hdr{lc $1} .= ",$2" 330 $hdr{lc $1} .= ",$2"
228 while $req =~ /\G 331 while $req =~ /\G
229 ([^:\000-\040]+): 332 ([^:\000-\040]+):
230 [\008\040]* 333 [\011\040]*
231 ((?: [^\015\012]+ | \015\012[\008\040] )*) 334 ((?: [^\015\012]+ | \015\012[\011\040] )*)
232 \015\012 335 \015\012
233 /gxc; 336 /gxc;
234 337
235 $req =~ /\G\015\012$/ 338 $req =~ /\G\015\012$/
236 or $self->err(400, "bad request"); 339 or $self->err(400, "bad request");
237 340
238 $self->{h}{$h} = substr $v, 1 341 $self->{h}{$h} = substr $v, 1
239 while ($h, $v) = each %hdr; 342 while ($h, $v) = each %hdr;
240 } 343 }
241 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) {
242 $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 }
243 380
381 $self->{server_name} = $host;
382
244 weaken ($uri{$self->{uri}}{$self*1} = $self); 383 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
245 384
385 eval {
246 $self->map_uri; 386 $self->map_uri;
247 $self->respond; 387 $self->respond;
388 };
389
390 die if $@ && !ref $@;
391
392 last if $self->{h}{connection} =~ /close/i;
393
394 $httpevent->broadcast;
395
396 $fh->timeout($::PER_TIMEOUT);
248 #} 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;
249} 406}
250 407
251# uri => path mapping 408# uri => path mapping
252sub map_uri { 409sub map_uri {
253 my $self = shift; 410 my $self = shift;
254 my $host = $self->{h}{host} || "default"; 411 my $host = $self->{server_name};
255 my $uri = $self->{uri}; 412 my $uri = $self->{uri};
413
414 $host =~ /[\/\\]/
415 and $self->err(400, "bad request");
256 416
257 # some massaging, also makes it more secure 417 # some massaging, also makes it more secure
258 $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;
259 $uri =~ s%//+%/%g; 419 $uri =~ s%//+%/%g;
260 $uri =~ s%/\.(?=/|$)%%g; 420 $uri =~ s%/\.(?=/|$)%%g;
… …
269 $self->{path} = "$::DOCROOT/$host$uri"; 429 $self->{path} = "$::DOCROOT/$host$uri";
270 430
271 $self->access_check; 431 $self->access_check;
272} 432}
273 433
274sub server_address {
275 my $self = shift;
276 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
277 or $self->err(500, "unable to get socket name");
278 ((inet_ntoa $iaddr), $port);
279}
280
281sub server_host {
282 my $self = shift;
283 if (exists $self->{h}{host}) {
284 return $self->{h}{host};
285 } else {
286 return (($self->server_address)[0]);
287 }
288}
289
290sub server_hostport {
291 my $self = shift;
292 my ($host, $port);
293 if (exists $self->{h}{host}) {
294 ($host, $port) = ($self->{h}{host}, $self->{server_port});
295 } else {
296 ($host, $port) = $self->server_address;
297 }
298 $port = $port == 80 ? "" : ":$port";
299 $host.$port;
300}
301
302sub _cgi { 434sub _cgi {
303 my $self = shift; 435 my $self = shift;
304 my $path = shift; 436 my $path = shift;
305 my $fh; 437 my $fh;
306 438
307 # no two-way xxx supported 439 # no two-way xxx supported
308 if (0 == fork) { 440 if (0 == fork) {
309 open STDOUT, ">&".fileno($self->{fh}); 441 open STDOUT, ">&".fileno($self->{fh});
310 if (chdir $::DOCROOT) { 442 if (chdir $::DOCROOT) {
311 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 443 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
312 $ENV{HTTP_HOST} = $self->server_host; 444 $ENV{HTTP_HOST} = $self->{server_name};
313 $ENV{HTTP_PORT} = $self->{server_host}; 445 $ENV{HTTP_PORT} = $self->{server_port};
314 $ENV{SCRIPT_NAME} = $self->{name}; 446 $ENV{SCRIPT_NAME} = $self->{name};
315 exec $path; 447 exec $path;
316 } 448 }
317 Coro::State::_exit(0); 449 Coro::State::_exit(0);
318 } else { 450 } else {
451 die;
319 } 452 }
453}
454
455sub server_hostport {
456 $_[0]{server_port} == 80
457 ? $_[0]{server_name}
458 : "$_[0]{server_name}:$_[0]{server_port}";
320} 459}
321 460
322sub respond { 461sub respond {
323 my $self = shift; 462 my $self = shift;
324 my $path = $self->{path}; 463 my $path = $self->{path};
325 464
326 stat $path 465 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
327 or $self->err(404, "not found"); 466 if ($::internal{$1}) {
328 467 $::internal{$1}->($self);
329 $self->{stat} = [stat _];
330
331 # idiotic netscape sends idiotic headers AGAIN
332 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
333 ? str2time $1 : 0;
334
335 if (-d _ && -r _) {
336 # directory
337 if ($path !~ /\/$/) {
338 # create a redirect to get the trailing "/"
339 my $host = $self->server_hostport;
340 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
341 } 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 {
342 $ims < $self->{stat}[9] 489 $ims < $self->{stat}[9]
343 or $self->err(304, "not modified"); 490 or $self->err (304, "not modified");
344 491
345 if ($self->{method} eq "GET") {
346 if (-r "$path/index.html") { 492 if (-r "$path/index.html") {
493 # replace directory "size" by index.html filesize
347 $self->{path} .= "/index.html"; 494 $self->{stat} = [stat ($self->{path} .= "/index.html")];
348 $self->handle_file; 495 $self->handle_file ($queue_index, $tbf_top);
349 } else { 496 } else {
350 $self->handle_dir; 497 $self->handle_dir;
351 } 498 }
352 } 499 }
353 }
354 } elsif (-f _ && -r _) { 500 } elsif (-f _ && -r _) {
355 -x _ and $self->err(403, "forbidden"); 501 -x _ and $self->err (403, "forbidden");
356 $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);
357 } else { 515 } else {
358 $self->err(404, "not found"); 516 $self->err (404, "not found");
517 }
359 } 518 }
360} 519}
361 520
362sub handle_dir { 521sub handle_dir {
363 my $self = shift; 522 my $self = shift;
364 my $idx = $self->diridx; 523 my $idx = $self->diridx;
365 524
366 $self->response(200, "ok", 525 $self->response (200, "ok",
367 { 526 {
368 "Content-Type" => "text/html", 527 "Content-Type" => "text/html; charset=utf-8",
369 "Content-Length" => length $idx, 528 "Content-Length" => length $idx,
529 "Last-Modified" => time2str ($self->{stat}[9]),
370 }, 530 },
371 $idx); 531 $idx);
372} 532}
373 533
374sub handle_file { 534sub handle_file {
375 my $self = shift; 535 my ($self, $queue, $tbf) = @_;
376 my $length = -s _; 536 my $length = $self->{stat}[7];
377 my $hdr = { 537 my $hdr = {
378 "Last-Modified" => time2str ((stat _)[9]), 538 "Last-Modified" => time2str ((stat _)[9]),
539 "Accept-Ranges" => "bytes",
379 }; 540 };
380 541
381 my @code = (200, "ok"); 542 my @code = (200, "ok");
382 my ($l, $h); 543 my ($l, $h);
383 544
384 if ($self->{h}{range} =~ /^bytes=(.*)$/) { 545 if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
385 for (split /,/, $1) { 546 for (split /,/, $1) {
386 if (/^-(\d+)$/) { 547 if (/^-(\d+)$/) {
387 ($l, $h) = ($length - $1, $length - 1); 548 ($l, $h) = ($length - $1, $length - 1);
388 } elsif (/^(\d+)-(\d*)$/) { 549 } elsif (/^(\d+)-(\d*)$/) {
389 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 550 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
390 } else { 551 } else {
391 ($l, $h) = (0, $length - 1); 552 ($l, $h) = (0, $length - 1);
392 goto ignore; 553 goto ignore;
393 } 554 }
394 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 555 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
395 } 556 }
396 $hdr->{"Content-Range"} = "bytes */$length"; 557 $hdr->{"Content-Range"} = "bytes */$length";
558 $hdr->{"Content-Length"} = $length;
397 $self->err(416, "not satisfiable", $hdr); 559 $self->err (416, "not satisfiable", $hdr, "");
398 560
399satisfiable: 561satisfiable:
400 # check for segmented downloads 562 # check for segmented downloads
401 if ($l && $::NO_SEGMENTED) { 563 if ($l && $::NO_SEGMENTED) {
402 if (%{$uri{$self->{uri}}} > 1) { 564 my $timeout = $::NOW + 15;
403 $self->slog("segmented download refused\n"); 565 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
404 $self->err(400, "segmented downloads are not allowed"); 566 if ($timeout <= $::NOW) {
567 $self->block ($::BLOCKTIME, "segmented downloads are forbidden");
568 #$self->err_segmented_download;
569 } else {
570 $httpevent->wait;
571 }
405 } 572 }
406 } 573 }
407 574
408 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 575 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
409 @code = (206, "partial content"); 576 @code = (206, "partial content");
… …
416 583
417 $self->{path} =~ /\.([^.]+)$/; 584 $self->{path} =~ /\.([^.]+)$/;
418 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream"; 585 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
419 $hdr->{"Content-Length"} = $length; 586 $hdr->{"Content-Length"} = $length;
420 587
421 $self->response(@code, $hdr, ""); 588 $self->response (@code, $hdr, "");
422 589
423 if ($self->{method} eq "GET") { 590 if ($self->{method} eq "GET") {
424 my ($fh, $buf); 591 $self->{time} = $::NOW;
425 open $fh, "<", $self->{path} 592 $self->{written} = 0;
593
594 my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
426 or die "$self->{path}: late open failure ($!)"; 595 or die "$self->{path}: late open failure ($!)";
427 596
428 if ($l) {
429 sysseek $fh, $l, 0
430 or die "$self->{path}: cannot seek to $l ($!)";
431 }
432
433 $h -= $l - 1; 597 $h -= $l - 1;
434 598
599 my $transfer = $queue->start_transfer ($h);
600 my $locked;
601 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
602
435 while ($h > 0) { 603 while ($h > 0) {
436 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 604 Coro::cede;
437 $self->{fh}->syswrite($buf) 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
438 or last; 621 or last;
439 }
440 }
441 622
623 $tbf->request (length $buf);
624 my $w = $self->{fh}->syswrite ($buf)
625 or last;
626 $::written += $w;
627 $self->{written} += $w;
628 $l += $w;
629 }
630
442 close $fh; 631 close $fh;
632 }
443} 633}
444 634
4451; 6351
636

Diff Legend

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