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.69 by root, Wed May 22 00:33:26 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 => 150000;
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;
… …
101 or die "unable to start server"; 135 or die "unable to start server";
102 136
103 listen_on $http_port; 137 listen_on $http_port;
104} 138}
105 139
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; 140package conn;
115 141
116use Socket; 142use Socket;
117use HTTP::Date; 143use HTTP::Date;
118use Convert::Scalar 'weaken'; 144use Convert::Scalar 'weaken';
… …
150 my $peername = shift; 176 my $peername = shift;
151 my $self = bless { fh => $fh }, $class; 177 my $self = bless { fh => $fh }, $class;
152 my (undef, $iaddr) = unpack_sockaddr_in $peername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
153 or $self->err(500, "unable to decode peername"); 179 or $self->err(500, "unable to decode peername");
154 180
181 $self->{remote_addr} =
155 $self->{remote_addr} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
183
156 $self->{time} = $::NOW; 184 $self->{time} = $::NOW;
157 185
186 weaken ($Coro::current->{conn} = $self);
187
158 $::conns++; 188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
159 190
160 $self; 191 $self;
161} 192}
162 193
163sub DESTROY { 194sub DESTROY {
164 my $self = shift; 195 #my $self = shift;
165 $::conns--; 196 $::conns--;
166 $self->eoconn;
167}
168
169# end of connection
170sub eoconn {
171 my $self = shift;
172
173 # clean up hints
174 delete $conn{$self->{remote_id}}{$self*1};
175 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
176
177 $httpevent->broadcast;
178} 197}
179 198
180sub slog { 199sub slog {
181 my $self = shift; 200 my $self = shift;
182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 201 main::slog($_[0], "$self->{remote_id}> $_[1]");
183} 202}
184 203
185sub response { 204sub response {
186 my ($self, $code, $msg, $hdr, $content) = @_; 205 my ($self, $code, $msg, $hdr, $content) = @_;
187 my $res = "HTTP/1.1 $code $msg\015\012"; 206 my $res = "HTTP/1.1 $code $msg\015\012";
207 my $GZ = "";
188 208
189 if (exists $hdr->{Connection}) { 209 if (exists $hdr->{Connection}) {
190 if ($hdr->{Connection} =~ /close/) { 210 if ($hdr->{Connection} =~ /close/) {
191 $self->{h}{connection} = "close" 211 $self->{h}{connection} = "close"
192 } 212 }
… …
198 $self->{h}{connection} = "close" 218 $self->{h}{connection} = "close"
199 } 219 }
200 } 220 }
201 } 221 }
202 222
223 if ($self->{method} ne "HEAD"
224 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
225 && 400 < length $content
226 && $hdr->{"Content-Length"} == length $content
227 && !exists $hdr->{"Content-Encoding"}
228 ) {
229 my $orig = length $content;
230 $hdr->{"Content-Encoding"} = "gzip";
231 $content = Compress::Zlib::memGzip(\$content);
232 $hdr->{"Content-Length"} = length $content;
233 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
234 }
235
203 $res .= "Date: $HTTP_NOW\015\012"; 236 $res .= "Date: $HTTP_NOW\015\012";
204 237
205 while (my ($h, $v) = each %$hdr) { 238 while (my ($h, $v) = each %$hdr) {
206 $res .= "$h: $v\015\012" 239 $res .= "$h: $v\015\012"
207 } 240 }
208 $res .= "\015\012"; 241 $res .= "\015\012";
209 242
210 $res .= $content if defined $content and $self->{method} ne "HEAD"; 243 $res .= $content if defined $content and $self->{method} ne "HEAD";
211 244
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 245 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"; 246 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
247 " \"$self->{h}{referer}\"\n";
214 248
215 print $accesslog $log if $accesslog; 249 print $::accesslog $log if $::accesslog;
216 print STDERR $log; 250 print STDERR $log;
217 251
218 $self->{written} += 252 $tbf_top->request(length $res, 1e6);
219 print {$self->{fh}} $res; 253 $self->{written} += print {$self->{fh}} $res;
220} 254}
221 255
222sub err { 256sub err {
223 my $self = shift; 257 my $self = shift;
224 my ($code, $msg, $hdr, $content) = @_; 258 my ($code, $msg, $hdr, $content) = @_;
… …
279 my (%hdr, $h, $v); 313 my (%hdr, $h, $v);
280 314
281 $hdr{lc $1} .= ",$2" 315 $hdr{lc $1} .= ",$2"
282 while $req =~ /\G 316 while $req =~ /\G
283 ([^:\000-\040]+): 317 ([^:\000-\040]+):
284 [\008\040]* 318 [\011\040]*
285 ((?: [^\015\012]+ | \015\012[\008\040] )*) 319 ((?: [^\015\012]+ | \015\012[\011\040] )*)
286 \015\012 320 \015\012
287 /gxc; 321 /gxc;
288 322
289 $req =~ /\G\015\012$/ 323 $req =~ /\G\015\012$/
290 or $self->err(400, "bad request"); 324 or $self->err(400, "bad request");
… …
302 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 336 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
303 } 337 }
304 338
305 $self->{remote_id} = $id; 339 $self->{remote_id} = $id;
306 340
341 weaken (local $conn{$id}{$self*1} = $self);
342
307 if ($blocked{$id}) { 343 if ($blocked{$id}) {
308 $self->err_blocked($blocked{$id}) 344 $self->err_blocked
309 if $blocked{$id} > $::NOW; 345 if $blocked{$id}[0] > $::NOW;
310 346
311 delete $blocked{$id}; 347 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 } 348 }
325 349
326 # find out server name and port 350 # find out server name and port
327 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 351 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
328 $host = $1; 352 $host = $1;
… …
339 $host = inet_ntoa $host; 363 $host = inet_ntoa $host;
340 } 364 }
341 365
342 $self->{server_name} = $host; 366 $self->{server_name} = $host;
343 367
344 # enter ourselves into various lists
345 weaken ($conn{$id}{$self*1} = $self);
346 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 368 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
347 369
348 eval { 370 eval {
349 $self->map_uri; 371 $self->map_uri;
350 $self->respond; 372 $self->respond;
351 }; 373 };
352 374
353 $self->eoconn;
354
355 die if $@ && !ref $@; 375 die if $@ && !ref $@;
356 376
357 last if $self->{h}{connection} =~ /close/; 377 last if $self->{h}{connection} =~ /close/i;
358 378
359 $httpevent->broadcast; 379 $httpevent->broadcast;
360 380
361 $fh->timeout($::PER_TIMEOUT); 381 $fh->timeout($::PER_TIMEOUT);
362 } 382 }
383}
384
385sub block {
386 my $self = shift;
387
388 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
389 $self->slog(2, "blocked ip $self->{remote_id}");
390 $self->err_blocked;
363} 391}
364 392
365# uri => path mapping 393# uri => path mapping
366sub map_uri { 394sub map_uri {
367 my $self = shift; 395 my $self = shift;
… …
414 442
415sub respond { 443sub respond {
416 my $self = shift; 444 my $self = shift;
417 my $path = $self->{path}; 445 my $path = $self->{path};
418 446
419 stat $path 447 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
420 or $self->err(404, "not found"); 448 if ($::internal{$1}) {
421 449 $::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 { 450 } else {
435 $ims < $self->{stat}[9] 451 $self->err(404, "not found");
452 }
453 } else {
454
455 stat $path
436 or $self->err(304, "not modified"); 456 or $self->err(404, "not found");
437 457
438 if (-r "$path/index.html") { 458 $self->{stat} = [stat _];
439 # replace directory "size" by index.html filesize 459
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 460 # idiotic netscape sends idiotic headers AGAIN
441 $self->handle_file; 461 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
462 ? str2time $1 : 0;
463
464 if (-d _ && -r _) {
465 # directory
466 if ($path !~ /\/$/) {
467 # create a redirect to get the trailing "/"
468 # we don't try to avoid the :80
469 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
442 } else { 470 } else {
471 $ims < $self->{stat}[9]
472 or $self->err(304, "not modified");
473
474 if (-r "$path/index.html") {
475 # replace directory "size" by index.html filesize
476 $self->{stat} = [stat ($self->{path} .= "/index.html")];
477 $self->handle_file($queue_index, $tbf_top);
478 } else {
443 $self->handle_dir; 479 $self->handle_dir;
444 } 480 }
445 } 481 }
446 } elsif (-f _ && -r _) { 482 } elsif (-f _ && -r _) {
447 -x _ and $self->err(403, "forbidden"); 483 -x _ and $self->err(403, "forbidden");
448 $self->handle_file; 484
485 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
486 my $timeout = $::NOW + 10;
487 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
488 if ($timeout < $::NOW) {
489 $self->block($::BLOCKTIME, "too many connections");
490 } else {
491 $httpevent->wait;
492 }
493 }
494 }
495
496 $self->handle_file($queue_file, $tbf_top);
449 } else { 497 } else {
450 $self->err(404, "not found"); 498 $self->err(404, "not found");
499 }
451 } 500 }
452} 501}
453 502
454sub handle_dir { 503sub handle_dir {
455 my $self = shift; 504 my $self = shift;
… …
457 506
458 $self->response(200, "ok", 507 $self->response(200, "ok",
459 { 508 {
460 "Content-Type" => "text/html", 509 "Content-Type" => "text/html",
461 "Content-Length" => length $idx, 510 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]), 511 "Last-Modified" => time2str ($self->{stat}[9]),
463 }, 512 },
464 $idx); 513 $idx);
465} 514}
466 515
467sub handle_file { 516sub handle_file {
468 my $self = shift; 517 my ($self, $queue, $tbf) = @_;
469 my $length = $self->{stat}[7]; 518 my $length = $self->{stat}[7];
470 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
471 my $hdr = { 519 my $hdr = {
472 "Last-Modified" => time2str ((stat _)[9]), 520 "Last-Modified" => time2str ((stat _)[9]),
473 }; 521 };
474 522
475 my @code = (200, "ok"); 523 my @code = (200, "ok");
… …
492 $self->err(416, "not satisfiable", $hdr, ""); 540 $self->err(416, "not satisfiable", $hdr, "");
493 541
494satisfiable: 542satisfiable:
495 # check for segmented downloads 543 # check for segmented downloads
496 if ($l && $::NO_SEGMENTED) { 544 if ($l && $::NO_SEGMENTED) {
497 my $delay = $::NOW + $::PER_TIMEOUT + 15; 545 my $timeout = $::NOW + 15;
498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 546 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
499 if ($delay <= $::NOW) { 547 if ($timeout <= $::NOW) {
548 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
500 $self->err_segmented_download; 549 #$self->err_segmented_download;
501 } else { 550 } else {
502 $httpevent->wait; 551 $httpevent->wait;
503 } 552 }
504 } 553 }
505 } 554 }
… …
520 $self->response(@code, $hdr, ""); 569 $self->response(@code, $hdr, "");
521 570
522 if ($self->{method} eq "GET") { 571 if ($self->{method} eq "GET") {
523 $self->{time} = $::NOW; 572 $self->{time} = $::NOW;
524 573
525 my $fudge = $queue->[0]->waiters; 574 my $current = $Coro::current;
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;
537
538 $self->{fh}->writable or return;
539 575
540 my ($fh, $buf, $r); 576 my ($fh, $buf, $r);
541 my $current = $Coro::current; 577
542 open $fh, "<", $self->{path} 578 open $fh, "<", $self->{path}
543 or die "$self->{path}: late open failure ($!)"; 579 or die "$self->{path}: late open failure ($!)";
544 580
545 $h -= $l - 1; 581 $h -= $l - 1;
546 582
547 if (0) { 583 if (0) { # !AIO
548 if ($l) { 584 if ($l) {
549 sysseek $fh, $l, 0; 585 sysseek $fh, $l, 0;
550 } 586 }
551 } 587 }
588
589 my $transfer = $queue->start_transfer($h);
590 my $locked;
591 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
552 592
553 while ($h > 0) { 593 while ($h > 0) {
594 unless ($locked) {
595 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
596 $bufsize = $::BUFSIZE;
597 $self->{time} = $::NOW;
598 }
599 }
600
601 if ($blocked{$self->{remote_id}}) {
602 $self->{h}{connection} = "close";
603 die bless {}, err::;
604 }
605
554 if (0) { 606 if (0) { # !AIO
555 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 607 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
556 or last; 608 or last;
557 } else { 609 } else {
558 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 610 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
559 $buf, 0, sub { 611 $buf, 0, sub {
560 $r = $_[0]; 612 $r = $_[0];
561 Coro::ready($current); 613 Coro::ready($current);
562 }); 614 });
563 &Coro::schedule; 615 &Coro::schedule;
564 last unless $r; 616 last unless $r;
565 } 617 }
618
619 $tbf->request(length $buf);
566 my $w = syswrite $self->{fh}, $buf 620 my $w = syswrite $self->{fh}, $buf
567 or last; 621 or last;
568 $::written += $w; 622 $::written += $w;
569 $self->{written} += $w; 623 $self->{written} += $w;
570 $l += $r; 624 $l += $r;

Diff Legend

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