ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.44 by root, Fri Sep 14 12:38:18 2001 UTC vs.
Revision 1.77 by root, Sat Sep 17 20:21:11 2005 UTC

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

Diff Legend

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