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.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 }
42} 97}
43 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 };
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 IO::AIO;
75 146
147IO::AIO::min_parallel $::AIO_PARALLEL;
148
149Event->io (fd => IO::AIO::poll_fileno,
150 poll => 'r', async => 1,
151 cb => \&IO::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;
… …
92 170
93read_mimetypes; 171read_mimetypes;
94 172
95sub new { 173sub new {
96 my $class = shift; 174 my $class = shift;
175 my $fh = shift;
97 my $peername = shift; 176 my $peername = shift;
98 my $fh = shift;
99 my $self = bless { fh => $fh }, $class; 177 my $self = bless { fh => $fh }, $class;
100 my (undef, $iaddr) = unpack_sockaddr_in $peername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
101 or $self->err(500, "unable to decode peername"); 179 or $self->err(500, "unable to decode peername");
102 180
181 $self->{remote_addr} =
103 $self->{remote_addr} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
104 183
105 # enter ourselves into various lists 184 $self->{time} = $::NOW;
106 weaken ($conn{$self->{remote_addr}}{$self*1} = $self); 185
186 weaken ($Coro::current->{conn} = $self);
187
188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
107 190
108 $self; 191 $self;
109} 192}
110 193
111sub DESTROY { 194sub DESTROY {
112 my $self = shift; 195 #my $self = shift;
113 delete $conn{$self->{remote_addr}}{$self*1}; 196 $::conns--;
114 delete $uri{$self->{uri}}{$self*1};
115} 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);
116 223
117sub slog { 224sub slog {
118 my $self = shift; 225 my $self = shift;
119 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 226 main::slog($_[0], "$self->{remote_id}> $_[1]");
120} 227}
121 228
122sub response { 229sub response {
123 my ($self, $code, $msg, $hdr, $content) = @_; 230 my ($self, $code, $msg, $hdr, $content) = @_;
124 my $res = "HTTP/1.0 $code $msg\015\012"; 231 my $res = "HTTP/1.1 $code $msg\015\012";
232 my $GZ = "";
125 233
126 $res .= "Connection: close\015\012"; 234 if (exists $hdr->{Connection}) {
127 $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";
128 263
129 while (my ($h, $v) = each %$hdr) { 264 while (my ($h, $v) = each %$hdr) {
130 $res .= "$h: $v\015\012" 265 $res .= "$h: $v\015\012"
131 } 266 }
132 $res .= "\015\012"; 267 $res .= "\015\012";
133 268
134 $res .= $content if defined $content and $self->{method} eq "GET"; 269 $res .= $content if defined $content and $self->{method} ne "HEAD";
135 270
136 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";
137 274
138 print {$self->{fh}} $res; 275 print $::accesslog $log if $::accesslog;
276 print STDERR $log;
277
278 $tbf_top->request(length $res, 1e6);
279 $self->{written} += print {$self->{fh}} $res;
139} 280}
140 281
141sub err { 282sub err {
142 my $self = shift; 283 my $self = shift;
143 my ($code, $msg, $hdr, $content) = @_; 284 my ($code, $msg, $hdr, $content) = @_;
144 285
145 unless (defined $content) { 286 unless (defined $content) {
146 $content = "$code $msg"; 287 $content = "$code $msg\n";
147 $hdr->{"Content-Type"} = "text/plain"; 288 $hdr->{"Content-Type"} = "text/plain";
148 $hdr->{"Content-Length"} = length $content; 289 $hdr->{"Content-Length"} = length $content;
149 } 290 }
291 $hdr->{"Connection"} = "close";
150 292
151 $self->response($code, $msg, $hdr, $content); 293 $self->response($code, $msg, $hdr, $content);
152 294
153 die bless {}, err::; 295 die bless {}, err::;
154} 296}
155 297
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}
180
181sub handle { 298sub handle {
182 my $self = shift; 299 my $self = shift;
183 my $fh = $self->{fh}; 300 my $fh = $self->{fh};
184 301
302 my $host;
303
304 $fh->timeout($::REQ_TIMEOUT);
185 #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
186 $self->{h} = {}; 319 $self->{h} = {};
187 320
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); 321 $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 322
210 $req =~ /^(?:\015\012)? 323 $req =~ /^(?:\015\012)?
211 (GET|HEAD) \040+ 324 (GET|HEAD) \040+
212 ([^\040]+) \040+ 325 ([^\040]+) \040+
213 HTTP\/([0-9]+\.[0-9]+) 326 HTTP\/([0-9]+\.[0-9]+)
214 \015\012/gx 327 \015\012/gx
215 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 328 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 329
220 $self->{method} = $1; 330 $self->{method} = $1;
221 $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");
222 336
223 # parse headers 337 # parse headers
224 { 338 {
225 my (%hdr, $h, $v); 339 my (%hdr, $h, $v);
226 340
227 $hdr{lc $1} .= ",$2" 341 $hdr{lc $1} .= ",$2"
228 while $req =~ /\G 342 while $req =~ /\G
229 ([^:\000-\040]+): 343 ([^:\000-\040]+):
230 [\008\040]* 344 [\011\040]*
231 ((?: [^\015\012]+ | \015\012[\008\040] )*) 345 ((?: [^\015\012]+ | \015\012[\011\040] )*)
232 \015\012 346 \015\012
233 /gxc; 347 /gxc;
234 348
235 $req =~ /\G\015\012$/ 349 $req =~ /\G\015\012$/
236 or $self->err(400, "bad request"); 350 or $self->err(400, "bad request");
237 351
238 $self->{h}{$h} = substr $v, 1 352 $self->{h}{$h} = substr $v, 1
239 while ($h, $v) = each %hdr; 353 while ($h, $v) = each %hdr;
240 } 354 }
241 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) {
242 $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 }
243 391
392 $self->{server_name} = $host;
393
244 weaken ($uri{$self->{uri}}{$self*1} = $self); 394 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
245 395
396 eval {
246 $self->map_uri; 397 $self->map_uri;
247 $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);
248 #} 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;
249} 417}
250 418
251# uri => path mapping 419# uri => path mapping
252sub map_uri { 420sub map_uri {
253 my $self = shift; 421 my $self = shift;
254 my $host = $self->{h}{host} || "default"; 422 my $host = $self->{server_name};
255 my $uri = $self->{uri}; 423 my $uri = $self->{uri};
256 424
257 # some massaging, also makes it more secure 425 # some massaging, also makes it more secure
258 $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;
259 $uri =~ s%//+%/%g; 427 $uri =~ s%//+%/%g;
… …
269 $self->{path} = "$::DOCROOT/$host$uri"; 437 $self->{path} = "$::DOCROOT/$host$uri";
270 438
271 $self->access_check; 439 $self->access_check;
272} 440}
273 441
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 { 442sub _cgi {
303 my $self = shift; 443 my $self = shift;
304 my $path = shift; 444 my $path = shift;
305 my $fh; 445 my $fh;
306 446
307 # no two-way xxx supported 447 # no two-way xxx supported
308 if (0 == fork) { 448 if (0 == fork) {
309 open STDOUT, ">&".fileno($self->{fh}); 449 open STDOUT, ">&".fileno($self->{fh});
310 if (chdir $::DOCROOT) { 450 if (chdir $::DOCROOT) {
311 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 451 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
312 $ENV{HTTP_HOST} = $self->server_host; 452 $ENV{HTTP_HOST} = $self->{server_name};
313 $ENV{HTTP_PORT} = $self->{server_host}; 453 $ENV{HTTP_PORT} = $self->{server_port};
314 $ENV{SCRIPT_NAME} = $self->{name}; 454 $ENV{SCRIPT_NAME} = $self->{name};
315 exec $path; 455 exec $path;
316 } 456 }
317 Coro::State::_exit(0); 457 Coro::State::_exit(0);
318 } else { 458 } else {
459 die;
319 } 460 }
461}
462
463sub server_hostport {
464 $_[0]{server_port} == 80
465 ? $_[0]{server_name}
466 : "$_[0]{server_name}:$_[0]{server_port}";
320} 467}
321 468
322sub respond { 469sub respond {
323 my $self = shift; 470 my $self = shift;
324 my $path = $self->{path}; 471 my $path = $self->{path};
325 472
326 stat $path 473 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
327 or $self->err(404, "not found"); 474 if ($::internal{$1}) {
328 475 $::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 { 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 {
342 $ims < $self->{stat}[9] 497 $ims < $self->{stat}[9]
343 or $self->err(304, "not modified"); 498 or $self->err(304, "not modified");
344 499
345 if ($self->{method} eq "GET") {
346 if (-r "$path/index.html") { 500 if (-r "$path/index.html") {
501 # replace directory "size" by index.html filesize
347 $self->{path} .= "/index.html"; 502 $self->{stat} = [stat ($self->{path} .= "/index.html")];
348 $self->handle_file; 503 $self->handle_file($queue_index, $tbf_top);
349 } else { 504 } else {
350 $self->handle_dir; 505 $self->handle_dir;
351 } 506 }
352 } 507 }
353 }
354 } elsif (-f _ && -r _) { 508 } elsif (-f _ && -r _) {
355 -x _ and $self->err(403, "forbidden"); 509 -x _ and $self->err(403, "forbidden");
356 $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);
357 } else { 523 } else {
358 $self->err(404, "not found"); 524 $self->err(404, "not found");
525 }
359 } 526 }
360} 527}
361 528
362sub handle_dir { 529sub handle_dir {
363 my $self = shift; 530 my $self = shift;
364 my $idx = $self->diridx; 531 my $idx = $self->diridx;
365 532
366 $self->response(200, "ok", 533 $self->response(200, "ok",
367 { 534 {
368 "Content-Type" => "text/html", 535 "Content-Type" => "text/html; charset=utf-8",
369 "Content-Length" => length $idx, 536 "Content-Length" => length $idx,
537 "Last-Modified" => time2str ($self->{stat}[9]),
370 }, 538 },
371 $idx); 539 $idx);
372} 540}
373 541
374sub handle_file { 542sub handle_file {
375 my $self = shift; 543 my ($self, $queue, $tbf) = @_;
376 my $length = -s _; 544 my $length = $self->{stat}[7];
377 my $hdr = { 545 my $hdr = {
378 "Last-Modified" => time2str ((stat _)[9]), 546 "Last-Modified" => time2str ((stat _)[9]),
547 "Accept-Ranges" => "bytes",
379 }; 548 };
380 549
381 my @code = (200, "ok"); 550 my @code = (200, "ok");
382 my ($l, $h); 551 my ($l, $h);
383 552
… …
389 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 558 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
390 } else { 559 } else {
391 ($l, $h) = (0, $length - 1); 560 ($l, $h) = (0, $length - 1);
392 goto ignore; 561 goto ignore;
393 } 562 }
394 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 563 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
395 } 564 }
396 $hdr->{"Content-Range"} = "bytes */$length"; 565 $hdr->{"Content-Range"} = "bytes */$length";
566 $hdr->{"Content-Length"} = $length;
397 $self->err(416, "not satisfiable", $hdr); 567 $self->err(416, "not satisfiable", $hdr, "");
398 568
399satisfiable: 569satisfiable:
400 # check for segmented downloads 570 # check for segmented downloads
401 if ($l && $::NO_SEGMENTED) { 571 if ($l && $::NO_SEGMENTED) {
402 if (%{$uri{$self->{uri}}} > 1) { 572 my $timeout = $::NOW + 15;
403 $self->slog("segmented download refused\n"); 573 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
404 $self->err(400, "segmented downloads are not allowed"); 574 if ($timeout <= $::NOW) {
575 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
576 #$self->err_segmented_download;
577 } else {
578 $httpevent->wait;
579 }
405 } 580 }
406 } 581 }
407 582
408 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 583 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
409 @code = (206, "partial content"); 584 @code = (206, "partial content");
… …
419 $hdr->{"Content-Length"} = $length; 594 $hdr->{"Content-Length"} = $length;
420 595
421 $self->response(@code, $hdr, ""); 596 $self->response(@code, $hdr, "");
422 597
423 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
424 my ($fh, $buf); 604 my ($fh, $buf, $r);
605
425 open $fh, "<", $self->{path} 606 open $fh, "<", $self->{path}
426 or die "$self->{path}: late open failure ($!)"; 607 or die "$self->{path}: late open failure ($!)";
427 608
428 if ($l) {
429 sysseek $fh, $l, 0
430 or die "$self->{path}: cannot seek to $l ($!)";
431 }
432
433 $h -= $l - 1; 609 $h -= $l - 1;
434 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
435 while ($h > 0) { 621 while ($h > 0) {
436 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 622 unless ($locked) {
437 $self->{fh}->syswrite($buf) 623 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
624 $bufsize = $::BUFSIZE;
625 $self->{time} = $::NOW;
626 $self->{written} = 0;
627 }
628 }
629
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
438 or last; 636 or last;
439 }
440 }
441 637
638 $tbf->request (length $buf);
639 my $w = syswrite $self->{fh}, $buf
640 or last;
641 $::written += $w;
642 $self->{written} += $w;
643 $l += $r;
644 }
645
442 close $fh; 646 close $fh;
647 }
443} 648}
444 649
4451; 6501
651

Diff Legend

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