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.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
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
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
22sub slog { 47sub slog {
23 my $level = shift; 48 my $level = shift;
24 my $format = shift; 49 my $format = shift;
50 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
25 printf "---: $format\n", @_; 51 printf "$NOW: $format\n", @_;
52 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
26} 53}
27 54
28my $connections = new Coro::Semaphore $MAX_CONNECTS; 55our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
56our $httpevent = new Coro::Signal;
29 57
30my @fh; 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}
75
76my @newcons;
31my @pool; 77my @pool;
32 78
33# one "execution thread" 79# one "execution thread"
34sub handler { 80sub handler {
35 while () { 81 while () {
36 my $fh = pop @fh; 82 if (@newcons) {
37 if ($fh) {
38 eval { 83 eval {
39 conn->new($fh)->handle; 84 conn->new(@{pop @newcons})->handle;
40 }; 85 };
41 close $fh;
42 slog 1, "$@" if $@ && !ref $@; 86 slog 1, "$@" if $@ && !ref $@;
87
88 $httpevent->broadcast; # only for testing, but doesn't matter much
89
43 $connections->up; 90 $connections->up;
44 } else { 91 } else {
45 last if @pool >= $MAX_POOL; 92 last if @pool >= $MAX_POOL;
46 push @pool, $Coro::current; 93 push @pool, $Coro::current;
47 schedule; 94 schedule;
48 } 95 }
49 } 96 }
50} 97}
51 98
99sub listen_on {
100 my $listen = $_[0];
101
102 push @listen_sockets, $listen;
103
52# the "main thread" 104 # the "main thread"
53async { 105 async {
54 slog 1, "accepting connections"; 106 slog 1, "accepting connections";
55 while () { 107 while () {
56 $connections->down; 108 $connections->down;
57 push @fh, $port->accept; 109 push @newcons, [$listen->accept];
58 #slog 3, "accepted @$connections ".scalar(@pool); 110 #slog 3, "accepted @$connections ".scalar(@pool);
59 if (@pool) { 111 if (@pool) {
60 (pop @pool)->ready; 112 (pop @pool)->ready;
61 } else { 113 } else {
62 async \&handler; 114 async \&handler;
63 } 115 }
64 116 }
65 } 117 };
66}; 118}
67 119
68loop; 120my $http_port = new Coro::Socket
69print "ende\n";#d# 121 LocalAddr => $SERVER_HOST,
122 LocalPort => $SERVER_PORT,
123 ReuseAddr => 1,
124 Listen => 50,
125 or die "unable to start server";
126
127listen_on $http_port;
128
129if ($SERVER_PORT2) {
130 my $http_port = new Coro::Socket
131 LocalAddr => $SERVER_HOST,
132 LocalPort => $SERVER_PORT2,
133 ReuseAddr => 1,
134 Listen => 50,
135 or die "unable to start server";
136
137 listen_on $http_port;
138}
70 139
71package conn; 140package conn;
72 141
73use Socket; 142use Socket;
74use HTTP::Date; 143use HTTP::Date;
75use Convert::Scalar 'weaken'; 144use Convert::Scalar 'weaken';
145use IO::AIO;
76 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
77my %conn; # $conn{ip}{fh} => connobj 153our %conn; # $conn{ip}{self} => connobj
154our %uri; # $uri{ip}{uri}{self}
155our %blocked;
156our %mimetype;
157
158sub read_mimetypes {
159 local *M;
160 if (open M, "<mime_types") {
161 while (<M>) {
162 if (/^([^#]\S+)\t+(\S+)$/) {
163 $mimetype{lc $1} = $2;
164 }
165 }
166 } else {
167 print "cannot open mime_types\n";
168 }
169}
170
171read_mimetypes;
78 172
79sub new { 173sub new {
80 my $class = shift; 174 my $class = shift;
81 my $fh = shift; 175 my $fh = shift;
176 my $peername = shift;
82 my $self = bless { fh => $fh }, $class; 177 my $self = bless { fh => $fh }, $class;
83 my (undef, $iaddr) = unpack_sockaddr_in $fh->getpeername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
84 or $self->err(500, "unable to get peername"); 179 or $self->err(500, "unable to decode peername");
180
181 $self->{remote_addr} =
85 $self->{remote_address} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
86 183
87 # enter ourselves into various lists 184 $self->{time} = $::NOW;
88 weaken ($conn{$self->{remote_address}}{$self*1} = $self); 185
89 print $self->{remote_address}.": ".($self*1)." > ".%{$conn{$self->{remote_address}}},"\n"; 186 weaken ($Coro::current->{conn} = $self);
187
188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
190
90 $self; 191 $self;
91} 192}
92 193
93sub DESTROY { 194sub DESTROY {
94 my $self = shift; 195 #my $self = shift;
95 delete $conn{$self->{remote_address}}{$self*1}; 196 $::conns--;
96} 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);
97 223
98sub slog { 224sub slog {
99 main::slog(@_); 225 my $self = shift;
226 main::slog($_[0], "$self->{remote_id}> $_[1]");
100} 227}
101 228
102sub print_response { 229sub response {
103 my ($self, $code, $msg, $hdr, $content) = @_; 230 my ($self, $code, $msg, $hdr, $content) = @_;
104 my $res = "HTTP/1.0 $code $msg\015\012"; 231 my $res = "HTTP/1.1 $code $msg\015\012";
232 my $GZ = "";
105 233
106 $hdr->{Date} = time2str time; # slow? nah. 234 if (exists $hdr->{Connection}) {
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";
107 263
108 while (my ($h, $v) = each %$hdr) { 264 while (my ($h, $v) = each %$hdr) {
109 $res .= "$h: $v\015\012" 265 $res .= "$h: $v\015\012"
110 } 266 }
111 $res .= "\015\012$content" if defined $content; 267 $res .= "\015\012";
112 268
113 print STDERR "$self->{remote_address} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 269 $res .= $content if defined $content and $self->{method} ne "HEAD";
114 270
115 print {$self->{fh}} $res; 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";
274
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;
116} 280}
117 281
118sub err { 282sub err {
119 my $self = shift; 283 my $self = shift;
120 my ($code, $msg, $hdr, $content) = @_; 284 my ($code, $msg, $hdr, $content) = @_;
121 285
122 unless (defined $content) { 286 unless (defined $content) {
123 $content = "$code $msg"; 287 $content = "$code $msg\n";
124 $hdr->{"Content-Type"} = "text/plain"; 288 $hdr->{"Content-Type"} = "text/plain";
125 $hdr->{"Content-Length"} = length $content; 289 $hdr->{"Content-Length"} = length $content;
126 } 290 }
291 $hdr->{"Connection"} = "close";
127 292
128 $self->slog($msg) if $code;
129
130 $self->print_response($code, $msg, $hdr, $content); 293 $self->response($code, $msg, $hdr, $content);
131 294
132 die bless {}, err::; 295 die bless {}, err::;
133} 296}
134 297
135sub handle { 298sub handle {
136 my $self = shift; 299 my $self = shift;
137 my $fh = $self->{fh}; 300 my $fh = $self->{fh};
138 301
302 my $host;
303
304 $fh->timeout($::REQ_TIMEOUT);
139 #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
140 $self->{h} = {}; 319 $self->{h} = {};
141 320
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); 321 $fh->timeout($::RES_TIMEOUT);
146
147 defined $req or
148 $self->err(408, "request timeout");
149 322
150 $req =~ /^(?:\015\012)? 323 $req =~ /^(?:\015\012)?
151 (GET|HEAD) \040+ 324 (GET|HEAD) \040+
152 ([^\040]+) \040+ 325 ([^\040]+) \040+
153 HTTP\/([0-9]+\.[0-9]+) 326 HTTP\/([0-9]+\.[0-9]+)
154 \015\012/gx 327 \015\012/gx
155 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 328 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 329
160 $self->{method} = $1; 330 $self->{method} = $1;
161 $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");
162 336
163 # parse headers 337 # parse headers
164 { 338 {
165 my (%hdr, $h, $v); 339 my (%hdr, $h, $v);
166 340
167 $hdr{lc $1} .= ",$2" 341 $hdr{lc $1} .= ",$2"
168 while $req =~ /\G 342 while $req =~ /\G
169 ([^:\000-\040]+): 343 ([^:\000-\040]+):
170 [\008\040]* 344 [\011\040]*
171 ((?: [^\015\012]+ | \015\012[\008\040] )*) 345 ((?: [^\015\012]+ | \015\012[\011\040] )*)
172 \015\012 346 \015\012
173 /gxc; 347 /gxc;
174 348
175 $req =~ /\G\015\012$/ 349 $req =~ /\G\015\012$/
176 or $self->err(400, "bad request"); 350 or $self->err(400, "bad request");
177 351
178 $self->{h}{$h} = substr $v, 1 352 $self->{h}{$h} = substr $v, 1
179 while ($h, $v) = each %hdr; 353 while ($h, $v) = each %hdr;
180 } 354 }
181 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) {
182 $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 }
183 391
392 $self->{server_name} = $host;
393
394 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
395
396 eval {
184 $self->map_uri; 397 $self->map_uri;
185
186 Coro::Event::do_timer(after => 5);
187
188 $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);
189 #} 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;
190} 417}
191 418
192# uri => path mapping 419# uri => path mapping
193sub map_uri { 420sub map_uri {
194 my $self = shift; 421 my $self = shift;
195 my $host = $self->{h}{host} || "default"; 422 my $host = $self->{server_name};
196 my $uri = $self->{uri}; 423 my $uri = $self->{uri};
197 424
198 # some massaging, also makes it more secure 425 # some massaging, also makes it more secure
199 $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;
200 $uri =~ s%//+%/%g; 427 $uri =~ s%//+%/%g;
… …
206 433
207 $self->{name} = $uri; 434 $self->{name} = $uri;
208 435
209 # now do the path mapping 436 # now do the path mapping
210 $self->{path} = "$::DOCROOT/$host$uri"; 437 $self->{path} = "$::DOCROOT/$host$uri";
211}
212 438
213sub server_address { 439 $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} 440}
240 441
241sub _cgi { 442sub _cgi {
242 my $self = shift; 443 my $self = shift;
243 my $path = shift; 444 my $path = shift;
… …
246 # no two-way xxx supported 447 # no two-way xxx supported
247 if (0 == fork) { 448 if (0 == fork) {
248 open STDOUT, ">&".fileno($self->{fh}); 449 open STDOUT, ">&".fileno($self->{fh});
249 if (chdir $::DOCROOT) { 450 if (chdir $::DOCROOT) {
250 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 451 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
251 $ENV{HTTP_HOST} = $self->server_host; 452 $ENV{HTTP_HOST} = $self->{server_name};
252 $ENV{HTTP_PORT} = $self->{server_host}; 453 $ENV{HTTP_PORT} = $self->{server_port};
253 $ENV{SCRIPT_NAME} = $self->{name}; 454 $ENV{SCRIPT_NAME} = $self->{name};
254 exec $::INDEXPROG; 455 exec $path;
255 } 456 }
256 Coro::State::_exit(0); 457 Coro::State::_exit(0);
257 } else { 458 } else {
459 die;
258 } 460 }
461}
462
463sub server_hostport {
464 $_[0]{server_port} == 80
465 ? $_[0]{server_name}
466 : "$_[0]{server_name}:$_[0]{server_port}";
259} 467}
260 468
261sub respond { 469sub respond {
262 my $self = shift; 470 my $self = shift;
263 my $path = $self->{path}; 471 my $path = $self->{path};
264 472
265 stat $path 473 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
266 or $self->err(404, "not found"); 474 if ($::internal{$1}) {
267 475 $::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 { 476 } else {
279 $ims < (stat _)[9] 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 {
497 $ims < $self->{stat}[9]
280 or $self->err(304, "not modified"); 498 or $self->err(304, "not modified");
281 499
282 if ($self->{method} eq "GET") {
283 if (-r "$path/index.html") { 500 if (-r "$path/index.html") {
501 # replace directory "size" by index.html filesize
284 $self->{path} .= "/index.html"; 502 $self->{stat} = [stat ($self->{path} .= "/index.html")];
285 $self->handle_file; 503 $self->handle_file($queue_index, $tbf_top);
286 } else { 504 } else {
287 $self->handle_dir; 505 $self->handle_dir;
288 } 506 }
289 } 507 }
290 }
291 } elsif (-f _ && -r _) { 508 } elsif (-f _ && -r _) {
292 -x _ and $self->err(403, "forbidden"); 509 -x _ and $self->err(403, "forbidden");
293 $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);
294 } else { 523 } else {
295 $self->err(404, "not found"); 524 $self->err(404, "not found");
525 }
296 } 526 }
297} 527}
298 528
299sub handle_dir { 529sub handle_dir {
300 my $self = shift; 530 my $self = shift;
301 $self->_cgi($::INDEXPROG); 531 my $idx = $self->diridx;
532
533 $self->response(200, "ok",
534 {
535 "Content-Type" => "text/html; charset=utf-8",
536 "Content-Length" => length $idx,
537 "Last-Modified" => time2str ($self->{stat}[9]),
538 },
539 $idx);
302} 540}
303 541
304sub handle_file { 542sub handle_file {
305 my $self = shift; 543 my ($self, $queue, $tbf) = @_;
306 my $length = -s _; 544 my $length = $self->{stat}[7];
307 my $hdr = { 545 my $hdr = {
308 "Last-Modified" => time2str ((stat _)[9]), 546 "Last-Modified" => time2str ((stat _)[9]),
547 "Accept-Ranges" => "bytes",
309 }; 548 };
310 549
311 my @code = (200, "ok"); 550 my @code = (200, "ok");
312 my ($l, $h); 551 my ($l, $h);
313 552
… …
319 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 558 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
320 } else { 559 } else {
321 ($l, $h) = (0, $length - 1); 560 ($l, $h) = (0, $length - 1);
322 goto ignore; 561 goto ignore;
323 } 562 }
324 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 563 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
325 } 564 }
326 $hdr->{"Content-Range"} = "bytes */$length"; 565 $hdr->{"Content-Range"} = "bytes */$length";
566 $hdr->{"Content-Length"} = $length;
327 $self->err(416, "not satisfiable", $hdr); 567 $self->err(416, "not satisfiable", $hdr, "");
328 568
329satisfiable: 569satisfiable:
570 # check for segmented downloads
571 if ($l && $::NO_SEGMENTED) {
572 my $timeout = $::NOW + 15;
573 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
574 if ($timeout <= $::NOW) {
575 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
576 #$self->err_segmented_download;
577 } else {
578 $httpevent->wait;
579 }
580 }
581 }
582
330 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 583 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
331 @code = (206, "partial content"); 584 @code = (206, "partial content");
332 $length = $h - $l + 1; 585 $length = $h - $l + 1;
333 586
334ignore: 587ignore:
335 } else { 588 } else {
336 ($l, $h) = (0, $length - 1); 589 ($l, $h) = (0, $length - 1);
337 } 590 }
338 591
339 if ($self->{path} =~ /\.html$/) { 592 $self->{path} =~ /\.([^.]+)$/;
340 $hdr->{"Content-Type"} = "text/html";
341 } else {
342 $hdr->{"Content-Type"} = "application/octet-stream"; 593 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
343 }
344
345 $hdr->{"Content-Length"} = $length; 594 $hdr->{"Content-Length"} = $length;
346 595
347 $self->print_response(@code, $hdr, ""); 596 $self->response(@code, $hdr, "");
348 597
349 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
350 my ($fh, $buf); 604 my ($fh, $buf, $r);
605
351 open $fh, "<", $self->{path} 606 open $fh, "<", $self->{path}
352 or die "$self->{path}: late open failure ($!)"; 607 or die "$self->{path}: late open failure ($!)";
353 608
354 if ($l) {
355 sysseek $fh, $l, 0
356 or die "$self->{path}: cannot seek to $l ($!)";
357 }
358
359 $h -= $l - 1; 609 $h -= $l - 1;
360 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
361 while ($h > 0) { 621 while ($h > 0) {
362 $h -= sysread $fh, $buf, $h > 4096 ? 4096 : $h; 622 unless ($locked) {
363 print {$self->{fh}} $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
364 or last; 636 or last;
365 }
366 }
367 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
368 close $fh; 646 close $fh;
647 }
369} 648}
370 649
3711; 6501
651

Diff Legend

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