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.63 by root, Wed Jan 23 03:07:05 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;
38 58our $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 59
44my @newcons; 60my @newcons;
45my @pool; 61my @pool;
46 62
47# one "execution thread" 63# one "execution thread"
… …
50 if (@newcons) { 66 if (@newcons) {
51 eval { 67 eval {
52 conn->new(@{pop @newcons})->handle; 68 conn->new(@{pop @newcons})->handle;
53 }; 69 };
54 slog 1, "$@" if $@ && !ref $@; 70 slog 1, "$@" if $@ && !ref $@;
71
72 $httpevent->broadcast; # only for testing, but doesn't matter much
73
55 $connections->up; 74 $connections->up;
56 } else { 75 } else {
57 last if @pool >= $MAX_POOL; 76 last if @pool >= $MAX_POOL;
58 push @pool, $Coro::current; 77 push @pool, $Coro::current;
59 schedule; 78 schedule;
… …
101 or die "unable to start server"; 120 or die "unable to start server";
102 121
103 listen_on $http_port; 122 listen_on $http_port;
104} 123}
105 124
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; 125package conn;
115 126
116use Socket; 127use Socket;
117use HTTP::Date; 128use HTTP::Date;
118use Convert::Scalar 'weaken'; 129use Convert::Scalar 'weaken';
… …
150 my $peername = shift; 161 my $peername = shift;
151 my $self = bless { fh => $fh }, $class; 162 my $self = bless { fh => $fh }, $class;
152 my (undef, $iaddr) = unpack_sockaddr_in $peername 163 my (undef, $iaddr) = unpack_sockaddr_in $peername
153 or $self->err(500, "unable to decode peername"); 164 or $self->err(500, "unable to decode peername");
154 165
166 $self->{remote_addr} =
155 $self->{remote_addr} = inet_ntoa $iaddr; 167 $self->{remote_id} = inet_ntoa $iaddr;
168
156 $self->{time} = $::NOW; 169 $self->{time} = $::NOW;
157 170
171 weaken ($Coro::current->{conn} = $self);
172
158 $::conns++; 173 $::conns++;
174 $::maxconns = $::conns if $::conns > $::maxconns;
159 175
160 $self; 176 $self;
161} 177}
162 178
163sub DESTROY { 179sub DESTROY {
164 my $self = shift; 180 #my $self = shift;
165 $::conns--; 181 $::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} 182}
179 183
180sub slog { 184sub slog {
181 my $self = shift; 185 my $self = shift;
182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 186 main::slog($_[0], "$self->{remote_id}> $_[1]");
183} 187}
184 188
185sub response { 189sub response {
186 my ($self, $code, $msg, $hdr, $content) = @_; 190 my ($self, $code, $msg, $hdr, $content) = @_;
187 my $res = "HTTP/1.1 $code $msg\015\012"; 191 my $res = "HTTP/1.1 $code $msg\015\012";
192 my $GZ = "";
188 193
189 if (exists $hdr->{Connection}) { 194 if (exists $hdr->{Connection}) {
190 if ($hdr->{Connection} =~ /close/) { 195 if ($hdr->{Connection} =~ /close/) {
191 $self->{h}{connection} = "close" 196 $self->{h}{connection} = "close"
192 } 197 }
… …
198 $self->{h}{connection} = "close" 203 $self->{h}{connection} = "close"
199 } 204 }
200 } 205 }
201 } 206 }
202 207
208 if ($self->{method} ne "HEAD"
209 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
210 && $hdr->{"Content-Length"} == length $content
211 && !exists $hdr->{"Content-Encoding"}
212 ) {
213 my $orig = length $content;
214 $hdr->{"Content-Encoding"} = "gzip";
215 $content = Compress::Zlib::memGzip(\$content);
216 $hdr->{"Content-Length"} = length $content;
217 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
218 }
219
203 $res .= "Date: $HTTP_NOW\015\012"; 220 $res .= "Date: $HTTP_NOW\015\012";
204 221
205 while (my ($h, $v) = each %$hdr) { 222 while (my ($h, $v) = each %$hdr) {
206 $res .= "$h: $v\015\012" 223 $res .= "$h: $v\015\012"
207 } 224 }
208 $res .= "\015\012"; 225 $res .= "\015\012";
209 226
210 $res .= $content if defined $content and $self->{method} ne "HEAD"; 227 $res .= $content if defined $content and $self->{method} ne "HEAD";
211 228
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 229 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"; 230 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
231 " \"$self->{h}{referer}\"\n";
214 232
215 print $accesslog $log if $accesslog; 233 print $accesslog $log if $accesslog;
216 print STDERR $log; 234 print STDERR $log;
217 235
218 $self->{written} += 236 $self->{written} +=
… …
279 my (%hdr, $h, $v); 297 my (%hdr, $h, $v);
280 298
281 $hdr{lc $1} .= ",$2" 299 $hdr{lc $1} .= ",$2"
282 while $req =~ /\G 300 while $req =~ /\G
283 ([^:\000-\040]+): 301 ([^:\000-\040]+):
284 [\008\040]* 302 [\010\040]*
285 ((?: [^\015\012]+ | \015\012[\008\040] )*) 303 ((?: [^\015\012]+ | \015\012[\010\040] )*)
286 \015\012 304 \015\012
287 /gxc; 305 /gxc;
288 306
289 $req =~ /\G\015\012$/ 307 $req =~ /\G\015\012$/
290 or $self->err(400, "bad request"); 308 or $self->err(400, "bad request");
… …
302 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 320 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
303 } 321 }
304 322
305 $self->{remote_id} = $id; 323 $self->{remote_id} = $id;
306 324
325 weaken (local $conn{$id}{$self*1} = $self);
326
307 if ($blocked{$id}) { 327 if ($blocked{$id}) {
308 $self->err_blocked($blocked{$id}) 328 $self->err_blocked
309 if $blocked{$id} > $::NOW; 329 if $blocked{$id}[0] > $::NOW;
310 330
311 delete $blocked{$id}; 331 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 } 332 }
325 333
326 # find out server name and port 334 # find out server name and port
327 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 335 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
328 $host = $1; 336 $host = $1;
… …
339 $host = inet_ntoa $host; 347 $host = inet_ntoa $host;
340 } 348 }
341 349
342 $self->{server_name} = $host; 350 $self->{server_name} = $host;
343 351
344 # enter ourselves into various lists
345 weaken ($conn{$id}{$self*1} = $self);
346 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 352 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
347 353
348 eval { 354 eval {
349 $self->map_uri; 355 $self->map_uri;
350 $self->respond; 356 $self->respond;
351 }; 357 };
352 358
353 $self->eoconn;
354
355 die if $@ && !ref $@; 359 die if $@ && !ref $@;
356 360
357 last if $self->{h}{connection} =~ /close/; 361 last if $self->{h}{connection} =~ /close/i;
358 362
359 $httpevent->broadcast; 363 $httpevent->broadcast;
360 364
361 $fh->timeout($::PER_TIMEOUT); 365 $fh->timeout($::PER_TIMEOUT);
362 } 366 }
367}
368
369sub block {
370 my $self = shift;
371
372 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
373 $self->slog(2, "blocked ip $self->{remote_id}");
374 $self->err_blocked;
363} 375}
364 376
365# uri => path mapping 377# uri => path mapping
366sub map_uri { 378sub map_uri {
367 my $self = shift; 379 my $self = shift;
… …
414 426
415sub respond { 427sub respond {
416 my $self = shift; 428 my $self = shift;
417 my $path = $self->{path}; 429 my $path = $self->{path};
418 430
419 stat $path 431 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
420 or $self->err(404, "not found"); 432 if ($::internal{$1}) {
421 433 $::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 { 434 } else {
435 $ims < $self->{stat}[9] 435 $self->err(404, "not found");
436 }
437 } else {
438
439 stat $path
436 or $self->err(304, "not modified"); 440 or $self->err(404, "not found");
437 441
438 if (-r "$path/index.html") { 442 $self->{stat} = [stat _];
439 # replace directory "size" by index.html filesize 443
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 444 # idiotic netscape sends idiotic headers AGAIN
441 $self->handle_file; 445 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
446 ? str2time $1 : 0;
447
448 if (-d _ && -r _) {
449 # directory
450 if ($path !~ /\/$/) {
451 # create a redirect to get the trailing "/"
452 # we don't try to avoid the :80
453 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
442 } else { 454 } else {
455 $ims < $self->{stat}[9]
456 or $self->err(304, "not modified");
457
458 if (-r "$path/index.html") {
459 # replace directory "size" by index.html filesize
460 $self->{stat} = [stat ($self->{path} .= "/index.html")];
461 $self->handle_file($queue_index);
462 } else {
443 $self->handle_dir; 463 $self->handle_dir;
444 } 464 }
445 } 465 }
446 } elsif (-f _ && -r _) { 466 } elsif (-f _ && -r _) {
447 -x _ and $self->err(403, "forbidden"); 467 -x _ and $self->err(403, "forbidden");
468
469 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
470 my $timeout = $::NOW + 10;
471 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
472 if ($timeout < $::NOW) {
473 $self->block($::BLOCKTIME, "too many connections");
474 } else {
475 $httpevent->wait;
476 }
477 }
478 }
479
448 $self->handle_file; 480 $self->handle_file($queue_file);
449 } else { 481 } else {
450 $self->err(404, "not found"); 482 $self->err(404, "not found");
483 }
451 } 484 }
452} 485}
453 486
454sub handle_dir { 487sub handle_dir {
455 my $self = shift; 488 my $self = shift;
… …
457 490
458 $self->response(200, "ok", 491 $self->response(200, "ok",
459 { 492 {
460 "Content-Type" => "text/html", 493 "Content-Type" => "text/html",
461 "Content-Length" => length $idx, 494 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]), 495 "Last-Modified" => time2str ($self->{stat}[9]),
463 }, 496 },
464 $idx); 497 $idx);
465} 498}
466 499
467sub handle_file { 500sub handle_file {
468 my $self = shift; 501 my ($self, $queue) = @_;
469 my $length = $self->{stat}[7]; 502 my $length = $self->{stat}[7];
470 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
471 my $hdr = { 503 my $hdr = {
472 "Last-Modified" => time2str ((stat _)[9]), 504 "Last-Modified" => time2str ((stat _)[9]),
473 }; 505 };
474 506
475 my @code = (200, "ok"); 507 my @code = (200, "ok");
… …
492 $self->err(416, "not satisfiable", $hdr, ""); 524 $self->err(416, "not satisfiable", $hdr, "");
493 525
494satisfiable: 526satisfiable:
495 # check for segmented downloads 527 # check for segmented downloads
496 if ($l && $::NO_SEGMENTED) { 528 if ($l && $::NO_SEGMENTED) {
497 my $delay = $::NOW + $::PER_TIMEOUT + 15; 529 my $timeout = $::NOW + 15;
498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 530 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
499 if ($delay <= $::NOW) { 531 if ($timeout <= $::NOW) {
532 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
500 $self->err_segmented_download; 533 #$self->err_segmented_download;
501 } else { 534 } else {
502 $httpevent->wait; 535 $httpevent->wait;
503 } 536 }
504 } 537 }
505 } 538 }
… …
520 $self->response(@code, $hdr, ""); 553 $self->response(@code, $hdr, "");
521 554
522 if ($self->{method} eq "GET") { 555 if ($self->{method} eq "GET") {
523 $self->{time} = $::NOW; 556 $self->{time} = $::NOW;
524 557
525 my $fudge = $queue->[0]->waiters; 558 my $current = $Coro::current;
526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
527
528 $queue->[1] *= $fudge;
529 559
530 my ($fh, $buf, $r); 560 my ($fh, $buf, $r);
531 my $current = $Coro::current; 561
532 open $fh, "<", $self->{path} 562 open $fh, "<", $self->{path}
533 or die "$self->{path}: late open failure ($!)"; 563 or die "$self->{path}: late open failure ($!)";
534 564
535 $h -= $l - 1; 565 $h -= $l - 1;
536 566
537 if (0) { 567 if (0) { # !AIO
538 if ($l) { 568 if ($l) {
539 sysseek $fh, $l, 0; 569 sysseek $fh, $l, 0;
540 } 570 }
541 } 571 }
542 572
543 my $transfer; # transfer guard 573 my $transfer = $queue->start_transfer($h);
574 my $locked;
544 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 575 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
545 576
546 while ($h > 0) { 577 while ($h > 0) {
547 unless ($transfer) { 578 unless ($locked) {
548 if ($transfer ||= $queue->[0]->timed_guard($::WAIT_INTERVAL)) { 579 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; 580 $bufsize = $::BUFSIZE;
555 $self->{time} = $::NOW; 581 $self->{time} = $::NOW;
556 } 582 }
557 } 583 }
558 584
585 if ($blocked{$self->{remote_id}}) {
586 $self->{h}{connection} = "close";
587 die bless {}, err::;
588 }
589
559 if (0) { 590 if (0) { # !AIO
560 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 591 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
561 or last; 592 or last;
562 } else { 593 } else {
563 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h), 594 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
564 $buf, 0, sub { 595 $buf, 0, sub {

Diff Legend

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