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.49 by root, Wed Nov 28 03:39:46 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),
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 41 (new Coro::Semaphore $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
135 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_addr} = inet_ntoa $iaddr;
136 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
137 157
158 weaken ($Coro::current->{conn} = $self);
159
138 $::conns++; 160 $::conns++;
139 161
140 $self; 162 $self;
141} 163}
142 164
… …
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} || $self->{remote_addr}) ."> $_[1]");
… …
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
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
178 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 215 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
179 216
180 print $accesslog $log if $accesslog; 217 print $accesslog $log if $accesslog;
181 print STDERR $log; 218 print STDERR $log;
182 219
183 $self->{written} += 220 $self->{written} +=
… …
275 312
276 delete $blocked{$id}; 313 delete $blocked{$id};
277 } 314 }
278 315
279 if (%{$conn{$id}} >= $::MAX_CONN_IP) { 316 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
280 my $delay = $::PER_TIMEOUT + 15; 317 my $delay = $::PER_TIMEOUT + $::NOW + 15;
281 while (%{$conn{$id}} >= $::MAX_CONN_IP) { 318 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
282 if ($delay <= 0) { 319 if ($delay < $::NOW) {
283 $self->slog(2, "blocked ip $id"); 320 $self->slog(2, "blocked ip $id");
284 $self->err_blocked; 321 $self->err_blocked;
285 } else { 322 } else {
286 Coro::Event::do_timer(after => 4); $delay -= 4; 323 $httpevent->wait;
287 } 324 }
288 } 325 }
289 } 326 }
290 327
291 # find out server name and port 328 # find out server name and port
… …
297 334
298 if (defined $host) { 335 if (defined $host) {
299 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 336 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
300 } else { 337 } else {
301 ($self->{server_port}, $host) 338 ($self->{server_port}, $host)
302 = unpack_sockaddr_in $self->{fh}->getsockname 339 = unpack_sockaddr_in $self->{fh}->sockname
303 or $self->err(500, "unable to get socket name"); 340 or $self->err(500, "unable to get socket name");
304 $host = inet_ntoa $host; 341 $host = inet_ntoa $host;
305 } 342 }
306 343
307 $self->{server_name} = $host; 344 $self->{server_name} = $host;
… …
317 354
318 $self->eoconn; 355 $self->eoconn;
319 356
320 die if $@ && !ref $@; 357 die if $@ && !ref $@;
321 358
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 359 last if $self->{h}{connection} =~ /close/;
360
361 $httpevent->broadcast;
323 362
324 $fh->timeout($::PER_TIMEOUT); 363 $fh->timeout($::PER_TIMEOUT);
325 } 364 }
326} 365}
327 366
… …
377 416
378sub respond { 417sub respond {
379 my $self = shift; 418 my $self = shift;
380 my $path = $self->{path}; 419 my $path = $self->{path};
381 420
382 stat $path 421 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
383 or $self->err(404, "not found"); 422 if ($::internal{$1}) {
384 423 $::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 { 424 } else {
398 $ims < $self->{stat}[9] 425 $self->err(404, "not found");
426 }
427 } else {
428
429 stat $path
399 or $self->err(304, "not modified"); 430 or $self->err(404, "not found");
400 431
401 if (-r "$path/index.html") { 432 $self->{stat} = [stat _];
402 $self->{path} .= "/index.html"; 433
403 $self->handle_file; 434 # idiotic netscape sends idiotic headers AGAIN
435 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
436 ? str2time $1 : 0;
437
438 if (-d _ && -r _) {
439 # directory
440 if ($path !~ /\/$/) {
441 # create a redirect to get the trailing "/"
442 # we don't try to avoid the :80
443 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
404 } else { 444 } else {
445 $ims < $self->{stat}[9]
446 or $self->err(304, "not modified");
447
448 if (-r "$path/index.html") {
449 # replace directory "size" by index.html filesize
450 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
451 $self->handle_file;
452 } else {
405 $self->handle_dir; 453 $self->handle_dir;
406 } 454 }
407 } 455 }
408 } elsif (-f _ && -r _) { 456 } elsif (-f _ && -r _) {
409 -x _ and $self->err(403, "forbidden"); 457 -x _ and $self->err(403, "forbidden");
410 $self->handle_file; 458 $self->handle_file;
411 } else { 459 } else {
412 $self->err(404, "not found"); 460 $self->err(404, "not found");
461 }
413 } 462 }
414} 463}
415 464
416sub handle_dir { 465sub handle_dir {
417 my $self = shift; 466 my $self = shift;
… …
419 468
420 $self->response(200, "ok", 469 $self->response(200, "ok",
421 { 470 {
422 "Content-Type" => "text/html", 471 "Content-Type" => "text/html",
423 "Content-Length" => length $idx, 472 "Content-Length" => length $idx,
473 "Last-Modified" => time2str ((stat _)[9]),
424 }, 474 },
425 $idx); 475 $idx);
426} 476}
427 477
428sub handle_file { 478sub handle_file {
… …
453 $self->err(416, "not satisfiable", $hdr, ""); 503 $self->err(416, "not satisfiable", $hdr, "");
454 504
455satisfiable: 505satisfiable:
456 # check for segmented downloads 506 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 507 if ($l && $::NO_SEGMENTED) {
458 my $delay = $::PER_TIMEOUT + 15; 508 my $delay = $::NOW + $::PER_TIMEOUT + 15;
459 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 509 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 510 if ($delay <= $::NOW) {
461 $self->err_segmented_download; 511 $self->err_segmented_download;
462 } else { 512 } else {
463 Coro::Event::do_timer(after => 4); $delay -= 4; 513 $httpevent->wait;
464 } 514 }
465 } 515 }
466 } 516 }
467 517
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 518 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 $self->response(@code, $hdr, ""); 531 $self->response(@code, $hdr, "");
482 532
483 if ($self->{method} eq "GET") { 533 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 534 $self->{time} = $::NOW;
485 535
486 my $fudge = $queue->[0]->waiters; 536 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 537
501 my ($fh, $buf, $r); 538 my ($fh, $buf, $r);
502 my $current = $Coro::current; 539
503 open $fh, "<", $self->{path} 540 open $fh, "<", $self->{path}
504 or die "$self->{path}: late open failure ($!)"; 541 or die "$self->{path}: late open failure ($!)";
505 542
506 $h -= $l - 1; 543 $h -= $l - 1;
507 544
508 if (0) { 545 if (0) { # !AIO
509 if ($l) { 546 if ($l) {
510 sysseek $fh, $l, 0; 547 sysseek $fh, $l, 0;
511 } 548 }
512 } 549 }
550
551 my $transfer; # transfer guard
552 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
553
554 $self->{time} = $::NOW;
513 555
514 while ($h > 0) { 556 while ($h > 0) {
557 unless ($transfer) {
558 if ($transfer ||= $queue->timed_guard($::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