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

Diff Legend

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