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.39 by root, Sun Sep 2 12:23:04 2001 UTC vs.
Revision 1.51 by root, Thu Nov 29 01:50:41 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 transferqueue $MAX_TRANSFERS_SMALL),
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 41 (new transferqueue $MAX_TRANSFERS_LARGE),
39); 42);
40 43
41my @newcons; 44my @newcons;
42my @pool; 45my @pool;
43 46
… …
56 schedule; 59 schedule;
57 } 60 }
58 } 61 }
59} 62}
60 63
64sub listen_on {
65 my $listen = $_[0];
66
67 push @listen_sockets, $listen;
68
69 # the "main thread"
70 async {
71 slog 1, "accepting connections";
72 while () {
73 $connections->down;
74 push @newcons, [$listen->accept];
75 #slog 3, "accepted @$connections ".scalar(@pool);
76 if (@pool) {
77 (pop @pool)->ready;
78 } else {
79 async \&handler;
80 }
81
82 }
83 };
84}
85
61my $http_port = new Coro::Socket 86my $http_port = new Coro::Socket
62 LocalAddr => $SERVER_HOST, 87 LocalAddr => $SERVER_HOST,
63 LocalPort => $SERVER_PORT, 88 LocalPort => $SERVER_PORT,
64 ReuseAddr => 1, 89 ReuseAddr => 1,
65 Listen => 50, 90 Listen => 50,
66 or die "unable to start server"; 91 or die "unable to start server";
67 92
68push @listen_sockets, $http_port; 93listen_on $http_port;
94
95if ($SERVER_PORT2) {
96 my $http_port = new Coro::Socket
97 LocalAddr => $SERVER_HOST,
98 LocalPort => $SERVER_PORT2,
99 ReuseAddr => 1,
100 Listen => 50,
101 or die "unable to start server";
102
103 listen_on $http_port;
104}
69 105
70our $NOW; 106our $NOW;
71our $HTTP_NOW; 107our $HTTP_NOW;
72 108
73Event->timer(interval => 1, hard => 1, cb => sub { 109Event->timer(interval => 1, hard => 1, cb => sub {
74 $NOW = time; 110 $NOW = time;
75 $HTTP_NOW = time2str $NOW; 111 $HTTP_NOW = time2str $NOW;
76})->now; 112})->now;
77
78# the "main thread"
79async {
80 slog 1, "accepting connections";
81 while () {
82 $connections->down;
83 push @newcons, [$http_port->accept];
84 #slog 3, "accepted @$connections ".scalar(@pool);
85 if (@pool) {
86 (pop @pool)->ready;
87 } else {
88 async \&handler;
89 }
90
91 }
92};
93 113
94package conn; 114package conn;
95 115
96use Socket; 116use Socket;
97use HTTP::Date; 117use HTTP::Date;
… …
124 144
125read_mimetypes; 145read_mimetypes;
126 146
127sub new { 147sub new {
128 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
129 my $peername = shift; 150 my $peername = shift;
130 my $fh = shift;
131 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
132 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
133 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
134 154
155 $self->{remote_addr} =
135 $self->{remote_addr} = inet_ntoa $iaddr; 156 $self->{remote_id} = inet_ntoa $iaddr;
136 $self->{time} = $::NOW; 157 $self->{time} = $::NOW;
158
159 weaken ($Coro::current->{conn} = $self);
137 160
138 $::conns++; 161 $::conns++;
139 162
140 $self; 163 $self;
141} 164}
… …
151 my $self = shift; 174 my $self = shift;
152 175
153 # clean up hints 176 # clean up hints
154 delete $conn{$self->{remote_id}}{$self*1}; 177 delete $conn{$self->{remote_id}}{$self*1};
155 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
179
180 $httpevent->broadcast;
156} 181}
157 182
158sub slog { 183sub slog {
159 my $self = shift; 184 my $self = shift;
160 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 185 main::slog($_[0], "$self->{remote_id}> $_[1]");
161} 186}
162 187
163sub response { 188sub response {
164 my ($self, $code, $msg, $hdr, $content) = @_; 189 my ($self, $code, $msg, $hdr, $content) = @_;
165 my $res = "HTTP/1.1 $code $msg\015\012"; 190 my $res = "HTTP/1.1 $code $msg\015\012";
166 191
167 $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 }
168 205
169 $res .= "Date: $HTTP_NOW\015\012"; 206 $res .= "Date: $HTTP_NOW\015\012";
170 207
171 while (my ($h, $v) = each %$hdr) { 208 while (my ($h, $v) = each %$hdr) {
172 $res .= "$h: $v\015\012" 209 $res .= "$h: $v\015\012"
173 } 210 }
174 $res .= "\015\012"; 211 $res .= "\015\012";
175 212
176 $res .= $content if defined $content and $self->{method} ne "HEAD"; 213 $res .= $content if defined $content and $self->{method} ne "HEAD";
177 214
178 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";
179 218
180 print $accesslog $log if $accesslog; 219 print $accesslog $log if $accesslog;
181 print STDERR $log; 220 print STDERR $log;
182 221
183 $self->{written} += 222 $self->{written} +=
… …
275 314
276 delete $blocked{$id}; 315 delete $blocked{$id};
277 } 316 }
278 317
279 if (%{$conn{$id}} >= $::MAX_CONN_IP) { 318 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
280 my $delay = $::PER_TIMEOUT + 15; 319 my $delay = $::PER_TIMEOUT + $::NOW + 15;
281 while (%{$conn{$id}} >= $::MAX_CONN_IP) { 320 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
282 if ($delay <= 0) { 321 if ($delay < $::NOW) {
283 $self->slog(2, "blocked ip $id"); 322 $self->slog(2, "blocked ip $id");
284 $self->err_blocked; 323 $self->err_blocked;
285 } else { 324 } else {
286 Coro::Event::do_timer(after => 4); $delay -= 4; 325 $httpevent->wait;
287 } 326 }
288 } 327 }
289 } 328 }
290 329
291 # find out server name and port 330 # find out server name and port
… …
297 336
298 if (defined $host) { 337 if (defined $host) {
299 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 338 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
300 } else { 339 } else {
301 ($self->{server_port}, $host) 340 ($self->{server_port}, $host)
302 = unpack_sockaddr_in $self->{fh}->getsockname 341 = unpack_sockaddr_in $self->{fh}->sockname
303 or $self->err(500, "unable to get socket name"); 342 or $self->err(500, "unable to get socket name");
304 $host = inet_ntoa $host; 343 $host = inet_ntoa $host;
305 } 344 }
306 345
307 $self->{server_name} = $host; 346 $self->{server_name} = $host;
… …
317 356
318 $self->eoconn; 357 $self->eoconn;
319 358
320 die if $@ && !ref $@; 359 die if $@ && !ref $@;
321 360
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 361 last if $self->{h}{connection} =~ /close/;
362
363 $httpevent->broadcast;
323 364
324 $fh->timeout($::PER_TIMEOUT); 365 $fh->timeout($::PER_TIMEOUT);
325 } 366 }
326} 367}
327 368
… …
377 418
378sub respond { 419sub respond {
379 my $self = shift; 420 my $self = shift;
380 my $path = $self->{path}; 421 my $path = $self->{path};
381 422
382 stat $path 423 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
383 or $self->err(404, "not found"); 424 if ($::internal{$1}) {
384 425 $::internal{$1}->($self);
385 $self->{stat} = [stat _];
386
387 # idiotic netscape sends idiotic headers AGAIN
388 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
389 ? str2time $1 : 0;
390
391 if (-d _ && -r _) {
392 # directory
393 if ($path !~ /\/$/) {
394 # create a redirect to get the trailing "/"
395 # we don't try to avoid the :80
396 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
397 } else { 426 } else {
398 $ims < $self->{stat}[9] 427 $self->err(404, "not found");
428 }
429 } else {
430
431 stat $path
399 or $self->err(304, "not modified"); 432 or $self->err(404, "not found");
400 433
401 if (-r "$path/index.html") { 434 $self->{stat} = [stat _];
402 $self->{path} .= "/index.html"; 435
403 $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}/" });
404 } 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}[7] = (stat ($self->{path} .= "/index.html"))[7];
453 $self->handle_file;
454 } else {
405 $self->handle_dir; 455 $self->handle_dir;
406 } 456 }
407 } 457 }
408 } elsif (-f _ && -r _) { 458 } elsif (-f _ && -r _) {
409 -x _ and $self->err(403, "forbidden"); 459 -x _ and $self->err(403, "forbidden");
410 $self->handle_file; 460 $self->handle_file;
411 } else { 461 } else {
412 $self->err(404, "not found"); 462 $self->err(404, "not found");
463 }
413 } 464 }
414} 465}
415 466
416sub handle_dir { 467sub handle_dir {
417 my $self = shift; 468 my $self = shift;
… …
419 470
420 $self->response(200, "ok", 471 $self->response(200, "ok",
421 { 472 {
422 "Content-Type" => "text/html", 473 "Content-Type" => "text/html",
423 "Content-Length" => length $idx, 474 "Content-Length" => length $idx,
475 #d# directories change all the time, so X-
476 "X-Last-Modified" => time2str ((stat _)[9]),
424 }, 477 },
425 $idx); 478 $idx);
426} 479}
427 480
428sub handle_file { 481sub handle_file {
… …
453 $self->err(416, "not satisfiable", $hdr, ""); 506 $self->err(416, "not satisfiable", $hdr, "");
454 507
455satisfiable: 508satisfiable:
456 # check for segmented downloads 509 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 510 if ($l && $::NO_SEGMENTED) {
458 my $delay = $::PER_TIMEOUT + 15; 511 my $delay = $::NOW + $::PER_TIMEOUT + 15;
459 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 512 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 513 if ($delay <= $::NOW) {
461 $self->err_segmented_download; 514 $self->err_segmented_download;
462 } else { 515 } else {
463 Coro::Event::do_timer(after => 4); $delay -= 4; 516 $httpevent->wait;
464 } 517 }
465 } 518 }
466 } 519 }
467 520
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 521 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 $self->response(@code, $hdr, ""); 534 $self->response(@code, $hdr, "");
482 535
483 if ($self->{method} eq "GET") { 536 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 537 $self->{time} = $::NOW;
485 538
486 my $fudge = $queue->[0]->waiters; 539 my $current = $Coro::current;
487 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
488
489 $queue->[1] *= $fudge;
490 my $transfer = $queue->[0]->guard;
491
492 if ($fudge != 1) {
493 $queue->[1] /= $fudge;
494 $queue->[1] = $queue->[1] * $::wait_factor
495 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
496 }
497 $self->{time} = $::NOW;
498
499 $self->{fh}->writable or return;
500 540
501 my ($fh, $buf, $r); 541 my ($fh, $buf, $r);
502 my $current = $Coro::current; 542
503 open $fh, "<", $self->{path} 543 open $fh, "<", $self->{path}
504 or die "$self->{path}: late open failure ($!)"; 544 or die "$self->{path}: late open failure ($!)";
505 545
506 $h -= $l - 1; 546 $h -= $l - 1;
507 547
508 if (0) { 548 if (0) { # !AIO
509 if ($l) { 549 if ($l) {
510 sysseek $fh, $l, 0; 550 sysseek $fh, $l, 0;
511 } 551 }
512 } 552 }
553
554 my $transfer = $queue->start_transfer;
555 my $locked;
556 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
513 557
514 while ($h > 0) { 558 while ($h > 0) {
559 unless ($locked) {
560 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
561 $bufsize = $::BUFSIZE;
562 $self->{time} = $::NOW;
563 }
564 }
565
515 if (0) { 566 if (0) { # !AIO
516 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 567 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
517 or last; 568 or last;
518 } else { 569 } else {
519 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 570 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
520 $buf, 0, sub { 571 $buf, 0, sub {
521 $r = $_[0]; 572 $r = $_[0];
522 Coro::ready($current); 573 Coro::ready($current);
523 }); 574 });
524 &Coro::schedule; 575 &Coro::schedule;

Diff Legend

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