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.2 by root, Thu Aug 9 19:11:13 2001 UTC vs.
Revision 1.87 by root, Wed Nov 19 11:41:06 2008 UTC

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

Diff Legend

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