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

Diff Legend

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