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.18 by root, Wed Aug 15 03:13:36 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 }
83}
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 };
42} 105}
43 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 => 50, 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;
… …
76 133
77Linux::AIO::min_parallel $::AIO_PARALLEL; 134Linux::AIO::min_parallel $::AIO_PARALLEL;
78 135
79Event->io(fd => Linux::AIO::poll_fileno, 136Event->io(fd => Linux::AIO::poll_fileno,
80 poll => 'r', async => 1, 137 poll => 'r', async => 1,
81 cb => \&Linux::AIO::poll_cb ); 138 cb => \&Linux::AIO::poll_cb);
82 139
83our %conn; # $conn{ip}{fh} => connobj 140our %conn; # $conn{ip}{self} => connobj
141our %uri; # $uri{ip}{uri}{self}
84our %blocked; 142our %blocked;
85our %mimetype; 143our %mimetype;
86 144
87sub read_mimetypes { 145sub read_mimetypes {
88 local *M; 146 local *M;
… …
99 157
100read_mimetypes; 158read_mimetypes;
101 159
102sub new { 160sub new {
103 my $class = shift; 161 my $class = shift;
162 my $fh = shift;
104 my $peername = shift; 163 my $peername = shift;
105 my $fh = shift;
106 my $self = bless { fh => $fh }, $class; 164 my $self = bless { fh => $fh }, $class;
107 my (undef, $iaddr) = unpack_sockaddr_in $peername 165 my (undef, $iaddr) = unpack_sockaddr_in $peername
108 or $self->err(500, "unable to decode peername"); 166 or $self->err(500, "unable to decode peername");
109 167
168 $self->{remote_addr} =
110 $self->{remote_addr} = inet_ntoa $iaddr; 169 $self->{remote_id} = inet_ntoa $iaddr;
170
111 $self->{time} = $::NOW; 171 $self->{time} = $::NOW;
112 172
113 # enter ourselves into various lists 173 weaken ($Coro::current->{conn} = $self);
114 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
115 174
116 $::conns++; 175 $::conns++;
176 $::maxconns = $::conns if $::conns > $::maxconns;
117 177
118 $self; 178 $self;
119} 179}
120 180
121sub DESTROY { 181sub DESTROY {
122 my $self = shift; 182 #my $self = shift;
123
124 $::conns--; 183 $::conns--;
125
126 delete $conn{$self->{remote_addr}}{$self*1};
127 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
128} 184}
129 185
130sub slog { 186sub slog {
131 my $self = shift; 187 my $self = shift;
132 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 188 main::slog($_[0], "$self->{remote_id}> $_[1]");
133} 189}
134 190
135sub response { 191sub response {
136 my ($self, $code, $msg, $hdr, $content) = @_; 192 my ($self, $code, $msg, $hdr, $content) = @_;
137 my $res = "HTTP/1.1 $code $msg\015\012"; 193 my $res = "HTTP/1.1 $code $msg\015\012";
194 my $GZ = "";
138 195
139 #$res .= "Connection: close\015\012"; 196 if (exists $hdr->{Connection}) {
140 $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";
141 224
142 while (my ($h, $v) = each %$hdr) { 225 while (my ($h, $v) = each %$hdr) {
143 $res .= "$h: $v\015\012" 226 $res .= "$h: $v\015\012"
144 } 227 }
145 $res .= "\015\012"; 228 $res .= "\015\012";
146 229
147 $res .= $content if defined $content and $self->{method} ne "HEAD"; 230 $res .= $content if defined $content and $self->{method} ne "HEAD";
148 231
149 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";
150 235
151 $self->{written} += 236 print $::accesslog $log if $::accesslog;
152 print {$self->{fh}} $res; 237 print STDERR $log;
238
239 $tbf_top->request(length $res, 1e6);
240 $self->{written} += print {$self->{fh}} $res;
153} 241}
154 242
155sub err { 243sub err {
156 my $self = shift; 244 my $self = shift;
157 my ($code, $msg, $hdr, $content) = @_; 245 my ($code, $msg, $hdr, $content) = @_;
158 246
159 unless (defined $content) { 247 unless (defined $content) {
160 $content = "$code $msg"; 248 $content = "$code $msg\n";
161 $hdr->{"Content-Type"} = "text/plain"; 249 $hdr->{"Content-Type"} = "text/plain";
162 $hdr->{"Content-Length"} = length $content; 250 $hdr->{"Content-Length"} = length $content;
163 } 251 }
164 $hdr->{"Connection"} = "close"; 252 $hdr->{"Connection"} = "close";
165 253
166 $self->response($code, $msg, $hdr, $content); 254 $self->response($code, $msg, $hdr, $content);
167 255
168 die bless {}, err::; 256 die bless {}, err::;
169} 257}
170 258
171sub err_blocked {
172 my $self = shift;
173 my $ip = $self->{remote_addr};
174 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
175
176 Coro::Event::do_timer(after => 15);
177
178 $self->err(401, "too many connections",
179 {
180 "Content-Type" => "text/html",
181 "Retry-After" => $::BLOCKTIME
182 },
183 <<EOF);
184<html><p>
185You have been blocked because you opened too many connections. You
186may retry at</p>
187
188 <p><blockquote>$time.</blockquote></p>
189
190<p>Until then, each new access will renew the block. You might want to have a
191look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
192</html>
193EOF
194}
195
196sub handle { 259sub handle {
197 my $self = shift; 260 my $self = shift;
198 my $fh = $self->{fh}; 261 my $fh = $self->{fh};
262
263 my $host;
199 264
200 $fh->timeout($::REQ_TIMEOUT); 265 $fh->timeout($::REQ_TIMEOUT);
201 while() { 266 while() {
202 $self->{reqs}++; 267 $self->{reqs}++;
203 268
… …
213 } 278 }
214 279
215 $self->{h} = {}; 280 $self->{h} = {};
216 281
217 $fh->timeout($::RES_TIMEOUT); 282 $fh->timeout($::RES_TIMEOUT);
218 my $ip = $self->{remote_addr};
219
220 if ($blocked{$ip}) {
221 $self->err_blocked($blocked{$ip})
222 if $blocked{$ip} > $::NOW;
223
224 delete $blocked{$ip};
225 }
226
227 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
228 $self->slog(2, "blocked ip $ip");
229 $self->err_blocked;
230 }
231 283
232 $req =~ /^(?:\015\012)? 284 $req =~ /^(?:\015\012)?
233 (GET|HEAD) \040+ 285 (GET|HEAD) \040+
234 ([^\040]+) \040+ 286 ([^\040]+) \040+
235 HTTP\/([0-9]+\.[0-9]+) 287 HTTP\/([0-9]+\.[0-9]+)
… …
238 290
239 $self->{method} = $1; 291 $self->{method} = $1;
240 $self->{uri} = $2; 292 $self->{uri} = $2;
241 $self->{version} = $3; 293 $self->{version} = $3;
242 294
243 $3 eq "1.0" or $3 eq "1.1" 295 $3 =~ /^1\./
244 or $self->err(506, "http protocol version $3 not supported"); 296 or $self->err(506, "http protocol version $3 not supported");
245 297
246 # parse headers 298 # parse headers
247 { 299 {
248 my (%hdr, $h, $v); 300 my (%hdr, $h, $v);
249 301
250 $hdr{lc $1} .= ",$2" 302 $hdr{lc $1} .= ",$2"
251 while $req =~ /\G 303 while $req =~ /\G
252 ([^:\000-\040]+): 304 ([^:\000-\040]+):
253 [\008\040]* 305 [\011\040]*
254 ((?: [^\015\012]+ | \015\012[\008\040] )*) 306 ((?: [^\015\012]+ | \015\012[\011\040] )*)
255 \015\012 307 \015\012
256 /gxc; 308 /gxc;
257 309
258 $req =~ /\G\015\012$/ 310 $req =~ /\G\015\012$/
259 or $self->err(400, "bad request"); 311 or $self->err(400, "bad request");
260 312
261 $self->{h}{$h} = substr $v, 1 313 $self->{h}{$h} = substr $v, 1
262 while ($h, $v) = each %hdr; 314 while ($h, $v) = each %hdr;
263 } 315 }
264 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) {
265 $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 }
266 352
353 $self->{server_name} = $host;
354
267 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 355 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
268 356
357 eval {
269 $self->map_uri; 358 $self->map_uri;
270 $self->respond; 359 $self->respond;
360 };
271 361
362 die if $@ && !ref $@;
363
272 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 364 last if $self->{h}{connection} =~ /close/i;
273 365
274 $self->slog(9, "persistant connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 366 $httpevent->broadcast;
367
275 $fh->timeout($::PER_TIMEOUT); 368 $fh->timeout($::PER_TIMEOUT);
276 } 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;
277} 378}
278 379
279# uri => path mapping 380# uri => path mapping
280sub map_uri { 381sub map_uri {
281 my $self = shift; 382 my $self = shift;
282 my $host = $self->{h}{host} || "default"; 383 my $host = $self->{server_name};
283 my $uri = $self->{uri}; 384 my $uri = $self->{uri};
284 385
285 # some massaging, also makes it more secure 386 # some massaging, also makes it more secure
286 $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;
287 $uri =~ s%//+%/%g; 388 $uri =~ s%//+%/%g;
… …
297 $self->{path} = "$::DOCROOT/$host$uri"; 398 $self->{path} = "$::DOCROOT/$host$uri";
298 399
299 $self->access_check; 400 $self->access_check;
300} 401}
301 402
302sub server_address {
303 my $self = shift;
304 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
305 or $self->err(500, "unable to get socket name");
306 ((inet_ntoa $iaddr), $port);
307}
308
309sub server_host {
310 my $self = shift;
311 if (exists $self->{h}{host}) {
312 return $self->{h}{host};
313 } else {
314 return (($self->server_address)[0]);
315 }
316}
317
318sub server_hostport {
319 my $self = shift;
320 my ($host, $port);
321 if (exists $self->{h}{host}) {
322 ($host, $port) = ($self->{h}{host}, $self->{server_port});
323 } else {
324 ($host, $port) = $self->server_address;
325 }
326 $port = $port == 80 ? "" : ":$port";
327 $host.$port;
328}
329
330sub _cgi { 403sub _cgi {
331 my $self = shift; 404 my $self = shift;
332 my $path = shift; 405 my $path = shift;
333 my $fh; 406 my $fh;
334 407
335 # no two-way xxx supported 408 # no two-way xxx supported
336 if (0 == fork) { 409 if (0 == fork) {
337 open STDOUT, ">&".fileno($self->{fh}); 410 open STDOUT, ">&".fileno($self->{fh});
338 if (chdir $::DOCROOT) { 411 if (chdir $::DOCROOT) {
339 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 412 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
340 $ENV{HTTP_HOST} = $self->server_host; 413 $ENV{HTTP_HOST} = $self->{server_name};
341 $ENV{HTTP_PORT} = $self->{server_host}; 414 $ENV{HTTP_PORT} = $self->{server_port};
342 $ENV{SCRIPT_NAME} = $self->{name}; 415 $ENV{SCRIPT_NAME} = $self->{name};
343 exec $path; 416 exec $path;
344 } 417 }
345 Coro::State::_exit(0); 418 Coro::State::_exit(0);
346 } else { 419 } else {
420 die;
347 } 421 }
422}
423
424sub server_hostport {
425 $_[0]{server_port} == 80
426 ? $_[0]{server_name}
427 : "$_[0]{server_name}:$_[0]{server_port}";
348} 428}
349 429
350sub respond { 430sub respond {
351 my $self = shift; 431 my $self = shift;
352 my $path = $self->{path}; 432 my $path = $self->{path};
353 433
354 stat $path 434 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
355 or $self->err(404, "not found"); 435 if ($::internal{$1}) {
356 436 $::internal{$1}->($self);
357 $self->{stat} = [stat _];
358
359 # idiotic netscape sends idiotic headers AGAIN
360 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
361 ? str2time $1 : 0;
362
363 if (-d _ && -r _) {
364 # directory
365 if ($path !~ /\/$/) {
366 # create a redirect to get the trailing "/"
367 my $host = $self->server_hostport;
368 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
369 } 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 {
370 $ims < $self->{stat}[9] 458 $ims < $self->{stat}[9]
371 or $self->err(304, "not modified"); 459 or $self->err(304, "not modified");
372 460
373 if ($self->{method} eq "GET") {
374 if (-r "$path/index.html") { 461 if (-r "$path/index.html") {
462 # replace directory "size" by index.html filesize
375 $self->{path} .= "/index.html"; 463 $self->{stat} = [stat ($self->{path} .= "/index.html")];
376 $self->handle_file; 464 $self->handle_file($queue_index, $tbf_top);
377 } else { 465 } else {
378 $self->handle_dir; 466 $self->handle_dir;
379 } 467 }
380 } 468 }
381 }
382 } elsif (-f _ && -r _) { 469 } elsif (-f _ && -r _) {
383 -x _ and $self->err(403, "forbidden"); 470 -x _ and $self->err(403, "forbidden");
384 $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);
385 } else { 484 } else {
386 $self->err(404, "not found"); 485 $self->err(404, "not found");
486 }
387 } 487 }
388} 488}
389 489
390sub handle_dir { 490sub handle_dir {
391 my $self = shift; 491 my $self = shift;
… …
393 493
394 $self->response(200, "ok", 494 $self->response(200, "ok",
395 { 495 {
396 "Content-Type" => "text/html", 496 "Content-Type" => "text/html",
397 "Content-Length" => length $idx, 497 "Content-Length" => length $idx,
498 "Last-Modified" => time2str ($self->{stat}[9]),
398 }, 499 },
399 $idx); 500 $idx);
400} 501}
401 502
402sub handle_file { 503sub handle_file {
403 my $self = shift; 504 my ($self, $queue, $tbf) = @_;
404 my $length = -s _; 505 my $length = $self->{stat}[7];
405 my $hdr = { 506 my $hdr = {
406 "Last-Modified" => time2str ((stat _)[9]), 507 "Last-Modified" => time2str ((stat _)[9]),
407 }; 508 };
408 509
409 my @code = (200, "ok"); 510 my @code = (200, "ok");
… …
417 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 518 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
418 } else { 519 } else {
419 ($l, $h) = (0, $length - 1); 520 ($l, $h) = (0, $length - 1);
420 goto ignore; 521 goto ignore;
421 } 522 }
422 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 523 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
423 } 524 }
424 $hdr->{"Content-Range"} = "bytes */$length"; 525 $hdr->{"Content-Range"} = "bytes */$length";
526 $hdr->{"Content-Length"} = $length;
425 $self->err(416, "not satisfiable", $hdr); 527 $self->err(416, "not satisfiable", $hdr, "");
426 528
427satisfiable: 529satisfiable:
428 # check for segmented downloads 530 # check for segmented downloads
429 if ($l && $::NO_SEGMENTED) { 531 if ($l && $::NO_SEGMENTED) {
532 my $timeout = $::NOW + 15;
430 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 533 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
431 Coro::Event::do_timer(after => 15); 534 if ($timeout <= $::NOW) {
432 535 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
433 $self->err(400, "segmented downloads are not allowed"); 536 #$self->err_segmented_download;
537 } else {
538 $httpevent->wait;
539 }
434 } 540 }
435 } 541 }
436 542
437 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 543 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
438 @code = (206, "partial content"); 544 @code = (206, "partial content");
… …
448 $hdr->{"Content-Length"} = $length; 554 $hdr->{"Content-Length"} = $length;
449 555
450 $self->response(@code, $hdr, ""); 556 $self->response(@code, $hdr, "");
451 557
452 if ($self->{method} eq "GET") { 558 if ($self->{method} eq "GET") {
559 $self->{time} = $::NOW;
560
561 my $current = $Coro::current;
562
453 my ($fh, $buf, $r); 563 my ($fh, $buf, $r);
454 my $current = $Coro::current; 564
455 open $fh, "<", $self->{path} 565 open $fh, "<", $self->{path}
456 or die "$self->{path}: late open failure ($!)"; 566 or die "$self->{path}: late open failure ($!)";
457 567
458 $h -= $l - 1; 568 $h -= $l - 1;
459 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
460 while ($h > 0) { 580 while ($h > 0) {
461 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 581 unless ($locked) {
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),
462 $buf, 0, sub { 598 $buf, 0, sub {
463 $r = $_[0]; 599 $r = $_[0];
464 $current->ready; 600 Coro::ready($current);
465 }); 601 });
466 &Coro::schedule; 602 &Coro::schedule;
467 last unless $r; 603 last unless $r;
468 my $w = $self->{fh}->syswrite($buf) 604 }
605
606 $tbf->request(length $buf);
607 my $w = syswrite $self->{fh}, $buf
469 or last; 608 or last;
470 $::written += $w; 609 $::written += $w;
471 $self->{written} += $w; 610 $self->{written} += $w;
472 $l += $r; 611 $l += $r;
473 } 612 }
474 }
475 613
476 close $fh; 614 close $fh;
615 }
477} 616}
478 617
4791; 6181;

Diff Legend

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