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.48 by root, Tue Nov 27 03:38:08 2001 UTC vs.
Revision 1.60 by root, Mon Dec 10 21:18:31 2001 UTC

… …
15# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
16 16
17$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
18 18
19our $accesslog; 19our $accesslog;
20our $errorlog;
21
22our $NOW;
23our $HTTP_NOW;
24
25Event->timer(interval => 1, hard => 1, cb => sub {
26 $NOW = time;
27 $HTTP_NOW = time2str $NOW;
28})->now;
29
30if ($ERROR_LOG) {
31 use IO::Handle;
32 open $errorlog, ">>$ERROR_LOG"
33 or die "$ERROR_LOG: $!";
34 $errorlog->autoflush(1);
35}
20 36
21if ($ACCESS_LOG) { 37if ($ACCESS_LOG) {
22 use IO::Handle; 38 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 39 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 40 or die "$ACCESS_LOG: $!";
… …
26} 42}
27 43
28sub slog { 44sub slog {
29 my $level = shift; 45 my $level = shift;
30 my $format = shift; 46 my $format = shift;
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 48 printf "$NOW: $format\n", @_;
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 50}
33 51
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal; 53our $httpevent = new Coro::Signal;
36 54
37our $wait_factor = 0.95; 55our $queue_file = new transferqueue $MAX_TRANSFERS;
38 56our $queue_index = new transferqueue 10;
39our @transfers = (
40 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL), 1],
41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE), 1],
42);
43 57
44my @newcons; 58my @newcons;
45my @pool; 59my @pool;
46 60
47# one "execution thread" 61# one "execution thread"
… …
50 if (@newcons) { 64 if (@newcons) {
51 eval { 65 eval {
52 conn->new(@{pop @newcons})->handle; 66 conn->new(@{pop @newcons})->handle;
53 }; 67 };
54 slog 1, "$@" if $@ && !ref $@; 68 slog 1, "$@" if $@ && !ref $@;
69
70 $httpevent->broadcast; # only for testing, but doesn't matter much
71
55 $connections->up; 72 $connections->up;
56 } else { 73 } else {
57 last if @pool >= $MAX_POOL; 74 last if @pool >= $MAX_POOL;
58 push @pool, $Coro::current; 75 push @pool, $Coro::current;
59 schedule; 76 schedule;
… …
101 or die "unable to start server"; 118 or die "unable to start server";
102 119
103 listen_on $http_port; 120 listen_on $http_port;
104} 121}
105 122
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; 123package conn;
115 124
116use Socket; 125use Socket;
117use HTTP::Date; 126use HTTP::Date;
118use Convert::Scalar 'weaken'; 127use Convert::Scalar 'weaken';
… …
150 my $peername = shift; 159 my $peername = shift;
151 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
152 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
153 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
154 163
164 $self->{remote_addr} =
155 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
166
156 $self->{time} = $::NOW; 167 $self->{time} = $::NOW;
157 168
169 weaken ($Coro::current->{conn} = $self);
170
158 $::conns++; 171 $::conns++;
172 $::maxconns = $::conns if $::conns > $::maxconns;
159 173
160 $self; 174 $self;
161} 175}
162 176
163sub DESTROY { 177sub DESTROY {
164 my $self = shift; 178 #my $self = shift;
165 $::conns--; 179 $::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} 180}
179 181
180sub slog { 182sub slog {
181 my $self = shift; 183 my $self = shift;
182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
183} 185}
184 186
185sub response { 187sub response {
186 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
187 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
… …
208 $res .= "\015\012"; 210 $res .= "\015\012";
209 211
210 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
211 213
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 214 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"; 215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
216 " \"$self->{h}{referer}\"\n";
214 217
215 print $accesslog $log if $accesslog; 218 print $accesslog $log if $accesslog;
216 print STDERR $log; 219 print STDERR $log;
217 220
218 $self->{written} += 221 $self->{written} +=
… …
302 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 305 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
303 } 306 }
304 307
305 $self->{remote_id} = $id; 308 $self->{remote_id} = $id;
306 309
310 weaken (local $conn{$id}{$self*1} = $self);
311
307 if ($blocked{$id}) { 312 if ($blocked{$id}) {
308 $self->err_blocked($blocked{$id}) 313 $self->err_blocked
309 if $blocked{$id} > $::NOW; 314 if $blocked{$id}[0] > $::NOW;
310 315
311 delete $blocked{$id}; 316 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 } 317 }
325 318
326 # find out server name and port 319 # find out server name and port
327 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 320 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
328 $host = $1; 321 $host = $1;
… …
339 $host = inet_ntoa $host; 332 $host = inet_ntoa $host;
340 } 333 }
341 334
342 $self->{server_name} = $host; 335 $self->{server_name} = $host;
343 336
344 # enter ourselves into various lists
345 weaken ($conn{$id}{$self*1} = $self);
346 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 337 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
347 338
348 eval { 339 eval {
349 $self->map_uri; 340 $self->map_uri;
350 $self->respond; 341 $self->respond;
351 }; 342 };
352 343
353 $self->eoconn;
354
355 die if $@ && !ref $@; 344 die if $@ && !ref $@;
356 345
357 last if $self->{h}{connection} =~ /close/; 346 last if $self->{h}{connection} =~ /close/i;
358 347
359 $httpevent->broadcast; 348 $httpevent->broadcast;
360 349
361 $fh->timeout($::PER_TIMEOUT); 350 $fh->timeout($::PER_TIMEOUT);
362 } 351 }
352}
353
354sub block {
355 my $self = shift;
356
357 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
358 $self->slog(2, "blocked ip $self->{remote_id}");
359 $self->err_blocked;
363} 360}
364 361
365# uri => path mapping 362# uri => path mapping
366sub map_uri { 363sub map_uri {
367 my $self = shift; 364 my $self = shift;
… …
414 411
415sub respond { 412sub respond {
416 my $self = shift; 413 my $self = shift;
417 my $path = $self->{path}; 414 my $path = $self->{path};
418 415
419 stat $path 416 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
420 or $self->err(404, "not found"); 417 if ($::internal{$1}) {
421 418 $::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 { 419 } else {
435 $ims < $self->{stat}[9] 420 $self->err(404, "not found");
421 }
422 } else {
423
424 stat $path
436 or $self->err(304, "not modified"); 425 or $self->err(404, "not found");
437 426
438 if (-r "$path/index.html") { 427 $self->{stat} = [stat _];
439 # replace directory "size" by index.html filesize 428
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 429 # idiotic netscape sends idiotic headers AGAIN
441 $self->handle_file; 430 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
431 ? str2time $1 : 0;
432
433 if (-d _ && -r _) {
434 # directory
435 if ($path !~ /\/$/) {
436 # create a redirect to get the trailing "/"
437 # we don't try to avoid the :80
438 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
442 } else { 439 } else {
440 $ims < $self->{stat}[9]
441 or $self->err(304, "not modified");
442
443 if (-r "$path/index.html") {
444 # replace directory "size" by index.html filesize
445 $self->{stat} = [stat ($self->{path} .= "/index.html")];
446 $self->handle_file($queue_index);
447 } else {
443 $self->handle_dir; 448 $self->handle_dir;
444 } 449 }
445 } 450 }
446 } elsif (-f _ && -r _) { 451 } elsif (-f _ && -r _) {
447 -x _ and $self->err(403, "forbidden"); 452 -x _ and $self->err(403, "forbidden");
453
454 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
455 my $timeout = $::NOW + 10;
456 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
457 if ($timeout < $::NOW) {
458 $self->block($::BLOCKTIME, "too many connections");
459 } else {
460 $httpevent->wait;
461 }
462 }
463 }
464
448 $self->handle_file; 465 $self->handle_file($queue_file);
449 } else { 466 } else {
450 $self->err(404, "not found"); 467 $self->err(404, "not found");
468 }
451 } 469 }
452} 470}
453 471
454sub handle_dir { 472sub handle_dir {
455 my $self = shift; 473 my $self = shift;
… …
457 475
458 $self->response(200, "ok", 476 $self->response(200, "ok",
459 { 477 {
460 "Content-Type" => "text/html", 478 "Content-Type" => "text/html",
461 "Content-Length" => length $idx, 479 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]), 480 "Last-Modified" => time2str ($self->{stat}[9]),
463 }, 481 },
464 $idx); 482 $idx);
465} 483}
466 484
467sub handle_file { 485sub handle_file {
468 my $self = shift; 486 my ($self, $queue) = @_;
469 my $length = $self->{stat}[7]; 487 my $length = $self->{stat}[7];
470 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
471 my $hdr = { 488 my $hdr = {
472 "Last-Modified" => time2str ((stat _)[9]), 489 "Last-Modified" => time2str ((stat _)[9]),
473 }; 490 };
474 491
475 my @code = (200, "ok"); 492 my @code = (200, "ok");
… …
492 $self->err(416, "not satisfiable", $hdr, ""); 509 $self->err(416, "not satisfiable", $hdr, "");
493 510
494satisfiable: 511satisfiable:
495 # check for segmented downloads 512 # check for segmented downloads
496 if ($l && $::NO_SEGMENTED) { 513 if ($l && $::NO_SEGMENTED) {
497 my $delay = $::NOW + $::PER_TIMEOUT + 15; 514 my $timeout = $::NOW + 15;
498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 515 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
499 if ($delay <= $::NOW) { 516 if ($timeout <= $::NOW) {
517 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
500 $self->err_segmented_download; 518 #$self->err_segmented_download;
501 } else { 519 } else {
502 $httpevent->wait; 520 $httpevent->wait;
503 } 521 }
504 } 522 }
505 } 523 }
… …
520 $self->response(@code, $hdr, ""); 538 $self->response(@code, $hdr, "");
521 539
522 if ($self->{method} eq "GET") { 540 if ($self->{method} eq "GET") {
523 $self->{time} = $::NOW; 541 $self->{time} = $::NOW;
524 542
525 my $fudge = $queue->[0]->waiters; 543 my $current = $Coro::current;
526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
527
528 $queue->[1] *= $fudge;
529 544
530 my ($fh, $buf, $r); 545 my ($fh, $buf, $r);
531 my $current = $Coro::current; 546
532 open $fh, "<", $self->{path} 547 open $fh, "<", $self->{path}
533 or die "$self->{path}: late open failure ($!)"; 548 or die "$self->{path}: late open failure ($!)";
534 549
535 $h -= $l - 1; 550 $h -= $l - 1;
536 551
537 if (0) { 552 if (0) { # !AIO
538 if ($l) { 553 if ($l) {
539 sysseek $fh, $l, 0; 554 sysseek $fh, $l, 0;
540 } 555 }
541 } 556 }
542 557
543 my $transfer; # transfer guard 558 my $transfer = $queue->start_transfer($h);
559 my $locked;
544 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 560 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
545 561
546 while ($h > 0) { 562 while ($h > 0) {
547 unless ($transfer) { 563 unless ($locked) {
548 if ($transfer ||= $queue->[0]->timed_guard($::WAIT_INTERVAL)) { 564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
549 if ($fudge != 1) {
550 $queue->[1] /= $fudge;
551 $queue->[1] = $queue->[1] * $::wait_factor
552 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
553 }
554 $bufsize = $::BUFSIZE; 565 $bufsize = $::BUFSIZE;
555 $self->{time} = $::NOW; 566 $self->{time} = $::NOW;
556 } 567 }
557 } 568 }
558 569
570 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close";
572 die bless {}, err::;
573 }
574
559 if (0) { 575 if (0) { # !AIO
560 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
561 or last; 577 or last;
562 } else { 578 } else {
563 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h), 579 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
564 $buf, 0, sub { 580 $buf, 0, sub {

Diff Legend

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