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.37 by root, Sun Sep 2 01:03:53 2001 UTC vs.
Revision 1.46 by root, Sat Nov 17 04:15: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;
7 8
8no utf8; 9no utf8;
9use bytes; 10use bytes;
… …
28 my $format = shift; 29 my $format = shift;
29 printf "---: $format\n", @_; 30 printf "---: $format\n", @_;
30} 31}
31 32
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 33our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
34our $httpevent = new Coro::Signal;
33 35
34our $wait_factor = 0.95; 36our $wait_factor = 0.95;
35 37
36our @transfers = ( 38our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 39 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
… …
42my @pool; 44my @pool;
43 45
44# one "execution thread" 46# one "execution thread"
45sub handler { 47sub handler {
46 while () { 48 while () {
47 my $new = pop @newcons;
48 if ($new) { 49 if (@newcons) {
49 eval { 50 eval {
50 conn->new(@$new)->handle; 51 conn->new(@{pop @newcons})->handle;
51 }; 52 };
52 slog 1, "$@" if $@ && !ref $@; 53 slog 1, "$@" if $@ && !ref $@;
53 $connections->up; 54 $connections->up;
54 } else { 55 } else {
55 last if @pool >= $MAX_POOL; 56 last if @pool >= $MAX_POOL;
… …
57 schedule; 58 schedule;
58 } 59 }
59 } 60 }
60} 61}
61 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
62my $http_port = new Coro::Socket 85my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 86 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 87 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 88 ReuseAddr => 1,
66 Listen => 50, 89 Listen => 50,
67 or die "unable to start server"; 90 or die "unable to start server";
68 91
69push @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}
70 104
71our $NOW; 105our $NOW;
72our $HTTP_NOW; 106our $HTTP_NOW;
73 107
74Event->timer(interval => 1, hard => 1, cb => sub { 108Event->timer(interval => 1, hard => 1, cb => sub {
75 $NOW = time; 109 $NOW = time;
76 $HTTP_NOW = time2str $NOW; 110 $HTTP_NOW = time2str $NOW;
77})->now; 111})->now;
78
79# the "main thread"
80async {
81 slog 1, "accepting connections";
82 while () {
83 $connections->down;
84 push @newcons, [$http_port->accept];
85 #slog 3, "accepted @$connections ".scalar(@pool);
86 if (@pool) {
87 (pop @pool)->ready;
88 } else {
89 async \&handler;
90 }
91
92 }
93};
94 112
95package conn; 113package conn;
96 114
97use Socket; 115use Socket;
98use HTTP::Date; 116use HTTP::Date;
… …
125 143
126read_mimetypes; 144read_mimetypes;
127 145
128sub new { 146sub new {
129 my $class = shift; 147 my $class = shift;
148 my $fh = shift;
130 my $peername = shift; 149 my $peername = shift;
131 my $fh = shift;
132 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
133 my (undef, $iaddr) = unpack_sockaddr_in $peername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
134 or $self->err(500, "unable to decode peername"); 152 or $self->err(500, "unable to decode peername");
135 153
136 $self->{remote_addr} = inet_ntoa $iaddr; 154 $self->{remote_addr} = inet_ntoa $iaddr;
… …
141 $self; 159 $self;
142} 160}
143 161
144sub DESTROY { 162sub DESTROY {
145 my $self = shift; 163 my $self = shift;
146
147 $::conns--; 164 $::conns--;
148
149 $self->eoconn; 165 $self->eoconn;
150} 166}
151 167
152# end of connection 168# end of connection
153sub eoconn { 169sub eoconn {
154 my $self = shift; 170 my $self = shift;
155 171
156 # clean up hints 172 # clean up hints
157 delete $conn{$self->{remote_id}}{$self*1}; 173 delete $conn{$self->{remote_id}}{$self*1};
158 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 174 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
175
176 $httpevent->broadcast;
159} 177}
160 178
161sub slog { 179sub slog {
162 my $self = shift; 180 my $self = shift;
163 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 181 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
165 183
166sub response { 184sub response {
167 my ($self, $code, $msg, $hdr, $content) = @_; 185 my ($self, $code, $msg, $hdr, $content) = @_;
168 my $res = "HTTP/1.1 $code $msg\015\012"; 186 my $res = "HTTP/1.1 $code $msg\015\012";
169 187
170 $self->{h}{connection} ||= $hdr->{Connection}; 188 if (exists $hdr->{Connection}) {
189 if ($hdr->{Connection} =~ /close/) {
190 $self->{h}{connection} = "close"
191 }
192 } else {
193 if ($self->{version} < 1.1) {
194 if ($self->{h}{connection} =~ /keep-alive/i) {
195 $hdr->{Connection} = "Keep-Alive";
196 } else {
197 $self->{h}{connection} = "close"
198 }
199 }
200 }
171 201
172 $res .= "Date: $HTTP_NOW\015\012"; 202 $res .= "Date: $HTTP_NOW\015\012";
173 203
174 while (my ($h, $v) = each %$hdr) { 204 while (my ($h, $v) = each %$hdr) {
175 $res .= "$h: $v\015\012" 205 $res .= "$h: $v\015\012"
… …
278 308
279 delete $blocked{$id}; 309 delete $blocked{$id};
280 } 310 }
281 311
282 if (%{$conn{$id}} >= $::MAX_CONN_IP) { 312 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
283 my $delay = $::PER_TIMEOUT + 15; 313 my $delay = $::PER_TIMEOUT + $::NOW + 15;
284 while (%{$conn{$id}} >= $::MAX_CONN_IP) { 314 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
285 if ($delay <= 0) { 315 if ($delay < $::NOW) {
286 $self->slog(2, "blocked ip $id"); 316 $self->slog(2, "blocked ip $id");
287 $self->err_blocked; 317 $self->err_blocked;
288 } else { 318 } else {
289 Coro::Event::do_timer(after => 4); $delay -= 4; 319 $httpevent->wait;
290 } 320 }
291 } 321 }
292 } 322 }
293 323
294 # find out server name and port 324 # find out server name and port
… …
300 330
301 if (defined $host) { 331 if (defined $host) {
302 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 332 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
303 } else { 333 } else {
304 ($self->{server_port}, $host) 334 ($self->{server_port}, $host)
305 = unpack_sockaddr_in $self->{fh}->getsockname 335 = unpack_sockaddr_in $self->{fh}->sockname
306 or $self->err(500, "unable to get socket name"); 336 or $self->err(500, "unable to get socket name");
307 $host = inet_ntoa $host; 337 $host = inet_ntoa $host;
308 } 338 }
309 339
310 $self->{server_name} = $host; 340 $self->{server_name} = $host;
… …
320 350
321 $self->eoconn; 351 $self->eoconn;
322 352
323 die if $@ && !ref $@; 353 die if $@ && !ref $@;
324 354
325 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 355 last if $self->{h}{connection} =~ /close/;
356
357 $httpevent->broadcast;
326 358
327 $fh->timeout($::PER_TIMEOUT); 359 $fh->timeout($::PER_TIMEOUT);
328 } 360 }
329} 361}
330 362
… …
400 } else { 432 } else {
401 $ims < $self->{stat}[9] 433 $ims < $self->{stat}[9]
402 or $self->err(304, "not modified"); 434 or $self->err(304, "not modified");
403 435
404 if (-r "$path/index.html") { 436 if (-r "$path/index.html") {
405 $self->{path} .= "/index.html"; 437 # replace directory "size" by index.html filesize
438 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
406 $self->handle_file; 439 $self->handle_file;
407 } else { 440 } else {
408 $self->handle_dir; 441 $self->handle_dir;
409 } 442 }
410 } 443 }
… …
456 $self->err(416, "not satisfiable", $hdr, ""); 489 $self->err(416, "not satisfiable", $hdr, "");
457 490
458satisfiable: 491satisfiable:
459 # check for segmented downloads 492 # check for segmented downloads
460 if ($l && $::NO_SEGMENTED) { 493 if ($l && $::NO_SEGMENTED) {
461 my $delay = $::PER_TIMEOUT + 15; 494 my $delay = $::NOW + $::PER_TIMEOUT + 15;
462 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 495 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
463 if ($delay <= 0) { 496 if ($delay <= $::NOW) {
464 $self->err_segmented_download; 497 $self->err_segmented_download;
465 } else { 498 } else {
466 Coro::Event::do_timer(after => 4); $delay -= 4; 499 $httpevent->wait;
467 } 500 }
468 } 501 }
469 } 502 }
470 503
471 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 504 $hdr->{"Content-Range"} = "bytes $l-$h/$length";

Diff Legend

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