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

Diff Legend

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