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.35 by root, Thu Aug 30 12:35:28 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
44# one "execution thread" 47# one "execution thread"
45sub handler { 48sub handler {
46 while () { 49 while () {
47 my $new = pop @newcons;
48 if ($new) { 50 if (@newcons) {
49 eval { 51 eval {
50 conn->new(@$new)->handle; 52 conn->new(@{pop @newcons})->handle;
51 }; 53 };
52 slog 1, "$@" if $@ && !ref $@; 54 slog 1, "$@" if $@ && !ref $@;
53 $connections->up; 55 $connections->up;
54 } else { 56 } else {
55 last if @pool >= $MAX_POOL; 57 last if @pool >= $MAX_POOL;
… …
57 schedule; 59 schedule;
58 } 60 }
59 } 61 }
60} 62}
61 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
62my $http_port = new Coro::Socket 86my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 87 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 88 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 89 ReuseAddr => 1,
66 Listen => 50, 90 Listen => 50,
67 or die "unable to start server"; 91 or die "unable to start server";
68 92
69push @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}
70 105
71our $NOW; 106our $NOW;
72our $HTTP_NOW; 107our $HTTP_NOW;
73 108
74Event->timer(interval => 1, hard => 1, cb => sub { 109Event->timer(interval => 1, hard => 1, cb => sub {
75 $NOW = time; 110 $NOW = time;
76 $HTTP_NOW = time2str $NOW; 111 $HTTP_NOW = time2str $NOW;
77})->now; 112})->now;
78 113
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
95package conn; 114package conn;
96 115
97use Socket; 116use Socket;
98use HTTP::Date; 117use HTTP::Date;
99use Convert::Scalar 'weaken'; 118use Convert::Scalar 'weaken';
100use Linux::AIO; 119use Linux::AIO;
101 120
102Linux::AIO::min_parallel $::AIO_PARALLEL; 121Linux::AIO::min_parallel $::AIO_PARALLEL;
103
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105 122
106Event->io(fd => Linux::AIO::poll_fileno, 123Event->io(fd => Linux::AIO::poll_fileno,
107 poll => 'r', async => 1, 124 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 125 cb => \&Linux::AIO::poll_cb);
109 126
… …
127 144
128read_mimetypes; 145read_mimetypes;
129 146
130sub new { 147sub new {
131 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
132 my $peername = shift; 150 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
137 154
138 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_addr} = inet_ntoa $iaddr;
139 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
140 157
141 # enter ourselves into various lists 158 weaken ($Coro::current->{conn} = $self);
142 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
143 159
144 $::conns++; 160 $::conns++;
145 161
146 $self; 162 $self;
147} 163}
148 164
149sub DESTROY { 165sub DESTROY {
150 my $self = shift; 166 my $self = shift;
151
152 $::conns--; 167 $::conns--;
153
154 $self->eoconn; 168 $self->eoconn;
155 delete $conn{$self->{remote_addr}}{$self*1};
156} 169}
157 170
158# end of connection 171# end of connection
159sub eoconn { 172sub eoconn {
160 my $self = shift; 173 my $self = shift;
174
175 # clean up hints
176 delete $conn{$self->{remote_id}}{$self*1};
161 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
162} 180}
163 181
164sub slog { 182sub slog {
165 my $self = shift; 183 my $self = shift;
166 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 184 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
168 186
169sub response { 187sub response {
170 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
171 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
172 190
173 $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 }
174 204
175 $res .= "Date: $HTTP_NOW\015\012"; 205 $res .= "Date: $HTTP_NOW\015\012";
176 206
177 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
178 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
179 } 209 }
180 $res .= "\015\012"; 210 $res .= "\015\012";
181 211
182 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
183 213
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
184 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";
185 216
186 print $accesslog $log if $accesslog; 217 print $accesslog $log if $accesslog;
187 print STDERR $log; 218 print STDERR $log;
188 219
189 $self->{written} += 220 $self->{written} +=
… …
228 } 259 }
229 260
230 $self->{h} = {}; 261 $self->{h} = {};
231 262
232 $fh->timeout($::RES_TIMEOUT); 263 $fh->timeout($::RES_TIMEOUT);
233 my $ip = $self->{remote_addr};
234
235 if ($blocked{$ip}) {
236 $self->err_blocked($blocked{$ip})
237 if $blocked{$ip} > $::NOW;
238
239 delete $blocked{$ip};
240 }
241
242 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
243 my $delay = 120;
244 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
245 if ($delay <= 0) {
246 $self->slog(2, "blocked ip $ip");
247 $self->err_blocked;
248 } else {
249 Coro::Event::do_timer(after => 3);
250 $delay -= 3;
251 }
252 }
253 }
254 264
255 $req =~ /^(?:\015\012)? 265 $req =~ /^(?:\015\012)?
256 (GET|HEAD) \040+ 266 (GET|HEAD) \040+
257 ([^\040]+) \040+ 267 ([^\040]+) \040+
258 HTTP\/([0-9]+\.[0-9]+) 268 HTTP\/([0-9]+\.[0-9]+)
… …
283 293
284 $self->{h}{$h} = substr $v, 1 294 $self->{h}{$h} = substr $v, 1
285 while ($h, $v) = each %hdr; 295 while ($h, $v) = each %hdr;
286 } 296 }
287 297
298 # remote id should be unique per user
299 my $id = $self->{remote_addr};
300
301 if (exists $self->{h}{"client-ip"}) {
302 $id .= "[".$self->{h}{"client-ip"}."]";
303 } elsif (exists $self->{h}{"x-forwarded-for"}) {
304 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
305 }
306
307 $self->{remote_id} = $id;
308
309 if ($blocked{$id}) {
310 $self->err_blocked($blocked{$id})
311 if $blocked{$id} > $::NOW;
312
313 delete $blocked{$id};
314 }
315
316 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
317 my $delay = $::PER_TIMEOUT + $::NOW + 15;
318 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
319 if ($delay < $::NOW) {
320 $self->slog(2, "blocked ip $id");
321 $self->err_blocked;
322 } else {
323 $httpevent->wait;
324 }
325 }
326 }
327
288 # find out server name and port 328 # find out server name and port
289 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 329 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
290 $host = $1; 330 $host = $1;
291 } else { 331 } else {
292 $host = $self->{h}{host}; 332 $host = $self->{h}{host};
… …
294 334
295 if (defined $host) { 335 if (defined $host) {
296 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 336 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
297 } else { 337 } else {
298 ($self->{server_port}, $host) 338 ($self->{server_port}, $host)
299 = unpack_sockaddr_in $self->{fh}->getsockname 339 = unpack_sockaddr_in $self->{fh}->sockname
300 or $self->err(500, "unable to get socket name"); 340 or $self->err(500, "unable to get socket name");
301 $host = inet_ntoa $host; 341 $host = inet_ntoa $host;
302 } 342 }
303 343
304 $self->{server_name} = $host; 344 $self->{server_name} = $host;
305 345
306 # remote id should be unique per user 346 # enter ourselves into various lists
307 $self->{remote_id} = $self->{remote_addr}; 347 weaken ($conn{$id}{$self*1} = $self);
308
309 if (exists $self->{h}{"client-ip"}) {
310 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
311 } elsif (exists $self->{h}{"x-forwarded-for"}) {
312 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
313 }
314
315 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 348 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
316 349
317 eval { 350 eval {
318 $self->map_uri; 351 $self->map_uri;
319 $self->respond; 352 $self->respond;
320 }; 353 };
321 354
322 $self->eoconn; 355 $self->eoconn;
323 356
324 die if $@ && !ref $@; 357 die if $@ && !ref $@;
325 358
326 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 359 last if $self->{h}{connection} =~ /close/;
360
361 $httpevent->broadcast;
327 362
328 $fh->timeout($::PER_TIMEOUT); 363 $fh->timeout($::PER_TIMEOUT);
329 } 364 }
330} 365}
331 366
… …
381 416
382sub respond { 417sub respond {
383 my $self = shift; 418 my $self = shift;
384 my $path = $self->{path}; 419 my $path = $self->{path};
385 420
386 stat $path 421 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
387 or $self->err(404, "not found"); 422 if ($::internal{$1}) {
388 423 $::internal{$1}->($self);
389 $self->{stat} = [stat _];
390
391 # idiotic netscape sends idiotic headers AGAIN
392 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
393 ? str2time $1 : 0;
394
395 if (-d _ && -r _) {
396 # directory
397 if ($path !~ /\/$/) {
398 # create a redirect to get the trailing "/"
399 # we don't try to avoid the :80
400 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
401 } else { 424 } else {
402 $ims < $self->{stat}[9] 425 $self->err(404, "not found");
426 }
427 } else {
428
429 stat $path
403 or $self->err(304, "not modified"); 430 or $self->err(404, "not found");
404 431
405 if (-r "$path/index.html") { 432 $self->{stat} = [stat _];
406 $self->{path} .= "/index.html"; 433
407 $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}/" });
408 } 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 {
409 $self->handle_dir; 453 $self->handle_dir;
410 } 454 }
411 } 455 }
412 } elsif (-f _ && -r _) { 456 } elsif (-f _ && -r _) {
413 -x _ and $self->err(403, "forbidden"); 457 -x _ and $self->err(403, "forbidden");
414 $self->handle_file; 458 $self->handle_file;
415 } else { 459 } else {
416 $self->err(404, "not found"); 460 $self->err(404, "not found");
461 }
417 } 462 }
418} 463}
419 464
420sub handle_dir { 465sub handle_dir {
421 my $self = shift; 466 my $self = shift;
… …
423 468
424 $self->response(200, "ok", 469 $self->response(200, "ok",
425 { 470 {
426 "Content-Type" => "text/html", 471 "Content-Type" => "text/html",
427 "Content-Length" => length $idx, 472 "Content-Length" => length $idx,
473 "Last-Modified" => time2str ((stat _)[9]),
428 }, 474 },
429 $idx); 475 $idx);
430} 476}
431 477
432sub handle_file { 478sub handle_file {
… …
457 $self->err(416, "not satisfiable", $hdr, ""); 503 $self->err(416, "not satisfiable", $hdr, "");
458 504
459satisfiable: 505satisfiable:
460 # check for segmented downloads 506 # check for segmented downloads
461 if ($l && $::NO_SEGMENTED) { 507 if ($l && $::NO_SEGMENTED) {
462 my $delay = 180; 508 my $delay = $::NOW + $::PER_TIMEOUT + 15;
463 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 509 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
464 if ($delay <= 0) { 510 if ($delay <= $::NOW) {
465 $self->err_segmented_download; 511 $self->err_segmented_download;
466 } else { 512 } else {
467 Coro::Event::do_timer(after => 3); $delay -= 3; 513 $httpevent->wait;
468 } 514 }
469 } 515 }
470 } 516 }
471 517
472 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 518 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
485 $self->response(@code, $hdr, ""); 531 $self->response(@code, $hdr, "");
486 532
487 if ($self->{method} eq "GET") { 533 if ($self->{method} eq "GET") {
488 $self->{time} = $::NOW; 534 $self->{time} = $::NOW;
489 535
490 my $fudge = $queue->[0]->waiters; 536 my $current = $Coro::current;
491 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
492
493 $queue->[1] *= $fudge;
494 my $transfer = $queue->[0]->guard;
495
496 if ($fudge != 1) {
497 $queue->[1] /= $fudge;
498 $queue->[1] = $queue->[1] * $::wait_factor
499 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
500 }
501 $self->{time} = $::NOW;
502
503 $self->{fh}->writable or return;
504 537
505 my ($fh, $buf, $r); 538 my ($fh, $buf, $r);
506 my $current = $Coro::current; 539
507 open $fh, "<", $self->{path} 540 open $fh, "<", $self->{path}
508 or die "$self->{path}: late open failure ($!)"; 541 or die "$self->{path}: late open failure ($!)";
509 542
510 $h -= $l - 1; 543 $h -= $l - 1;
511 544
512 if (0) { 545 if (0) { # !AIO
513 if ($l) { 546 if ($l) {
514 sysseek $fh, $l, 0; 547 sysseek $fh, $l, 0;
515 } 548 }
516 } 549 }
550
551 my $transfer; # transfer guard
552 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
553
554 $self->{time} = $::NOW;
517 555
518 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
519 if (0) { 564 if (0) { # !AIO
520 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
521 or last; 566 or last;
522 } else { 567 } else {
523 undef $buf; 568 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
524 $aio_requests->down;
525 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
526 $buf, 0, sub { 569 $buf, 0, sub {
527 $r = $_[0]; 570 $r = $_[0];
528 $current->ready; 571 Coro::ready($current);
529 }); 572 });
530 &Coro::schedule; 573 &Coro::schedule;
531 $aio_requests->up;
532 last unless $r; 574 last unless $r;
533 } 575 }
534 my $w = $self->{fh}->syswrite($buf) 576 my $w = syswrite $self->{fh}, $buf
535 or last; 577 or last;
536 $::written += $w; 578 $::written += $w;
537 $self->{written} += $w; 579 $self->{written} += $w;
538 $l += $r; 580 $l += $r;
539 } 581 }

Diff Legend

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