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.41 by root, Mon Sep 10 22:16:20 2001 UTC vs.
Revision 1.58 by root, Mon Dec 3 21:32:35 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
… …
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 $MAX_TRANSFERS;
35 56our $queue_index = new transferqueue 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;
… …
98 or die "unable to start server"; 118 or die "unable to start server";
99 119
100 listen_on $http_port; 120 listen_on $http_port;
101} 121}
102 122
103our $NOW;
104our $HTTP_NOW;
105
106Event->timer(interval => 1, hard => 1, cb => sub {
107 $NOW = time;
108 $HTTP_NOW = time2str $NOW;
109})->now;
110
111package conn; 123package conn;
112 124
113use Socket; 125use Socket;
114use HTTP::Date; 126use HTTP::Date;
115use Convert::Scalar 'weaken'; 127use Convert::Scalar 'weaken';
… …
141 153
142read_mimetypes; 154read_mimetypes;
143 155
144sub new { 156sub new {
145 my $class = shift; 157 my $class = shift;
158 my $fh = shift;
146 my $peername = shift; 159 my $peername = shift;
147 my $fh = shift;
148 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
149 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
150 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
151 163
164 $self->{remote_addr} =
152 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
153 $self->{time} = $::NOW; 166 $self->{time} = $::NOW;
154 167
168 weaken ($Coro::current->{conn} = $self);
169
155 $::conns++; 170 $::conns++;
171 $::maxconns = $::conns if $::conns > $::maxconns;
156 172
157 $self; 173 $self;
158} 174}
159 175
160sub DESTROY { 176sub DESTROY {
161 my $self = shift; 177 #my $self = shift;
162 $::conns--; 178 $::conns--;
163 $self->eoconn;
164}
165
166# end of connection
167sub eoconn {
168 my $self = shift;
169
170 # clean up hints
171 delete $conn{$self->{remote_id}}{$self*1};
172 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
173} 179}
174 180
175sub slog { 181sub slog {
176 my $self = shift; 182 my $self = shift;
177 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 183 main::slog($_[0], "$self->{remote_id}> $_[1]");
178} 184}
179 185
180sub response { 186sub response {
181 my ($self, $code, $msg, $hdr, $content) = @_; 187 my ($self, $code, $msg, $hdr, $content) = @_;
182 my $res = "HTTP/1.1 $code $msg\015\012"; 188 my $res = "HTTP/1.1 $code $msg\015\012";
183 189
184 $self->{h}{connection} ||= $hdr->{Connection}; 190 if (exists $hdr->{Connection}) {
191 if ($hdr->{Connection} =~ /close/) {
192 $self->{h}{connection} = "close"
193 }
194 } else {
195 if ($self->{version} < 1.1) {
196 if ($self->{h}{connection} =~ /keep-alive/i) {
197 $hdr->{Connection} = "Keep-Alive";
198 } else {
199 $self->{h}{connection} = "close"
200 }
201 }
202 }
185 203
186 $res .= "Date: $HTTP_NOW\015\012"; 204 $res .= "Date: $HTTP_NOW\015\012";
187 205
188 while (my ($h, $v) = each %$hdr) { 206 while (my ($h, $v) = each %$hdr) {
189 $res .= "$h: $v\015\012" 207 $res .= "$h: $v\015\012"
190 } 208 }
191 $res .= "\015\012"; 209 $res .= "\015\012";
192 210
193 $res .= $content if defined $content and $self->{method} ne "HEAD"; 211 $res .= $content if defined $content and $self->{method} ne "HEAD";
194 212
195 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 213 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
214 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
215 " \"$self->{h}{referer}\"\n";
196 216
197 print $accesslog $log if $accesslog; 217 print $accesslog $log if $accesslog;
198 print STDERR $log; 218 print STDERR $log;
199 219
200 $self->{written} += 220 $self->{written} +=
… …
284 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 304 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
285 } 305 }
286 306
287 $self->{remote_id} = $id; 307 $self->{remote_id} = $id;
288 308
309 weaken (local $conn{$id}{$self*1} = $self);
310
289 if ($blocked{$id}) { 311 if ($blocked{$id}) {
290 $self->err_blocked($blocked{$id}) 312 $self->err_blocked
291 if $blocked{$id} > $::NOW; 313 if $blocked{$id}[0] > $::NOW;
292 314
293 delete $blocked{$id}; 315 delete $blocked{$id};
294 }
295
296 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 my $delay = $::PER_TIMEOUT + 15;
298 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
299 if ($delay <= 0) {
300 $self->slog(2, "blocked ip $id");
301 $self->err_blocked;
302 } else {
303 Coro::Event::do_timer(after => 4); $delay -= 4;
304 }
305 }
306 } 316 }
307 317
308 # find out server name and port 318 # find out server name and port
309 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 319 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
310 $host = $1; 320 $host = $1;
… …
314 324
315 if (defined $host) { 325 if (defined $host) {
316 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 326 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
317 } else { 327 } else {
318 ($self->{server_port}, $host) 328 ($self->{server_port}, $host)
319 = unpack_sockaddr_in $self->{fh}->getsockname 329 = unpack_sockaddr_in $self->{fh}->sockname
320 or $self->err(500, "unable to get socket name"); 330 or $self->err(500, "unable to get socket name");
321 $host = inet_ntoa $host; 331 $host = inet_ntoa $host;
322 } 332 }
323 333
324 $self->{server_name} = $host; 334 $self->{server_name} = $host;
325 335
326 # enter ourselves into various lists
327 weaken ($conn{$id}{$self*1} = $self);
328 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 336 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
329 337
330 eval { 338 eval {
331 $self->map_uri; 339 $self->map_uri;
332 $self->respond; 340 $self->respond;
333 }; 341 };
334 342
335 $self->eoconn;
336
337 die if $@ && !ref $@; 343 die if $@ && !ref $@;
338 344
339 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 345 last if $self->{h}{connection} =~ /close/i;
346
347 $httpevent->broadcast;
340 348
341 $fh->timeout($::PER_TIMEOUT); 349 $fh->timeout($::PER_TIMEOUT);
342 } 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;
343} 359}
344 360
345# uri => path mapping 361# uri => path mapping
346sub map_uri { 362sub map_uri {
347 my $self = shift; 363 my $self = shift;
… …
394 410
395sub respond { 411sub respond {
396 my $self = shift; 412 my $self = shift;
397 my $path = $self->{path}; 413 my $path = $self->{path};
398 414
399 stat $path 415 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
400 or $self->err(404, "not found"); 416 if ($::internal{$1}) {
401 417 $::internal{$1}->($self);
402 $self->{stat} = [stat _];
403
404 # idiotic netscape sends idiotic headers AGAIN
405 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
406 ? str2time $1 : 0;
407
408 if (-d _ && -r _) {
409 # directory
410 if ($path !~ /\/$/) {
411 # create a redirect to get the trailing "/"
412 # we don't try to avoid the :80
413 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
414 } else { 418 } else {
415 $ims < $self->{stat}[9] 419 $self->err(404, "not found");
420 }
421 } else {
422
423 stat $path
416 or $self->err(304, "not modified"); 424 or $self->err(404, "not found");
417 425
418 if (-r "$path/index.html") { 426 $self->{stat} = [stat _];
419 $self->{path} .= "/index.html"; 427
420 $self->handle_file; 428 # idiotic netscape sends idiotic headers AGAIN
429 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
430 ? str2time $1 : 0;
431
432 if (-d _ && -r _) {
433 # directory
434 if ($path !~ /\/$/) {
435 # create a redirect to get the trailing "/"
436 # we don't try to avoid the :80
437 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
421 } else { 438 } else {
439 $ims < $self->{stat}[9]
440 or $self->err(304, "not modified");
441
442 if (-r "$path/index.html") {
443 # replace directory "size" by index.html filesize
444 $self->{stat} = [stat ($self->{path} .= "/index.html")];
445 $self->handle_file($queue_index);
446 } else {
422 $self->handle_dir; 447 $self->handle_dir;
423 } 448 }
424 } 449 }
425 } elsif (-f _ && -r _) { 450 } elsif (-f _ && -r _) {
426 -x _ and $self->err(403, "forbidden"); 451 -x _ and $self->err(403, "forbidden");
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
427 $self->handle_file; 464 $self->handle_file($queue_file);
428 } else { 465 } else {
429 $self->err(404, "not found"); 466 $self->err(404, "not found");
467 }
430 } 468 }
431} 469}
432 470
433sub handle_dir { 471sub handle_dir {
434 my $self = shift; 472 my $self = shift;
… …
436 474
437 $self->response(200, "ok", 475 $self->response(200, "ok",
438 { 476 {
439 "Content-Type" => "text/html", 477 "Content-Type" => "text/html",
440 "Content-Length" => length $idx, 478 "Content-Length" => length $idx,
479 "Last-Modified" => time2str ($self->{stat}[9]),
441 }, 480 },
442 $idx); 481 $idx);
443} 482}
444 483
445sub handle_file { 484sub handle_file {
446 my $self = shift; 485 my ($self, $queue) = @_;
447 my $length = $self->{stat}[7]; 486 my $length = $self->{stat}[7];
448 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
449 my $hdr = { 487 my $hdr = {
450 "Last-Modified" => time2str ((stat _)[9]), 488 "Last-Modified" => time2str ((stat _)[9]),
451 }; 489 };
452 490
453 my @code = (200, "ok"); 491 my @code = (200, "ok");
… …
470 $self->err(416, "not satisfiable", $hdr, ""); 508 $self->err(416, "not satisfiable", $hdr, "");
471 509
472satisfiable: 510satisfiable:
473 # check for segmented downloads 511 # check for segmented downloads
474 if ($l && $::NO_SEGMENTED) { 512 if ($l && $::NO_SEGMENTED) {
475 my $delay = $::PER_TIMEOUT + 15; 513 my $timeout = $::NOW + 15;
476 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 514 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
477 if ($delay <= 0) { 515 if ($timeout <= $::NOW) {
516 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
478 $self->err_segmented_download; 517 #$self->err_segmented_download;
479 } else { 518 } else {
480 Coro::Event::do_timer(after => 4); $delay -= 4; 519 $httpevent->wait;
481 } 520 }
482 } 521 }
483 } 522 }
484 523
485 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 524 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
498 $self->response(@code, $hdr, ""); 537 $self->response(@code, $hdr, "");
499 538
500 if ($self->{method} eq "GET") { 539 if ($self->{method} eq "GET") {
501 $self->{time} = $::NOW; 540 $self->{time} = $::NOW;
502 541
503 my $fudge = $queue->[0]->waiters; 542 my $current = $Coro::current;
504 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
505
506 $queue->[1] *= $fudge;
507 my $transfer = $queue->[0]->guard;
508
509 if ($fudge != 1) {
510 $queue->[1] /= $fudge;
511 $queue->[1] = $queue->[1] * $::wait_factor
512 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
513 }
514 $self->{time} = $::NOW;
515
516 $self->{fh}->writable or return;
517 543
518 my ($fh, $buf, $r); 544 my ($fh, $buf, $r);
519 my $current = $Coro::current; 545
520 open $fh, "<", $self->{path} 546 open $fh, "<", $self->{path}
521 or die "$self->{path}: late open failure ($!)"; 547 or die "$self->{path}: late open failure ($!)";
522 548
523 $h -= $l - 1; 549 $h -= $l - 1;
524 550
525 if (0) { 551 if (0) { # !AIO
526 if ($l) { 552 if ($l) {
527 sysseek $fh, $l, 0; 553 sysseek $fh, $l, 0;
528 } 554 }
529 } 555 }
556
557 my $transfer = $queue->start_transfer($h);
558 my $locked;
559 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
530 560
531 while ($h > 0) { 561 while ($h > 0) {
562 unless ($locked) {
563 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
564 $bufsize = $::BUFSIZE;
565 $self->{time} = $::NOW;
566 }
567 }
568
569 if ($blocked{$self->{remote_id}}) {
570 $self->{h}{connection} = "close";
571 die bless {}, err::
572 }
573
532 if (0) { 574 if (0) { # !AIO
533 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 575 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
534 or last; 576 or last;
535 } else { 577 } else {
536 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 578 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
537 $buf, 0, sub { 579 $buf, 0, sub {
538 $r = $_[0]; 580 $r = $_[0];
539 Coro::ready($current); 581 Coro::ready($current);
540 }); 582 });
541 &Coro::schedule; 583 &Coro::schedule;

Diff Legend

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