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

Diff Legend

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