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.3 by root, Fri Aug 10 02:28:28 2001 UTC vs.
Revision 1.72 by root, Tue Sep 10 03: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 => $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 $::NOW = time;
60 if (@pool) { 110 if (@pool) {
61 (pop @pool)->ready; 111 (pop @pool)->ready;
62 } else { 112 } else {
63 async \&handler; 113 async \&handler;
64 } 114 }
65 115 }
66 } 116 };
67}; 117}
68 118
69loop; 119my $http_port = new Coro::Socket
70print "ende\n";#d# 120 LocalAddr => $SERVER_HOST,
121 LocalPort => $SERVER_PORT,
122 ReuseAddr => 1,
123 Listen => 50,
124 or die "unable to start server";
125
126listen_on $http_port;
127
128if ($SERVER_PORT2) {
129 my $http_port = new Coro::Socket
130 LocalAddr => $SERVER_HOST,
131 LocalPort => $SERVER_PORT2,
132 ReuseAddr => 1,
133 Listen => 50,
134 or die "unable to start server";
135
136 listen_on $http_port;
137}
71 138
72package conn; 139package conn;
73 140
74use Socket; 141use Socket;
75use HTTP::Date; 142use HTTP::Date;
76use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
144use Linux::AIO;
77 145
146Linux::AIO::min_parallel $::AIO_PARALLEL;
147
148Event->io(fd => Linux::AIO::poll_fileno,
149 poll => 'r', async => 1,
150 cb => \&Linux::AIO::poll_cb);
151
78our %conn; # $conn{ip}{fh} => connobj 152our %conn; # $conn{ip}{self} => connobj
153our %uri; # $uri{ip}{uri}{self}
79our %blocked; 154our %blocked;
155our %mimetype;
156
157sub read_mimetypes {
158 local *M;
159 if (open M, "<mime_types") {
160 while (<M>) {
161 if (/^([^#]\S+)\t+(\S+)$/) {
162 $mimetype{lc $1} = $2;
163 }
164 }
165 } else {
166 print "cannot open mime_types\n";
167 }
168}
169
170read_mimetypes;
80 171
81sub new { 172sub new {
82 my $class = shift; 173 my $class = shift;
83 my $fh = shift; 174 my $fh = shift;
175 my $peername = shift;
84 my $self = bless { fh => $fh }, $class; 176 my $self = bless { fh => $fh }, $class;
85 my (undef, $iaddr) = unpack_sockaddr_in $fh->getpeername 177 my (undef, $iaddr) = unpack_sockaddr_in $peername
86 or $self->err(500, "unable to get peername"); 178 or $self->err(500, "unable to decode peername");
179
180 $self->{remote_addr} =
87 $self->{remote_addr} = inet_ntoa $iaddr; 181 $self->{remote_id} = inet_ntoa $iaddr;
88 182
89 # enter ourselves into various lists 183 $self->{time} = $::NOW;
90 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
91 184
92 print "$self->{remote_addr}: ".($self*1)." > ".%{$conn{$self->{remote_addr}}},"\n"; 185 weaken ($Coro::current->{conn} = $self);
186
187 $::conns++;
188 $::maxconns = $::conns if $::conns > $::maxconns;
189
93 $self; 190 $self;
94} 191}
95 192
96sub DESTROY { 193sub DESTROY {
97 my $self = shift; 194 #my $self = shift;
98 delete $conn{$self->{remote_addr}}{$self*1}; 195 $::conns--;
99 delete $uri{$self->{uri}}{$self*1};
100} 196}
101 197
102sub slog { 198sub slog {
103 main::slog(@_); 199 my $self = shift;
200 main::slog($_[0], "$self->{remote_id}> $_[1]");
104} 201}
105 202
106sub print_response { 203sub response {
107 my ($self, $code, $msg, $hdr, $content) = @_; 204 my ($self, $code, $msg, $hdr, $content) = @_;
108 my $res = "HTTP/1.0 $code $msg\015\012"; 205 my $res = "HTTP/1.1 $code $msg\015\012";
206 my $GZ = "";
109 207
110 $hdr->{Date} = time2str $::NOW; # slow? nah. 208 if (exists $hdr->{Connection}) {
209 if ($hdr->{Connection} =~ /close/) {
210 $self->{h}{connection} = "close"
211 }
212 } else {
213 if ($self->{version} < 1.1) {
214 if ($self->{h}{connection} =~ /keep-alive/i) {
215 $hdr->{Connection} = "Keep-Alive";
216 } else {
217 $self->{h}{connection} = "close"
218 }
219 }
220 }
221
222 if ($self->{method} ne "HEAD"
223 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
224 && 400 < length $content
225 && $hdr->{"Content-Length"} == length $content
226 && !exists $hdr->{"Content-Encoding"}
227 ) {
228 my $orig = length $content;
229 $hdr->{"Content-Encoding"} = "gzip";
230 $content = Compress::Zlib::memGzip(\$content);
231 $hdr->{"Content-Length"} = length $content;
232 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
233 }
234
235 $res .= "Date: $HTTP_NOW\015\012";
236 $res .= "Server: $::NAME\015\012";
111 237
112 while (my ($h, $v) = each %$hdr) { 238 while (my ($h, $v) = each %$hdr) {
113 $res .= "$h: $v\015\012" 239 $res .= "$h: $v\015\012"
114 } 240 }
115 $res .= "\015\012$content" if defined $content; 241 $res .= "\015\012";
116 242
117 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 243 $res .= $content if defined $content and $self->{method} ne "HEAD";
118 244
119 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;
120} 254}
121 255
122sub err { 256sub err {
123 my $self = shift; 257 my $self = shift;
124 my ($code, $msg, $hdr, $content) = @_; 258 my ($code, $msg, $hdr, $content) = @_;
125 259
126 unless (defined $content) { 260 unless (defined $content) {
127 $content = "$code $msg"; 261 $content = "$code $msg\n";
128 $hdr->{"Content-Type"} = "text/plain"; 262 $hdr->{"Content-Type"} = "text/plain";
129 $hdr->{"Content-Length"} = length $content; 263 $hdr->{"Content-Length"} = length $content;
130 } 264 }
265 $hdr->{"Connection"} = "close";
131 266
132 $self->slog($msg) if $code;
133
134 $self->print_response($code, $msg, $hdr, $content); 267 $self->response($code, $msg, $hdr, $content);
135 268
136 die bless {}, err::; 269 die bless {}, err::;
137} 270}
138 271
139sub err_blocked {
140 my $self = shift;
141 my $ip = $self->{remote_addr};
142 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
143 $self->err(403, "too many connections",
144 { "Retry-After" => $::BLOCKTIME },
145 <<EOF);
146You have been blocked because you opened too many connections. You
147may retry at $time. Until then,
148every new access will renew the block.
149EOF
150}
151
152sub handle { 272sub handle {
153 my $self = shift; 273 my $self = shift;
154 my $fh = $self->{fh}; 274 my $fh = $self->{fh};
155 275
276 my $host;
277
278 $fh->timeout($::REQ_TIMEOUT);
156 #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
157 $self->{h} = {}; 293 $self->{h} = {};
158 294
159 # read request and parse first line
160 $fh->timeout($::REQ_TIMEOUT);
161 my $req = $fh->readline("\015\012\015\012");
162 $fh->timeout($::RES_TIMEOUT); 295 $fh->timeout($::RES_TIMEOUT);
163
164 defined $req or
165 $self->err(408, "request timeout");
166
167 my $ip = $self->{remote_addr};
168
169 if ($blocked{$ip}) {
170 $self->err_blocked($blocked{$ip})
171 if $blocked{$ip} > $::NOW;
172
173 delete $blocked{$ip};
174 }
175
176 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
177 $self->slog("blocked ip $ip");
178 $self->err_blocked;
179 }
180 296
181 $req =~ /^(?:\015\012)? 297 $req =~ /^(?:\015\012)?
182 (GET|HEAD) \040+ 298 (GET|HEAD) \040+
183 ([^\040]+) \040+ 299 ([^\040]+) \040+
184 HTTP\/([0-9]+\.[0-9]+) 300 HTTP\/([0-9]+\.[0-9]+)
185 \015\012/gx 301 \015\012/gx
186 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 302 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
187
188 $2 ne "1.0"
189 or $self->err(506, "http protocol version not supported");
190 303
191 $self->{method} = $1; 304 $self->{method} = $1;
192 $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");
193 310
194 # parse headers 311 # parse headers
195 { 312 {
196 my (%hdr, $h, $v); 313 my (%hdr, $h, $v);
197 314
198 $hdr{lc $1} .= ",$2" 315 $hdr{lc $1} .= ",$2"
199 while $req =~ /\G 316 while $req =~ /\G
200 ([^:\000-\040]+): 317 ([^:\000-\040]+):
201 [\008\040]* 318 [\011\040]*
202 ((?: [^\015\012]+ | \015\012[\008\040] )*) 319 ((?: [^\015\012]+ | \015\012[\011\040] )*)
203 \015\012 320 \015\012
204 /gxc; 321 /gxc;
205 322
206 $req =~ /\G\015\012$/ 323 $req =~ /\G\015\012$/
207 or $self->err(400, "bad request"); 324 or $self->err(400, "bad request");
208 325
209 $self->{h}{$h} = substr $v, 1 326 $self->{h}{$h} = substr $v, 1
210 while ($h, $v) = each %hdr; 327 while ($h, $v) = each %hdr;
211 } 328 }
212 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) {
213 $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 }
214 365
366 $self->{server_name} = $host;
367
215 weaken ($uri{$self->{uri}}{$self*1} = $self); 368 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
216 369
370 eval {
217 $self->map_uri; 371 $self->map_uri;
218
219 Coro::Event::do_timer(after => 5);
220
221 $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);
222 #} 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;
223} 391}
224 392
225# uri => path mapping 393# uri => path mapping
226sub map_uri { 394sub map_uri {
227 my $self = shift; 395 my $self = shift;
228 my $host = $self->{h}{host} || "default"; 396 my $host = $self->{server_name};
229 my $uri = $self->{uri}; 397 my $uri = $self->{uri};
230 398
231 # some massaging, also makes it more secure 399 # some massaging, also makes it more secure
232 $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;
233 $uri =~ s%//+%/%g; 401 $uri =~ s%//+%/%g;
239 407
240 $self->{name} = $uri; 408 $self->{name} = $uri;
241 409
242 # now do the path mapping 410 # now do the path mapping
243 $self->{path} = "$::DOCROOT/$host$uri"; 411 $self->{path} = "$::DOCROOT/$host$uri";
244}
245 412
246sub server_address { 413 $self->access_check;
247 my $self = shift;
248 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
249 or $self->err(500, "unable to get socket name");
250 ((inet_ntoa $iaddr), $port);
251}
252
253sub server_host {
254 my $self = shift;
255 if (exists $self->{h}{host}) {
256 return $self->{h}{host};
257 } else {
258 return (($self->server_address)[0]);
259 }
260}
261
262sub server_hostport {
263 my $self = shift;
264 my ($host, $port);
265 if (exists $self->{h}{host}) {
266 ($host, $port) = ($self->{h}{host}, $self->{server_port});
267 } else {
268 ($host, $port) = $self->server_address;
269 }
270 $port = $port == 80 ? "" : ":$port";
271 $host.$port;
272} 414}
273 415
274sub _cgi { 416sub _cgi {
275 my $self = shift; 417 my $self = shift;
276 my $path = shift; 418 my $path = shift;
279 # no two-way xxx supported 421 # no two-way xxx supported
280 if (0 == fork) { 422 if (0 == fork) {
281 open STDOUT, ">&".fileno($self->{fh}); 423 open STDOUT, ">&".fileno($self->{fh});
282 if (chdir $::DOCROOT) { 424 if (chdir $::DOCROOT) {
283 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 425 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
284 $ENV{HTTP_HOST} = $self->server_host; 426 $ENV{HTTP_HOST} = $self->{server_name};
285 $ENV{HTTP_PORT} = $self->{server_host}; 427 $ENV{HTTP_PORT} = $self->{server_port};
286 $ENV{SCRIPT_NAME} = $self->{name}; 428 $ENV{SCRIPT_NAME} = $self->{name};
287 exec $::INDEXPROG; 429 exec $path;
288 } 430 }
289 Coro::State::_exit(0); 431 Coro::State::_exit(0);
290 } else { 432 } else {
433 die;
291 } 434 }
435}
436
437sub server_hostport {
438 $_[0]{server_port} == 80
439 ? $_[0]{server_name}
440 : "$_[0]{server_name}:$_[0]{server_port}";
292} 441}
293 442
294sub respond { 443sub respond {
295 my $self = shift; 444 my $self = shift;
296 my $path = $self->{path}; 445 my $path = $self->{path};
297 446
298 stat $path 447 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
299 or $self->err(404, "not found"); 448 if ($::internal{$1}) {
300 449 $::internal{$1}->($self);
301 # idiotic netscape sends idiotic headers AGAIN
302 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
303 ? str2time $1 : 0;
304
305 if (-d _ && -r _) {
306 # directory
307 if ($path !~ /\/$/) {
308 # create a redirect to get the trailing "/"
309 my $host = $self->server_hostport;
310 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
311 } else { 450 } else {
312 $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]
313 or $self->err(304, "not modified"); 472 or $self->err(304, "not modified");
314 473
315 if ($self->{method} eq "GET") {
316 if (-r "$path/index.html") { 474 if (-r "$path/index.html") {
475 # replace directory "size" by index.html filesize
317 $self->{path} .= "/index.html"; 476 $self->{stat} = [stat ($self->{path} .= "/index.html")];
318 $self->handle_file; 477 $self->handle_file($queue_index, $tbf_top);
319 } else { 478 } else {
320 $self->handle_dir; 479 $self->handle_dir;
321 } 480 }
322 } 481 }
323 }
324 } elsif (-f _ && -r _) { 482 } elsif (-f _ && -r _) {
325 -x _ and $self->err(403, "forbidden"); 483 -x _ and $self->err(403, "forbidden");
326 $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);
327 } else { 497 } else {
328 $self->err(404, "not found"); 498 $self->err(404, "not found");
499 }
329 } 500 }
330} 501}
331 502
332sub handle_dir { 503sub handle_dir {
333 my $self = shift; 504 my $self = shift;
334 $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);
335} 514}
336 515
337sub handle_file { 516sub handle_file {
338 my $self = shift; 517 my ($self, $queue, $tbf) = @_;
339 my $length = -s _; 518 my $length = $self->{stat}[7];
340 my $hdr = { 519 my $hdr = {
341 "Last-Modified" => time2str ((stat _)[9]), 520 "Last-Modified" => time2str ((stat _)[9]),
342 }; 521 };
343 522
344 my @code = (200, "ok"); 523 my @code = (200, "ok");
352 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 531 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
353 } else { 532 } else {
354 ($l, $h) = (0, $length - 1); 533 ($l, $h) = (0, $length - 1);
355 goto ignore; 534 goto ignore;
356 } 535 }
357 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 536 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
358 } 537 }
359 $hdr->{"Content-Range"} = "bytes */$length"; 538 $hdr->{"Content-Range"} = "bytes */$length";
539 $hdr->{"Content-Length"} = $length;
360 $self->err(416, "not satisfiable", $hdr); 540 $self->err(416, "not satisfiable", $hdr, "");
361 541
362satisfiable: 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
363 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 556 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
364 @code = (206, "partial content"); 557 @code = (206, "partial content");
365 $length = $h - $l + 1; 558 $length = $h - $l + 1;
366 559
367ignore: 560ignore:
368 } else { 561 } else {
369 ($l, $h) = (0, $length - 1); 562 ($l, $h) = (0, $length - 1);
370 } 563 }
371 564
372 if ($self->{path} =~ /\.html$/) { 565 $self->{path} =~ /\.([^.]+)$/;
373 $hdr->{"Content-Type"} = "text/html";
374 } else {
375 $hdr->{"Content-Type"} = "application/octet-stream"; 566 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
376 }
377
378 $hdr->{"Content-Length"} = $length; 567 $hdr->{"Content-Length"} = $length;
379 568
380 $self->print_response(@code, $hdr, ""); 569 $self->response(@code, $hdr, "");
381 570
382 if ($self->{method} eq "GET") { 571 if ($self->{method} eq "GET") {
572 $self->{time} = $::NOW;
573 $self->{written} = 0;
574
575 my $current = $Coro::current;
576
383 my ($fh, $buf); 577 my ($fh, $buf, $r);
578
384 open $fh, "<", $self->{path} 579 open $fh, "<", $self->{path}
385 or die "$self->{path}: late open failure ($!)"; 580 or die "$self->{path}: late open failure ($!)";
386 581
387 if ($l) {
388 sysseek $fh, $l, 0
389 or die "$self->{path}: cannot seek to $l ($!)";
390 }
391
392 $h -= $l - 1; 582 $h -= $l - 1;
393 583
584 if (0) { # !AIO
585 if ($l) {
586 sysseek $fh, $l, 0;
587 }
588 }
589
590 my $transfer = $queue->start_transfer($h);
591 my $locked;
592 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
593
394 while ($h > 0) { 594 while ($h > 0) {
395 $h -= sysread $fh, $buf, $h > 4096 ? 4096 : $h; 595 unless ($locked) {
396 print {$self->{fh}} $buf 596 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
597 $bufsize = $::BUFSIZE;
598 $self->{time} = $::NOW;
599 $self->{written} = 0;
600 }
601 }
602
603 if ($blocked{$self->{remote_id}}) {
604 $self->{h}{connection} = "close";
605 die bless {}, err::;
606 }
607
608 if (0) { # !AIO
609 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
610 or last;
611 } else {
612 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
613 $buf, 0, sub {
614 $r = $_[0];
615 Coro::ready($current);
616 });
617 &Coro::schedule;
618 last unless $r;
619 }
620
621 $tbf->request(length $buf);
622 my $w = syswrite $self->{fh}, $buf
397 or last; 623 or last;
624 $::written += $w;
625 $self->{written} += $w;
626 $l += $r;
398 } 627 }
399 }
400 628
401 close $fh; 629 close $fh;
630 }
402} 631}
403 632
4041; 6331;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines