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.47 by root, Tue Nov 20 01:56:21 2001 UTC vs.
Revision 1.73 by root, Sat Oct 5 09:02:17 2002 UTC

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

Diff Legend

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