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

Diff Legend

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