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.40 by root, Mon Sep 3 00:06:06 2001 UTC vs.
Revision 1.48 by root, Tue Nov 27 03:38:08 2001 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal;
5 6
6use HTTP::Date; 7use HTTP::Date;
8use POSIX ();
7 9
8no utf8; 10no utf8;
9use bytes; 11use bytes;
10 12
11# at least on my machine, this thingy serves files 13# at least on my machine, this thingy serves files
… …
28 my $format = shift; 30 my $format = shift;
29 printf "---: $format\n", @_; 31 printf "---: $format\n", @_;
30} 32}
31 33
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal;
33 36
34our $wait_factor = 0.95; 37our $wait_factor = 0.95;
35 38
36our @transfers = ( 39our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 40 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE), 1],
39); 42);
40 43
41my @newcons; 44my @newcons;
42my @pool; 45my @pool;
43 46
… …
87 Listen => 50, 90 Listen => 50,
88 or die "unable to start server"; 91 or die "unable to start server";
89 92
90listen_on $http_port; 93listen_on $http_port;
91 94
95if ($SERVER_PORT2) {
92my $http_port = new Coro::Socket 96 my $http_port = new Coro::Socket
93 LocalAddr => $SERVER_HOST, 97 LocalAddr => $SERVER_HOST,
94 LocalPort => $SERVER_PORT2, 98 LocalPort => $SERVER_PORT2,
95 ReuseAddr => 1, 99 ReuseAddr => 1,
96 Listen => 50, 100 Listen => 50,
97 or die "unable to start server"; 101 or die "unable to start server";
98 102
99listen_on $http_port; 103 listen_on $http_port;
104}
100 105
101our $NOW; 106our $NOW;
102our $HTTP_NOW; 107our $HTTP_NOW;
103 108
104Event->timer(interval => 1, hard => 1, cb => sub { 109Event->timer(interval => 1, hard => 1, cb => sub {
… …
139 144
140read_mimetypes; 145read_mimetypes;
141 146
142sub new { 147sub new {
143 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
144 my $peername = shift; 150 my $peername = shift;
145 my $fh = shift;
146 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
147 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
148 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
149 154
150 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_addr} = inet_ntoa $iaddr;
… …
166 my $self = shift; 171 my $self = shift;
167 172
168 # clean up hints 173 # clean up hints
169 delete $conn{$self->{remote_id}}{$self*1}; 174 delete $conn{$self->{remote_id}}{$self*1};
170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 175 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
176
177 $httpevent->broadcast;
171} 178}
172 179
173sub slog { 180sub slog {
174 my $self = shift; 181 my $self = shift;
175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
177 184
178sub response { 185sub response {
179 my ($self, $code, $msg, $hdr, $content) = @_; 186 my ($self, $code, $msg, $hdr, $content) = @_;
180 my $res = "HTTP/1.1 $code $msg\015\012"; 187 my $res = "HTTP/1.1 $code $msg\015\012";
181 188
182 $self->{h}{connection} ||= $hdr->{Connection}; 189 if (exists $hdr->{Connection}) {
190 if ($hdr->{Connection} =~ /close/) {
191 $self->{h}{connection} = "close"
192 }
193 } else {
194 if ($self->{version} < 1.1) {
195 if ($self->{h}{connection} =~ /keep-alive/i) {
196 $hdr->{Connection} = "Keep-Alive";
197 } else {
198 $self->{h}{connection} = "close"
199 }
200 }
201 }
183 202
184 $res .= "Date: $HTTP_NOW\015\012"; 203 $res .= "Date: $HTTP_NOW\015\012";
185 204
186 while (my ($h, $v) = each %$hdr) { 205 while (my ($h, $v) = each %$hdr) {
187 $res .= "$h: $v\015\012" 206 $res .= "$h: $v\015\012"
188 } 207 }
189 $res .= "\015\012"; 208 $res .= "\015\012";
190 209
191 $res .= $content if defined $content and $self->{method} ne "HEAD"; 210 $res .= $content if defined $content and $self->{method} ne "HEAD";
192 211
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
193 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 213 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
194 214
195 print $accesslog $log if $accesslog; 215 print $accesslog $log if $accesslog;
196 print STDERR $log; 216 print STDERR $log;
197 217
198 $self->{written} += 218 $self->{written} +=
… …
290 310
291 delete $blocked{$id}; 311 delete $blocked{$id};
292 } 312 }
293 313
294 if (%{$conn{$id}} >= $::MAX_CONN_IP) { 314 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
295 my $delay = $::PER_TIMEOUT + 15; 315 my $delay = $::PER_TIMEOUT + $::NOW + 15;
296 while (%{$conn{$id}} >= $::MAX_CONN_IP) { 316 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 if ($delay <= 0) { 317 if ($delay < $::NOW) {
298 $self->slog(2, "blocked ip $id"); 318 $self->slog(2, "blocked ip $id");
299 $self->err_blocked; 319 $self->err_blocked;
300 } else { 320 } else {
301 Coro::Event::do_timer(after => 4); $delay -= 4; 321 $httpevent->wait;
302 } 322 }
303 } 323 }
304 } 324 }
305 325
306 # find out server name and port 326 # find out server name and port
… …
312 332
313 if (defined $host) { 333 if (defined $host) {
314 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 334 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
315 } else { 335 } else {
316 ($self->{server_port}, $host) 336 ($self->{server_port}, $host)
317 = unpack_sockaddr_in $self->{fh}->getsockname 337 = unpack_sockaddr_in $self->{fh}->sockname
318 or $self->err(500, "unable to get socket name"); 338 or $self->err(500, "unable to get socket name");
319 $host = inet_ntoa $host; 339 $host = inet_ntoa $host;
320 } 340 }
321 341
322 $self->{server_name} = $host; 342 $self->{server_name} = $host;
… …
332 352
333 $self->eoconn; 353 $self->eoconn;
334 354
335 die if $@ && !ref $@; 355 die if $@ && !ref $@;
336 356
337 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 357 last if $self->{h}{connection} =~ /close/;
358
359 $httpevent->broadcast;
338 360
339 $fh->timeout($::PER_TIMEOUT); 361 $fh->timeout($::PER_TIMEOUT);
340 } 362 }
341} 363}
342 364
… …
412 } else { 434 } else {
413 $ims < $self->{stat}[9] 435 $ims < $self->{stat}[9]
414 or $self->err(304, "not modified"); 436 or $self->err(304, "not modified");
415 437
416 if (-r "$path/index.html") { 438 if (-r "$path/index.html") {
417 $self->{path} .= "/index.html"; 439 # replace directory "size" by index.html filesize
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
418 $self->handle_file; 441 $self->handle_file;
419 } else { 442 } else {
420 $self->handle_dir; 443 $self->handle_dir;
421 } 444 }
422 } 445 }
… …
434 457
435 $self->response(200, "ok", 458 $self->response(200, "ok",
436 { 459 {
437 "Content-Type" => "text/html", 460 "Content-Type" => "text/html",
438 "Content-Length" => length $idx, 461 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]),
439 }, 463 },
440 $idx); 464 $idx);
441} 465}
442 466
443sub handle_file { 467sub handle_file {
… …
468 $self->err(416, "not satisfiable", $hdr, ""); 492 $self->err(416, "not satisfiable", $hdr, "");
469 493
470satisfiable: 494satisfiable:
471 # check for segmented downloads 495 # check for segmented downloads
472 if ($l && $::NO_SEGMENTED) { 496 if ($l && $::NO_SEGMENTED) {
473 my $delay = $::PER_TIMEOUT + 15; 497 my $delay = $::NOW + $::PER_TIMEOUT + 15;
474 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
475 if ($delay <= 0) { 499 if ($delay <= $::NOW) {
476 $self->err_segmented_download; 500 $self->err_segmented_download;
477 } else { 501 } else {
478 Coro::Event::do_timer(after => 4); $delay -= 4; 502 $httpevent->wait;
479 } 503 }
480 } 504 }
481 } 505 }
482 506
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 507 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
500 524
501 my $fudge = $queue->[0]->waiters; 525 my $fudge = $queue->[0]->waiters;
502 $fudge = $fudge ? ($fudge+1)/$fudge : 1; 526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
503 527
504 $queue->[1] *= $fudge; 528 $queue->[1] *= $fudge;
505 my $transfer = $queue->[0]->guard;
506
507 if ($fudge != 1) {
508 $queue->[1] /= $fudge;
509 $queue->[1] = $queue->[1] * $::wait_factor
510 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
511 }
512 $self->{time} = $::NOW;
513
514 $self->{fh}->writable or return;
515 529
516 my ($fh, $buf, $r); 530 my ($fh, $buf, $r);
517 my $current = $Coro::current; 531 my $current = $Coro::current;
518 open $fh, "<", $self->{path} 532 open $fh, "<", $self->{path}
519 or die "$self->{path}: late open failure ($!)"; 533 or die "$self->{path}: late open failure ($!)";
… …
523 if (0) { 537 if (0) {
524 if ($l) { 538 if ($l) {
525 sysseek $fh, $l, 0; 539 sysseek $fh, $l, 0;
526 } 540 }
527 } 541 }
542
543 my $transfer; # transfer guard
544 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
528 545
529 while ($h > 0) { 546 while ($h > 0) {
547 unless ($transfer) {
548 if ($transfer ||= $queue->[0]->timed_guard($::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;
555 $self->{time} = $::NOW;
556 }
557 }
558
530 if (0) { 559 if (0) {
531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 560 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
532 or last; 561 or last;
533 } else { 562 } else {
534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 563 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
535 $buf, 0, sub { 564 $buf, 0, sub {
536 $r = $_[0]; 565 $r = $_[0];
537 Coro::ready($current); 566 Coro::ready($current);
538 }); 567 });
539 &Coro::schedule; 568 &Coro::schedule;

Diff Legend

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