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.60 by root, Mon Dec 10 21:18:31 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;
166
155 $self->{time} = $::NOW; 167 $self->{time} = $::NOW;
156 168
169 weaken ($Coro::current->{conn} = $self);
170
157 $::conns++; 171 $::conns++;
172 $::maxconns = $::conns if $::conns > $::maxconns;
158 173
159 $self; 174 $self;
160} 175}
161 176
162sub DESTROY { 177sub DESTROY {
163 my $self = shift; 178 #my $self = shift;
164 $::conns--; 179 $::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} 180}
178 181
179sub slog { 182sub slog {
180 my $self = shift; 183 my $self = shift;
181 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
182} 185}
183 186
184sub response { 187sub response {
185 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
186 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
187 190
191 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) {
188 $self->{h}{connection} = "close" 193 $self->{h}{connection} = "close"
189 if exists $hdr->{Connection} # to avoid "empty" header lines due to vivification 194 }
190 and $hdr->{Connection} =~ /close/; 195 } else {
196 if ($self->{version} < 1.1) {
197 if ($self->{h}{connection} =~ /keep-alive/i) {
198 $hdr->{Connection} = "Keep-Alive";
199 } else {
200 $self->{h}{connection} = "close"
201 }
202 }
203 }
191 204
192 $res .= "Date: $HTTP_NOW\015\012"; 205 $res .= "Date: $HTTP_NOW\015\012";
193 206
194 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
195 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
196 } 209 }
197 $res .= "\015\012"; 210 $res .= "\015\012";
198 211
199 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
200 213
201 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
216 " \"$self->{h}{referer}\"\n";
202 217
203 print $accesslog $log if $accesslog; 218 print $accesslog $log if $accesslog;
204 print STDERR $log; 219 print STDERR $log;
205 220
206 $self->{written} += 221 $self->{written} +=
… …
290 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 305 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
291 } 306 }
292 307
293 $self->{remote_id} = $id; 308 $self->{remote_id} = $id;
294 309
310 weaken (local $conn{$id}{$self*1} = $self);
311
295 if ($blocked{$id}) { 312 if ($blocked{$id}) {
296 $self->err_blocked($blocked{$id}) 313 $self->err_blocked
297 if $blocked{$id} > $::NOW; 314 if $blocked{$id}[0] > $::NOW;
298 315
299 delete $blocked{$id}; 316 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 } 317 }
313 318
314 # find out server name and port 319 # find out server name and port
315 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 320 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
316 $host = $1; 321 $host = $1;
… …
327 $host = inet_ntoa $host; 332 $host = inet_ntoa $host;
328 } 333 }
329 334
330 $self->{server_name} = $host; 335 $self->{server_name} = $host;
331 336
332 # enter ourselves into various lists
333 weaken ($conn{$id}{$self*1} = $self);
334 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 337 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
335 338
336 eval { 339 eval {
337 $self->map_uri; 340 $self->map_uri;
338 $self->respond; 341 $self->respond;
339 }; 342 };
340 343
341 $self->eoconn;
342
343 die if $@ && !ref $@; 344 die if $@ && !ref $@;
344 345
345 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 346 last if $self->{h}{connection} =~ /close/i;
346 347
347 $httpevent->broadcast; 348 $httpevent->broadcast;
348 349
349 $fh->timeout($::PER_TIMEOUT); 350 $fh->timeout($::PER_TIMEOUT);
350 } 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;
351} 360}
352 361
353# uri => path mapping 362# uri => path mapping
354sub map_uri { 363sub map_uri {
355 my $self = shift; 364 my $self = shift;
… …
402 411
403sub respond { 412sub respond {
404 my $self = shift; 413 my $self = shift;
405 my $path = $self->{path}; 414 my $path = $self->{path};
406 415
407 stat $path 416 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
408 or $self->err(404, "not found"); 417 if ($::internal{$1}) {
409 418 $::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 { 419 } else {
423 $ims < $self->{stat}[9] 420 $self->err(404, "not found");
421 }
422 } else {
423
424 stat $path
424 or $self->err(304, "not modified"); 425 or $self->err(404, "not found");
425 426
426 if (-r "$path/index.html") { 427 $self->{stat} = [stat _];
427 # replace directory "size" by index.html filesize 428
428 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 429 # idiotic netscape sends idiotic headers AGAIN
429 $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}/" });
430 } 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 {
431 $self->handle_dir; 448 $self->handle_dir;
432 } 449 }
433 } 450 }
434 } elsif (-f _ && -r _) { 451 } elsif (-f _ && -r _) {
435 -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
436 $self->handle_file; 465 $self->handle_file($queue_file);
437 } else { 466 } else {
438 $self->err(404, "not found"); 467 $self->err(404, "not found");
468 }
439 } 469 }
440} 470}
441 471
442sub handle_dir { 472sub handle_dir {
443 my $self = shift; 473 my $self = shift;
… …
445 475
446 $self->response(200, "ok", 476 $self->response(200, "ok",
447 { 477 {
448 "Content-Type" => "text/html", 478 "Content-Type" => "text/html",
449 "Content-Length" => length $idx, 479 "Content-Length" => length $idx,
480 "Last-Modified" => time2str ($self->{stat}[9]),
450 }, 481 },
451 $idx); 482 $idx);
452} 483}
453 484
454sub handle_file { 485sub handle_file {
455 my $self = shift; 486 my ($self, $queue) = @_;
456 my $length = $self->{stat}[7]; 487 my $length = $self->{stat}[7];
457 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
458 my $hdr = { 488 my $hdr = {
459 "Last-Modified" => time2str ((stat _)[9]), 489 "Last-Modified" => time2str ((stat _)[9]),
460 }; 490 };
461 491
462 my @code = (200, "ok"); 492 my @code = (200, "ok");
… …
479 $self->err(416, "not satisfiable", $hdr, ""); 509 $self->err(416, "not satisfiable", $hdr, "");
480 510
481satisfiable: 511satisfiable:
482 # check for segmented downloads 512 # check for segmented downloads
483 if ($l && $::NO_SEGMENTED) { 513 if ($l && $::NO_SEGMENTED) {
484 my $delay = $::NOW + $::PER_TIMEOUT + 15; 514 my $timeout = $::NOW + 15;
485 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 515 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
486 if ($delay <= $::NOW) { 516 if ($timeout <= $::NOW) {
517 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
487 $self->err_segmented_download; 518 #$self->err_segmented_download;
488 } else { 519 } else {
489 $httpevent->broadcast; 520 $httpevent->wait;
490 } 521 }
491 } 522 }
492 } 523 }
493 524
494 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 525 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
507 $self->response(@code, $hdr, ""); 538 $self->response(@code, $hdr, "");
508 539
509 if ($self->{method} eq "GET") { 540 if ($self->{method} eq "GET") {
510 $self->{time} = $::NOW; 541 $self->{time} = $::NOW;
511 542
512 my $fudge = $queue->[0]->waiters; 543 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 544
527 my ($fh, $buf, $r); 545 my ($fh, $buf, $r);
528 my $current = $Coro::current; 546
529 open $fh, "<", $self->{path} 547 open $fh, "<", $self->{path}
530 or die "$self->{path}: late open failure ($!)"; 548 or die "$self->{path}: late open failure ($!)";
531 549
532 $h -= $l - 1; 550 $h -= $l - 1;
533 551
534 if (0) { 552 if (0) { # !AIO
535 if ($l) { 553 if ($l) {
536 sysseek $fh, $l, 0; 554 sysseek $fh, $l, 0;
537 } 555 }
538 } 556 }
557
558 my $transfer = $queue->start_transfer($h);
559 my $locked;
560 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
539 561
540 while ($h > 0) { 562 while ($h > 0) {
563 unless ($locked) {
564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
565 $bufsize = $::BUFSIZE;
566 $self->{time} = $::NOW;
567 }
568 }
569
570 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close";
572 die bless {}, err::;
573 }
574
541 if (0) { 575 if (0) { # !AIO
542 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
543 or last; 577 or last;
544 } else { 578 } else {
545 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 579 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
546 $buf, 0, sub { 580 $buf, 0, sub {
547 $r = $_[0]; 581 $r = $_[0];
548 Coro::ready($current); 582 Coro::ready($current);
549 }); 583 });
550 &Coro::schedule; 584 &Coro::schedule;

Diff Legend

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