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.55 by root, Fri Nov 30 06:20:43 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 $queue_small = new transferqueue $MAX_TRANSFERS_SMALL;
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 40our $queue_large = new transferqueue $MAX_TRANSFERS_LARGE;
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 41our $queue_index = new transferqueue 5;
39);
40 42
41my @newcons; 43my @newcons;
42my @pool; 44my @pool;
43 45
44# one "execution thread" 46# one "execution thread"
… …
87 Listen => 50, 89 Listen => 50,
88 or die "unable to start server"; 90 or die "unable to start server";
89 91
90listen_on $http_port; 92listen_on $http_port;
91 93
94if ($SERVER_PORT2) {
92my $http_port = new Coro::Socket 95 my $http_port = new Coro::Socket
93 LocalAddr => $SERVER_HOST, 96 LocalAddr => $SERVER_HOST,
94 LocalPort => $SERVER_PORT2, 97 LocalPort => $SERVER_PORT2,
95 ReuseAddr => 1, 98 ReuseAddr => 1,
96 Listen => 50, 99 Listen => 50,
97 or die "unable to start server"; 100 or die "unable to start server";
98 101
99listen_on $http_port; 102 listen_on $http_port;
103}
100 104
101our $NOW; 105our $NOW;
102our $HTTP_NOW; 106our $HTTP_NOW;
103 107
104Event->timer(interval => 1, hard => 1, cb => sub { 108Event->timer(interval => 1, hard => 1, cb => sub {
… …
139 143
140read_mimetypes; 144read_mimetypes;
141 145
142sub new { 146sub new {
143 my $class = shift; 147 my $class = shift;
148 my $fh = shift;
144 my $peername = shift; 149 my $peername = shift;
145 my $fh = shift;
146 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
147 my (undef, $iaddr) = unpack_sockaddr_in $peername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
148 or $self->err(500, "unable to decode peername"); 152 or $self->err(500, "unable to decode peername");
149 153
154 $self->{remote_addr} =
150 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_id} = inet_ntoa $iaddr;
151 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
152 157
158 weaken ($Coro::current->{conn} = $self);
159
153 $::conns++; 160 $::conns++;
161 $::maxconns = $::conns if $::conns > $::maxconns;
154 162
155 $self; 163 $self;
156} 164}
157 165
158sub DESTROY { 166sub DESTROY {
… …
166 my $self = shift; 174 my $self = shift;
167 175
168 # clean up hints 176 # clean up hints
169 delete $conn{$self->{remote_id}}{$self*1}; 177 delete $conn{$self->{remote_id}}{$self*1};
170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
179
180 $httpevent->broadcast;
171} 181}
172 182
173sub slog { 183sub slog {
174 my $self = shift; 184 my $self = shift;
175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 185 main::slog($_[0], "$self->{remote_id}> $_[1]");
176} 186}
177 187
178sub response { 188sub response {
179 my ($self, $code, $msg, $hdr, $content) = @_; 189 my ($self, $code, $msg, $hdr, $content) = @_;
180 my $res = "HTTP/1.1 $code $msg\015\012"; 190 my $res = "HTTP/1.1 $code $msg\015\012";
181 191
182 $self->{h}{connection} ||= $hdr->{Connection}; 192 if (exists $hdr->{Connection}) {
193 if ($hdr->{Connection} =~ /close/) {
194 $self->{h}{connection} = "close"
195 }
196 } else {
197 if ($self->{version} < 1.1) {
198 if ($self->{h}{connection} =~ /keep-alive/i) {
199 $hdr->{Connection} = "Keep-Alive";
200 } else {
201 $self->{h}{connection} = "close"
202 }
203 }
204 }
183 205
184 $res .= "Date: $HTTP_NOW\015\012"; 206 $res .= "Date: $HTTP_NOW\015\012";
185 207
186 while (my ($h, $v) = each %$hdr) { 208 while (my ($h, $v) = each %$hdr) {
187 $res .= "$h: $v\015\012" 209 $res .= "$h: $v\015\012"
188 } 210 }
189 $res .= "\015\012"; 211 $res .= "\015\012";
190 212
191 $res .= $content if defined $content and $self->{method} ne "HEAD"; 213 $res .= $content if defined $content and $self->{method} ne "HEAD";
192 214
193 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 215 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
216 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
217 " \"$self->{h}{referer}\"\n";
194 218
195 print $accesslog $log if $accesslog; 219 print $accesslog $log if $accesslog;
196 print STDERR $log; 220 print STDERR $log;
197 221
198 $self->{written} += 222 $self->{written} +=
… …
290 314
291 delete $blocked{$id}; 315 delete $blocked{$id};
292 } 316 }
293 317
294 if (%{$conn{$id}} >= $::MAX_CONN_IP) { 318 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
295 my $delay = $::PER_TIMEOUT + 15; 319 my $delay = $::PER_TIMEOUT + $::NOW + 15;
296 while (%{$conn{$id}} >= $::MAX_CONN_IP) { 320 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 if ($delay <= 0) { 321 if ($delay < $::NOW) {
298 $self->slog(2, "blocked ip $id"); 322 $self->slog(2, "blocked ip $id");
299 $self->err_blocked; 323 $self->err_blocked;
300 } else { 324 } else {
301 Coro::Event::do_timer(after => 4); $delay -= 4; 325 $httpevent->wait;
302 } 326 }
303 } 327 }
304 } 328 }
305 329
306 # find out server name and port 330 # find out server name and port
… …
312 336
313 if (defined $host) { 337 if (defined $host) {
314 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 338 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
315 } else { 339 } else {
316 ($self->{server_port}, $host) 340 ($self->{server_port}, $host)
317 = unpack_sockaddr_in $self->{fh}->getsockname 341 = unpack_sockaddr_in $self->{fh}->sockname
318 or $self->err(500, "unable to get socket name"); 342 or $self->err(500, "unable to get socket name");
319 $host = inet_ntoa $host; 343 $host = inet_ntoa $host;
320 } 344 }
321 345
322 $self->{server_name} = $host; 346 $self->{server_name} = $host;
… …
332 356
333 $self->eoconn; 357 $self->eoconn;
334 358
335 die if $@ && !ref $@; 359 die if $@ && !ref $@;
336 360
337 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 361 last if $self->{h}{connection} =~ /close/;
362
363 $httpevent->broadcast;
338 364
339 $fh->timeout($::PER_TIMEOUT); 365 $fh->timeout($::PER_TIMEOUT);
340 } 366 }
341} 367}
342 368
… …
392 418
393sub respond { 419sub respond {
394 my $self = shift; 420 my $self = shift;
395 my $path = $self->{path}; 421 my $path = $self->{path};
396 422
397 stat $path 423 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
398 or $self->err(404, "not found"); 424 if ($::internal{$1}) {
399 425 $::internal{$1}->($self);
400 $self->{stat} = [stat _];
401
402 # idiotic netscape sends idiotic headers AGAIN
403 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
404 ? str2time $1 : 0;
405
406 if (-d _ && -r _) {
407 # directory
408 if ($path !~ /\/$/) {
409 # create a redirect to get the trailing "/"
410 # we don't try to avoid the :80
411 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
412 } else { 426 } else {
413 $ims < $self->{stat}[9] 427 $self->err(404, "not found");
428 }
429 } else {
430
431 stat $path
414 or $self->err(304, "not modified"); 432 or $self->err(404, "not found");
415 433
416 if (-r "$path/index.html") { 434 $self->{stat} = [stat _];
417 $self->{path} .= "/index.html"; 435
418 $self->handle_file; 436 # idiotic netscape sends idiotic headers AGAIN
437 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
438 ? str2time $1 : 0;
439
440 if (-d _ && -r _) {
441 # directory
442 if ($path !~ /\/$/) {
443 # create a redirect to get the trailing "/"
444 # we don't try to avoid the :80
445 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
419 } else { 446 } else {
447 $ims < $self->{stat}[9]
448 or $self->err(304, "not modified");
449
450 if (-r "$path/index.html") {
451 # replace directory "size" by index.html filesize
452 $self->{stat} = [stat ($self->{path} .= "/index.html")];
453 $self->handle_file($queue_index);
454 } else {
420 $self->handle_dir; 455 $self->handle_dir;
421 } 456 }
422 } 457 }
423 } elsif (-f _ && -r _) { 458 } elsif (-f _ && -r _) {
424 -x _ and $self->err(403, "forbidden"); 459 -x _ and $self->err(403, "forbidden");
425 $self->handle_file; 460 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small);
426 } else { 461 } else {
427 $self->err(404, "not found"); 462 $self->err(404, "not found");
463 }
428 } 464 }
429} 465}
430 466
431sub handle_dir { 467sub handle_dir {
432 my $self = shift; 468 my $self = shift;
… …
434 470
435 $self->response(200, "ok", 471 $self->response(200, "ok",
436 { 472 {
437 "Content-Type" => "text/html", 473 "Content-Type" => "text/html",
438 "Content-Length" => length $idx, 474 "Content-Length" => length $idx,
475 "Last-Modified" => time2str ($self->{stat}[9]),
439 }, 476 },
440 $idx); 477 $idx);
441} 478}
442 479
443sub handle_file { 480sub handle_file {
444 my $self = shift; 481 my ($self, $queue) = @_;
445 my $length = $self->{stat}[7]; 482 my $length = $self->{stat}[7];
446 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
447 my $hdr = { 483 my $hdr = {
448 "Last-Modified" => time2str ((stat _)[9]), 484 "Last-Modified" => time2str ((stat _)[9]),
449 }; 485 };
450 486
451 my @code = (200, "ok"); 487 my @code = (200, "ok");
… …
468 $self->err(416, "not satisfiable", $hdr, ""); 504 $self->err(416, "not satisfiable", $hdr, "");
469 505
470satisfiable: 506satisfiable:
471 # check for segmented downloads 507 # check for segmented downloads
472 if ($l && $::NO_SEGMENTED) { 508 if ($l && $::NO_SEGMENTED) {
473 my $delay = $::PER_TIMEOUT + 15; 509 my $delay = $::NOW + $::PER_TIMEOUT + 15;
474 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
475 if ($delay <= 0) { 511 if ($delay <= $::NOW) {
476 $self->err_segmented_download; 512 $self->err_segmented_download;
477 } else { 513 } else {
478 Coro::Event::do_timer(after => 4); $delay -= 4; 514 $httpevent->wait;
479 } 515 }
480 } 516 }
481 } 517 }
482 518
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 519 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
496 $self->response(@code, $hdr, ""); 532 $self->response(@code, $hdr, "");
497 533
498 if ($self->{method} eq "GET") { 534 if ($self->{method} eq "GET") {
499 $self->{time} = $::NOW; 535 $self->{time} = $::NOW;
500 536
501 my $fudge = $queue->[0]->waiters; 537 my $current = $Coro::current;
502 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
503
504 $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 538
516 my ($fh, $buf, $r); 539 my ($fh, $buf, $r);
517 my $current = $Coro::current; 540
518 open $fh, "<", $self->{path} 541 open $fh, "<", $self->{path}
519 or die "$self->{path}: late open failure ($!)"; 542 or die "$self->{path}: late open failure ($!)";
520 543
521 $h -= $l - 1; 544 $h -= $l - 1;
522 545
523 if (0) { 546 if (0) { # !AIO
524 if ($l) { 547 if ($l) {
525 sysseek $fh, $l, 0; 548 sysseek $fh, $l, 0;
526 } 549 }
527 } 550 }
551
552 my $transfer = $queue->start_transfer;
553 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
528 555
529 while ($h > 0) { 556 while ($h > 0) {
557 unless ($locked) {
558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW;
561 }
562 }
563
530 if (0) { 564 if (0) { # !AIO
531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
532 or last; 566 or last;
533 } else { 567 } else {
534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 568 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
535 $buf, 0, sub { 569 $buf, 0, sub {
536 $r = $_[0]; 570 $r = $_[0];
537 Coro::ready($current); 571 Coro::ready($current);
538 }); 572 });
539 &Coro::schedule; 573 &Coro::schedule;

Diff Legend

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