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

Diff Legend

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