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.40 by root, Mon Sep 3 00:06:06 2001 UTC vs.
Revision 1.61 by root, Thu Jan 3 01:20:17 2002 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
… …
13# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
14 16
15$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
16 18
17our $accesslog; 19our $accesslog;
20our $errorlog;
21
22our $NOW;
23our $HTTP_NOW;
24
25Event->timer(interval => 1, hard => 1, cb => sub {
26 $NOW = time;
27 $HTTP_NOW = time2str $NOW;
28})->now;
29
30if ($ERROR_LOG) {
31 use IO::Handle;
32 open $errorlog, ">>$ERROR_LOG"
33 or die "$ERROR_LOG: $!";
34 $errorlog->autoflush(1);
35}
18 36
19if ($ACCESS_LOG) { 37if ($ACCESS_LOG) {
20 use IO::Handle; 38 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG" 39 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!"; 40 or die "$ACCESS_LOG: $!";
… …
24} 42}
25 43
26sub slog { 44sub slog {
27 my $level = shift; 45 my $level = shift;
28 my $format = shift; 46 my $format = shift;
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
29 printf "---: $format\n", @_; 48 printf "$NOW: $format\n", @_;
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
30} 50}
31 51
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
53our $httpevent = new Coro::Signal;
33 54
34our $wait_factor = 0.95; 55our $queue_file = new transferqueue slots => $MAX_TRANSFERS, maxsize => 256*1024*1024;
35 56our $queue_index = new transferqueue slots => 10;
36our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39);
40 57
41my @newcons; 58my @newcons;
42my @pool; 59my @pool;
43 60
44# one "execution thread" 61# one "execution thread"
… …
47 if (@newcons) { 64 if (@newcons) {
48 eval { 65 eval {
49 conn->new(@{pop @newcons})->handle; 66 conn->new(@{pop @newcons})->handle;
50 }; 67 };
51 slog 1, "$@" if $@ && !ref $@; 68 slog 1, "$@" if $@ && !ref $@;
69
70 $httpevent->broadcast; # only for testing, but doesn't matter much
71
52 $connections->up; 72 $connections->up;
53 } else { 73 } else {
54 last if @pool >= $MAX_POOL; 74 last if @pool >= $MAX_POOL;
55 push @pool, $Coro::current; 75 push @pool, $Coro::current;
56 schedule; 76 schedule;
… …
87 Listen => 50, 107 Listen => 50,
88 or die "unable to start server"; 108 or die "unable to start server";
89 109
90listen_on $http_port; 110listen_on $http_port;
91 111
112if ($SERVER_PORT2) {
92my $http_port = new Coro::Socket 113 my $http_port = new Coro::Socket
93 LocalAddr => $SERVER_HOST, 114 LocalAddr => $SERVER_HOST,
94 LocalPort => $SERVER_PORT2, 115 LocalPort => $SERVER_PORT2,
95 ReuseAddr => 1, 116 ReuseAddr => 1,
96 Listen => 50, 117 Listen => 50,
97 or die "unable to start server"; 118 or die "unable to start server";
98 119
99listen_on $http_port; 120 listen_on $http_port;
100 121}
101our $NOW;
102our $HTTP_NOW;
103
104Event->timer(interval => 1, hard => 1, cb => sub {
105 $NOW = time;
106 $HTTP_NOW = time2str $NOW;
107})->now;
108 122
109package conn; 123package conn;
110 124
111use Socket; 125use Socket;
112use HTTP::Date; 126use HTTP::Date;
… …
139 153
140read_mimetypes; 154read_mimetypes;
141 155
142sub new { 156sub new {
143 my $class = shift; 157 my $class = shift;
158 my $fh = shift;
144 my $peername = shift; 159 my $peername = shift;
145 my $fh = shift;
146 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
147 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
148 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
149 163
164 $self->{remote_addr} =
150 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
166
151 $self->{time} = $::NOW; 167 $self->{time} = $::NOW;
152 168
169 weaken ($Coro::current->{conn} = $self);
170
153 $::conns++; 171 $::conns++;
172 $::maxconns = $::conns if $::conns > $::maxconns;
154 173
155 $self; 174 $self;
156} 175}
157 176
158sub DESTROY { 177sub DESTROY {
159 my $self = shift; 178 #my $self = shift;
160 $::conns--; 179 $::conns--;
161 $self->eoconn;
162}
163
164# end of connection
165sub eoconn {
166 my $self = shift;
167
168 # clean up hints
169 delete $conn{$self->{remote_id}}{$self*1};
170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
171} 180}
172 181
173sub slog { 182sub slog {
174 my $self = shift; 183 my $self = shift;
175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
176} 185}
177 186
178sub response { 187sub response {
179 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
180 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
181 190
182 $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 }
183 204
184 $res .= "Date: $HTTP_NOW\015\012"; 205 $res .= "Date: $HTTP_NOW\015\012";
185 206
186 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
187 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
188 } 209 }
189 $res .= "\015\012"; 210 $res .= "\015\012";
190 211
191 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
192 213
193 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";
194 217
195 print $accesslog $log if $accesslog; 218 print $accesslog $log if $accesslog;
196 print STDERR $log; 219 print STDERR $log;
197 220
198 $self->{written} += 221 $self->{written} +=
… …
282 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 305 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
283 } 306 }
284 307
285 $self->{remote_id} = $id; 308 $self->{remote_id} = $id;
286 309
310 weaken (local $conn{$id}{$self*1} = $self);
311
287 if ($blocked{$id}) { 312 if ($blocked{$id}) {
288 $self->err_blocked($blocked{$id}) 313 $self->err_blocked
289 if $blocked{$id} > $::NOW; 314 if $blocked{$id}[0] > $::NOW;
290 315
291 delete $blocked{$id}; 316 delete $blocked{$id};
292 }
293
294 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
295 my $delay = $::PER_TIMEOUT + 15;
296 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 if ($delay <= 0) {
298 $self->slog(2, "blocked ip $id");
299 $self->err_blocked;
300 } else {
301 Coro::Event::do_timer(after => 4); $delay -= 4;
302 }
303 }
304 } 317 }
305 318
306 # find out server name and port 319 # find out server name and port
307 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 320 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
308 $host = $1; 321 $host = $1;
… …
312 325
313 if (defined $host) { 326 if (defined $host) {
314 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 327 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
315 } else { 328 } else {
316 ($self->{server_port}, $host) 329 ($self->{server_port}, $host)
317 = unpack_sockaddr_in $self->{fh}->getsockname 330 = unpack_sockaddr_in $self->{fh}->sockname
318 or $self->err(500, "unable to get socket name"); 331 or $self->err(500, "unable to get socket name");
319 $host = inet_ntoa $host; 332 $host = inet_ntoa $host;
320 } 333 }
321 334
322 $self->{server_name} = $host; 335 $self->{server_name} = $host;
323 336
324 # enter ourselves into various lists
325 weaken ($conn{$id}{$self*1} = $self);
326 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 337 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
327 338
328 eval { 339 eval {
329 $self->map_uri; 340 $self->map_uri;
330 $self->respond; 341 $self->respond;
331 }; 342 };
332 343
333 $self->eoconn;
334
335 die if $@ && !ref $@; 344 die if $@ && !ref $@;
336 345
337 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 346 last if $self->{h}{connection} =~ /close/i;
347
348 $httpevent->broadcast;
338 349
339 $fh->timeout($::PER_TIMEOUT); 350 $fh->timeout($::PER_TIMEOUT);
340 } 351 }
352}
353
354sub block {
355 my $self = shift;
356
357 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
358 $self->slog(2, "blocked ip $self->{remote_id}");
359 $self->err_blocked;
341} 360}
342 361
343# uri => path mapping 362# uri => path mapping
344sub map_uri { 363sub map_uri {
345 my $self = shift; 364 my $self = shift;
… …
392 411
393sub respond { 412sub respond {
394 my $self = shift; 413 my $self = shift;
395 my $path = $self->{path}; 414 my $path = $self->{path};
396 415
397 stat $path 416 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
398 or $self->err(404, "not found"); 417 if ($::internal{$1}) {
399 418 $::internal{$1}->($self);
400 $self->{stat} = [stat _];
401
402 # idiotic netscape sends idiotic headers AGAIN
403 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
404 ? str2time $1 : 0;
405
406 if (-d _ && -r _) {
407 # directory
408 if ($path !~ /\/$/) {
409 # create a redirect to get the trailing "/"
410 # we don't try to avoid the :80
411 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
412 } else { 419 } else {
413 $ims < $self->{stat}[9] 420 $self->err(404, "not found");
421 }
422 } else {
423
424 stat $path
414 or $self->err(304, "not modified"); 425 or $self->err(404, "not found");
415 426
416 if (-r "$path/index.html") { 427 $self->{stat} = [stat _];
417 $self->{path} .= "/index.html"; 428
418 $self->handle_file; 429 # idiotic netscape sends idiotic headers AGAIN
430 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
431 ? str2time $1 : 0;
432
433 if (-d _ && -r _) {
434 # directory
435 if ($path !~ /\/$/) {
436 # create a redirect to get the trailing "/"
437 # we don't try to avoid the :80
438 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
419 } else { 439 } else {
440 $ims < $self->{stat}[9]
441 or $self->err(304, "not modified");
442
443 if (-r "$path/index.html") {
444 # replace directory "size" by index.html filesize
445 $self->{stat} = [stat ($self->{path} .= "/index.html")];
446 $self->handle_file($queue_index);
447 } else {
420 $self->handle_dir; 448 $self->handle_dir;
421 } 449 }
422 } 450 }
423 } elsif (-f _ && -r _) { 451 } elsif (-f _ && -r _) {
424 -x _ and $self->err(403, "forbidden"); 452 -x _ and $self->err(403, "forbidden");
453
454 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
455 my $timeout = $::NOW + 10;
456 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
457 if ($timeout < $::NOW) {
458 $self->block($::BLOCKTIME, "too many connections");
459 } else {
460 $httpevent->wait;
461 }
462 }
463 }
464
425 $self->handle_file; 465 $self->handle_file($queue_file);
426 } else { 466 } else {
427 $self->err(404, "not found"); 467 $self->err(404, "not found");
468 }
428 } 469 }
429} 470}
430 471
431sub handle_dir { 472sub handle_dir {
432 my $self = shift; 473 my $self = shift;
… …
434 475
435 $self->response(200, "ok", 476 $self->response(200, "ok",
436 { 477 {
437 "Content-Type" => "text/html", 478 "Content-Type" => "text/html",
438 "Content-Length" => length $idx, 479 "Content-Length" => length $idx,
480 "Last-Modified" => time2str ($self->{stat}[9]),
439 }, 481 },
440 $idx); 482 $idx);
441} 483}
442 484
443sub handle_file { 485sub handle_file {
444 my $self = shift; 486 my ($self, $queue) = @_;
445 my $length = $self->{stat}[7]; 487 my $length = $self->{stat}[7];
446 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
447 my $hdr = { 488 my $hdr = {
448 "Last-Modified" => time2str ((stat _)[9]), 489 "Last-Modified" => time2str ((stat _)[9]),
449 }; 490 };
450 491
451 my @code = (200, "ok"); 492 my @code = (200, "ok");
… …
468 $self->err(416, "not satisfiable", $hdr, ""); 509 $self->err(416, "not satisfiable", $hdr, "");
469 510
470satisfiable: 511satisfiable:
471 # check for segmented downloads 512 # check for segmented downloads
472 if ($l && $::NO_SEGMENTED) { 513 if ($l && $::NO_SEGMENTED) {
473 my $delay = $::PER_TIMEOUT + 15; 514 my $timeout = $::NOW + 15;
474 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 515 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
475 if ($delay <= 0) { 516 if ($timeout <= $::NOW) {
517 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
476 $self->err_segmented_download; 518 #$self->err_segmented_download;
477 } else { 519 } else {
478 Coro::Event::do_timer(after => 4); $delay -= 4; 520 $httpevent->wait;
479 } 521 }
480 } 522 }
481 } 523 }
482 524
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 525 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
496 $self->response(@code, $hdr, ""); 538 $self->response(@code, $hdr, "");
497 539
498 if ($self->{method} eq "GET") { 540 if ($self->{method} eq "GET") {
499 $self->{time} = $::NOW; 541 $self->{time} = $::NOW;
500 542
501 my $fudge = $queue->[0]->waiters; 543 my $current = $Coro::current;
502 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
503
504 $queue->[1] *= $fudge;
505 my $transfer = $queue->[0]->guard;
506
507 if ($fudge != 1) {
508 $queue->[1] /= $fudge;
509 $queue->[1] = $queue->[1] * $::wait_factor
510 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
511 }
512 $self->{time} = $::NOW;
513
514 $self->{fh}->writable or return;
515 544
516 my ($fh, $buf, $r); 545 my ($fh, $buf, $r);
517 my $current = $Coro::current; 546
518 open $fh, "<", $self->{path} 547 open $fh, "<", $self->{path}
519 or die "$self->{path}: late open failure ($!)"; 548 or die "$self->{path}: late open failure ($!)";
520 549
521 $h -= $l - 1; 550 $h -= $l - 1;
522 551
523 if (0) { 552 if (0) { # !AIO
524 if ($l) { 553 if ($l) {
525 sysseek $fh, $l, 0; 554 sysseek $fh, $l, 0;
526 } 555 }
527 } 556 }
557
558 my $transfer = $queue->start_transfer($h);
559 my $locked;
560 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
528 561
529 while ($h > 0) { 562 while ($h > 0) {
563 unless ($locked) {
564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
565 $bufsize = $::BUFSIZE;
566 $self->{time} = $::NOW;
567 }
568 }
569
570 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close";
572 die bless {}, err::;
573 }
574
530 if (0) { 575 if (0) { # !AIO
531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
532 or last; 577 or last;
533 } else { 578 } else {
534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 579 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
535 $buf, 0, sub { 580 $buf, 0, sub {
536 $r = $_[0]; 581 $r = $_[0];
537 Coro::ready($current); 582 Coro::ready($current);
538 }); 583 });
539 &Coro::schedule; 584 &Coro::schedule;

Diff Legend

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