ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/myhttpd/httpd.pl
(Generate patch)

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

Diff Legend

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