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

Diff Legend

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