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.52 by root, Fri Nov 30 05:11:23 2001 UTC vs.
Revision 1.59 by root, Wed Dec 5 02:02:23 2001 UTC

… …
15# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
16 16
17$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
18 18
19our $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}
20 36
21if ($ACCESS_LOG) { 37if ($ACCESS_LOG) {
22 use IO::Handle; 38 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 39 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 40 or die "$ACCESS_LOG: $!";
… …
26} 42}
27 43
28sub slog { 44sub slog {
29 my $level = shift; 45 my $level = shift;
30 my $format = shift; 46 my $format = shift;
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 48 printf "$NOW: $format\n", @_;
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 50}
33 51
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal; 53our $httpevent = new Coro::Signal;
36 54
37our $wait_factor = 0.95;
38
39our $queue_small = new transferqueue $MAX_TRANSFERS_SMALL;
40our $queue_large = new transferqueue $MAX_TRANSFERS_LARGE; 55our $queue_file = new transferqueue $MAX_TRANSFERS;
41our $queue_index = new transferqueue 5; 56our $queue_index = new transferqueue 10;
42 57
43my @newcons; 58my @newcons;
44my @pool; 59my @pool;
45 60
46# one "execution thread" 61# one "execution thread"
… …
49 if (@newcons) { 64 if (@newcons) {
50 eval { 65 eval {
51 conn->new(@{pop @newcons})->handle; 66 conn->new(@{pop @newcons})->handle;
52 }; 67 };
53 slog 1, "$@" if $@ && !ref $@; 68 slog 1, "$@" if $@ && !ref $@;
69
70 $httpevent->broadcast; # only for testing, but doesn't matter much
71
54 $connections->up; 72 $connections->up;
55 } else { 73 } else {
56 last if @pool >= $MAX_POOL; 74 last if @pool >= $MAX_POOL;
57 push @pool, $Coro::current; 75 push @pool, $Coro::current;
58 schedule; 76 schedule;
… …
100 or die "unable to start server"; 118 or die "unable to start server";
101 119
102 listen_on $http_port; 120 listen_on $http_port;
103} 121}
104 122
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; 123package conn;
114 124
115use Socket; 125use Socket;
116use HTTP::Date; 126use HTTP::Date;
117use Convert::Scalar 'weaken'; 127use Convert::Scalar 'weaken';
… …
156 $self->{time} = $::NOW; 166 $self->{time} = $::NOW;
157 167
158 weaken ($Coro::current->{conn} = $self); 168 weaken ($Coro::current->{conn} = $self);
159 169
160 $::conns++; 170 $::conns++;
171 $::maxconns = $::conns if $::conns > $::maxconns;
161 172
162 $self; 173 $self;
163} 174}
164 175
165sub DESTROY { 176sub DESTROY {
166 my $self = shift; 177 #my $self = shift;
167 $::conns--; 178 $::conns--;
168 $self->eoconn;
169}
170
171# end of connection
172sub eoconn {
173 my $self = shift;
174
175 # clean up hints
176 delete $conn{$self->{remote_id}}{$self*1};
177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
180} 179}
181 180
182sub slog { 181sub slog {
183 my $self = shift; 182 my $self = shift;
184 main::slog($_[0], "$self->{remote_id}> $_[1]"); 183 main::slog($_[0], "$self->{remote_id}> $_[1]");
… …
305 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 304 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
306 } 305 }
307 306
308 $self->{remote_id} = $id; 307 $self->{remote_id} = $id;
309 308
309 weaken (local $conn{$id}{$self*1} = $self);
310
310 if ($blocked{$id}) { 311 if ($blocked{$id}) {
311 $self->err_blocked($blocked{$id}) 312 $self->err_blocked
312 if $blocked{$id} > $::NOW; 313 if $blocked{$id}[0] > $::NOW;
313 314
314 delete $blocked{$id}; 315 delete $blocked{$id};
315 }
316
317 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
318 my $delay = $::PER_TIMEOUT + $::NOW + 15;
319 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
320 if ($delay < $::NOW) {
321 $self->slog(2, "blocked ip $id");
322 $self->err_blocked;
323 } else {
324 $httpevent->wait;
325 }
326 }
327 } 316 }
328 317
329 # find out server name and port 318 # find out server name and port
330 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 319 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
331 $host = $1; 320 $host = $1;
… …
342 $host = inet_ntoa $host; 331 $host = inet_ntoa $host;
343 } 332 }
344 333
345 $self->{server_name} = $host; 334 $self->{server_name} = $host;
346 335
347 # enter ourselves into various lists
348 weaken ($conn{$id}{$self*1} = $self);
349 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 336 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
350 337
351 eval { 338 eval {
352 $self->map_uri; 339 $self->map_uri;
353 $self->respond; 340 $self->respond;
354 }; 341 };
355 342
356 $self->eoconn;
357
358 die if $@ && !ref $@; 343 die if $@ && !ref $@;
359 344
360 last if $self->{h}{connection} =~ /close/; 345 last if $self->{h}{connection} =~ /close/i;
361 346
362 $httpevent->broadcast; 347 $httpevent->broadcast;
363 348
364 $fh->timeout($::PER_TIMEOUT); 349 $fh->timeout($::PER_TIMEOUT);
365 } 350 }
351}
352
353sub block {
354 my $self = shift;
355
356 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
357 $self->slog(2, "blocked ip $self->{remote_id}");
358 $self->err_blocked;
366} 359}
367 360
368# uri => path mapping 361# uri => path mapping
369sub map_uri { 362sub map_uri {
370 my $self = shift; 363 my $self = shift;
… …
446 $ims < $self->{stat}[9] 439 $ims < $self->{stat}[9]
447 or $self->err(304, "not modified"); 440 or $self->err(304, "not modified");
448 441
449 if (-r "$path/index.html") { 442 if (-r "$path/index.html") {
450 # replace directory "size" by index.html filesize 443 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 444 $self->{stat} = [stat ($self->{path} .= "/index.html")];
452 $self->handle_file($queue_index); 445 $self->handle_file($queue_index);
453 } else { 446 } else {
454 $self->handle_dir; 447 $self->handle_dir;
455 } 448 }
456 } 449 }
457 } elsif (-f _ && -r _) { 450 } elsif (-f _ && -r _) {
458 -x _ and $self->err(403, "forbidden"); 451 -x _ and $self->err(403, "forbidden");
459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small); 452
453 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
454 my $timeout = $::NOW + 10;
455 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
456 if ($timeout < $::NOW) {
457 $self->block($::BLOCKTIME, "too many connections");
458 } else {
459 $httpevent->wait;
460 }
461 }
462 }
463
464 $self->handle_file($queue_file);
460 } else { 465 } else {
461 $self->err(404, "not found"); 466 $self->err(404, "not found");
462 } 467 }
463 } 468 }
464} 469}
… …
469 474
470 $self->response(200, "ok", 475 $self->response(200, "ok",
471 { 476 {
472 "Content-Type" => "text/html", 477 "Content-Type" => "text/html",
473 "Content-Length" => length $idx, 478 "Content-Length" => length $idx,
474 #d# directories change all the time, so X-
475 "X-Last-Modified" => time2str ((stat _)[9]), 479 "Last-Modified" => time2str ($self->{stat}[9]),
476 }, 480 },
477 $idx); 481 $idx);
478} 482}
479 483
480sub handle_file { 484sub handle_file {
… …
504 $self->err(416, "not satisfiable", $hdr, ""); 508 $self->err(416, "not satisfiable", $hdr, "");
505 509
506satisfiable: 510satisfiable:
507 # check for segmented downloads 511 # check for segmented downloads
508 if ($l && $::NO_SEGMENTED) { 512 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15; 513 my $timeout = $::NOW + 15;
510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 514 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
511 if ($delay <= $::NOW) { 515 if ($timeout <= $::NOW) {
516 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
512 $self->err_segmented_download; 517 #$self->err_segmented_download;
513 } else { 518 } else {
514 $httpevent->wait; 519 $httpevent->wait;
515 } 520 }
516 } 521 }
517 } 522 }
… …
547 if ($l) { 552 if ($l) {
548 sysseek $fh, $l, 0; 553 sysseek $fh, $l, 0;
549 } 554 }
550 } 555 }
551 556
552 my $transfer = $queue->start_transfer; 557 my $transfer = $queue->start_transfer($h);
553 my $locked; 558 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 559 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
555 560
556 while ($h > 0) { 561 while ($h > 0) {
557 unless ($locked) { 562 unless ($locked) {
558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 563 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE; 564 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW; 565 $self->{time} = $::NOW;
561 } 566 }
567 }
568
569 if ($blocked{$self->{remote_id}}) {
570 $self->{h}{connection} = "close";
571 die bless {}, err::;
562 } 572 }
563 573
564 if (0) { # !AIO 574 if (0) { # !AIO
565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 575 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
566 or last; 576 or last;

Diff Legend

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