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.90 by root, Wed Jan 27 20:06:57 2010 UTC

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

Diff Legend

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