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.1 by root, Thu Aug 9 02:57:54 2001 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

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

Diff Legend

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