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

Diff Legend

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