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

Diff Legend

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