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

Diff Legend

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