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.4 by root, Fri Aug 10 04:16:41 2001 UTC vs.
Revision 1.9 by root, Sat Aug 11 12:49:21 2001 UTC

… …
18 printf "---: $format\n", @_; 18 printf "---: $format\n", @_;
19} 19}
20 20
21my $connections = new Coro::Semaphore $MAX_CONNECTS; 21my $connections = new Coro::Semaphore $MAX_CONNECTS;
22 22
23my @fh; 23my @newcons;
24my @pool; 24my @pool;
25 25
26# one "execution thread" 26# one "execution thread"
27sub handler { 27sub handler {
28 while () { 28 while () {
29 my $fh = pop @fh; 29 my $new = pop @newcons;
30 if ($fh) { 30 if ($new) {
31 eval { 31 eval {
32 conn->new($fh)->handle; 32 conn->new(@$new)->handle;
33 }; 33 };
34 close $fh;
35 slog 1, "$@" if $@ && !ref $@; 34 slog 1, "$@" if $@ && !ref $@;
36 $connections->up; 35 $connections->up;
37 } else { 36 } else {
38 last if @pool >= $MAX_POOL; 37 last if @pool >= $MAX_POOL;
39 push @pool, $Coro::current; 38 push @pool, $Coro::current;
… …
54# the "main thread" 53# the "main thread"
55async { 54async {
56 slog 1, "accepting connections"; 55 slog 1, "accepting connections";
57 while () { 56 while () {
58 $connections->down; 57 $connections->down;
59 push @fh, $http_port->accept; 58 push @newcons, [$http_port->accept];
60 #slog 3, "accepted @$connections ".scalar(@pool); 59 #slog 3, "accepted @$connections ".scalar(@pool);
61 $::NOW = time; 60 $::NOW = time;
62 if (@pool) { 61 if (@pool) {
63 (pop @pool)->ready; 62 (pop @pool)->ready;
64 } else { 63 } else {
… …
74use HTTP::Date; 73use HTTP::Date;
75use Convert::Scalar 'weaken'; 74use Convert::Scalar 'weaken';
76 75
77our %conn; # $conn{ip}{fh} => connobj 76our %conn; # $conn{ip}{fh} => connobj
78our %blocked; 77our %blocked;
78our %mimetype;
79
80sub read_mimetypes {
81 local *M;
82 if (open M, "<mimetypes") {
83 while (<M>) {
84 if (/^([^#]\S+)\t+(\S+)$/) {
85 $mimetype{lc $1} = $2;
86 }
87 }
88 } else {
89 $self->slog(1, "cannot open mimetypes\n");
90 }
91}
79 92
80sub new { 93sub new {
81 my $class = shift; 94 my $class = shift;
95 my $peername = shift;
82 my $fh = shift; 96 my $fh = shift;
83 my $self = bless { fh => $fh }, $class; 97 my $self = bless { fh => $fh }, $class;
84 my (undef, $iaddr) = unpack_sockaddr_in $fh->getpeername 98 my (undef, $iaddr) = unpack_sockaddr_in $peername
85 or $self->err(500, "unable to get peername"); 99 or $self->err(500, "unable to decode peername");
100
86 $self->{remote_addr} = inet_ntoa $iaddr; 101 $self->{remote_addr} = inet_ntoa $iaddr;
87 102
88 # enter ourselves into various lists 103 # enter ourselves into various lists
89 weaken ($conn{$self->{remote_addr}}{$self*1} = $self); 104 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
90 105
… …
221 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 236 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80;
222 237
223 weaken ($uri{$self->{uri}}{$self*1} = $self); 238 weaken ($uri{$self->{uri}}{$self*1} = $self);
224 239
225 $self->map_uri; 240 $self->map_uri;
226
227 Coro::Event::do_timer(after => 5);
228
229 $self->respond; 241 $self->respond;
230 #} 242 #}
231} 243}
232 244
233# uri => path mapping 245# uri => path mapping
… …
247 259
248 $self->{name} = $uri; 260 $self->{name} = $uri;
249 261
250 # now do the path mapping 262 # now do the path mapping
251 $self->{path} = "$::DOCROOT/$host$uri"; 263 $self->{path} = "$::DOCROOT/$host$uri";
264
265 $self->access_check;
252} 266}
253 267
254sub server_address { 268sub server_address {
255 my $self = shift; 269 my $self = shift;
256 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname 270 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
… …
383ignore: 397ignore:
384 } else { 398 } else {
385 ($l, $h) = (0, $length - 1); 399 ($l, $h) = (0, $length - 1);
386 } 400 }
387 401
388 if ($self->{path} =~ /\.html$/) { 402 $self->{path} =~ /\.([^.]+)$/;
389 $hdr->{"Content-Type"} = "text/html";
390 } else {
391 $hdr->{"Content-Type"} = "application/octet-stream"; 403 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
392 }
393
394 $hdr->{"Content-Length"} = $length; 404 $hdr->{"Content-Length"} = $length;
395 405
396 $self->response(@code, $hdr, ""); 406 $self->response(@code, $hdr, "");
397 407
398 if ($self->{method} eq "GET") { 408 if ($self->{method} eq "GET") {
… …
406 } 416 }
407 417
408 $h -= $l - 1; 418 $h -= $l - 1;
409 419
410 while ($h > 0) { 420 while ($h > 0) {
411 $h -= sysread $fh, $buf, $h > 16384 ? 16384 : $h; 421 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h;
412 print {$self->{fh}} $buf 422 $self->{fh}->syswrite($buf)
413 or last; 423 or last;
414 cede;
415 } 424 }
416 } 425 }
417 426
418 close $fh; 427 close $fh;
419} 428}

Diff Legend

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