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

Diff Legend

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