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.45 by root, Sun Nov 11 03:32:19 2001 UTC vs.
Revision 1.62 by root, Sun Jan 6 05:29:39 2002 UTC

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

Diff Legend

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