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

Diff Legend

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