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.88 by root, Thu Nov 20 14:33:57 2008 UTC

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

Diff Legend

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