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.39 by root, Sun Sep 2 12:23:04 2001 UTC vs.
Revision 1.59 by root, Wed Dec 5 02:02:23 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;
57 } 77 }
58 } 78 }
79}
80
81sub listen_on {
82 my $listen = $_[0];
83
84 push @listen_sockets, $listen;
85
86 # the "main thread"
87 async {
88 slog 1, "accepting connections";
89 while () {
90 $connections->down;
91 push @newcons, [$listen->accept];
92 #slog 3, "accepted @$connections ".scalar(@pool);
93 if (@pool) {
94 (pop @pool)->ready;
95 } else {
96 async \&handler;
97 }
98
99 }
100 };
59} 101}
60 102
61my $http_port = new Coro::Socket 103my $http_port = new Coro::Socket
62 LocalAddr => $SERVER_HOST, 104 LocalAddr => $SERVER_HOST,
63 LocalPort => $SERVER_PORT, 105 LocalPort => $SERVER_PORT,
64 ReuseAddr => 1, 106 ReuseAddr => 1,
65 Listen => 50, 107 Listen => 50,
66 or die "unable to start server"; 108 or die "unable to start server";
67 109
68push @listen_sockets, $http_port; 110listen_on $http_port;
69 111
70our $NOW; 112if ($SERVER_PORT2) {
71our $HTTP_NOW; 113 my $http_port = new Coro::Socket
114 LocalAddr => $SERVER_HOST,
115 LocalPort => $SERVER_PORT2,
116 ReuseAddr => 1,
117 Listen => 50,
118 or die "unable to start server";
72 119
73Event->timer(interval => 1, hard => 1, cb => sub { 120 listen_on $http_port;
74 $NOW = time; 121}
75 $HTTP_NOW = time2str $NOW;
76})->now;
77
78# the "main thread"
79async {
80 slog 1, "accepting connections";
81 while () {
82 $connections->down;
83 push @newcons, [$http_port->accept];
84 #slog 3, "accepted @$connections ".scalar(@pool);
85 if (@pool) {
86 (pop @pool)->ready;
87 } else {
88 async \&handler;
89 }
90
91 }
92};
93 122
94package conn; 123package conn;
95 124
96use Socket; 125use Socket;
97use HTTP::Date; 126use HTTP::Date;
… …
124 153
125read_mimetypes; 154read_mimetypes;
126 155
127sub new { 156sub new {
128 my $class = shift; 157 my $class = shift;
158 my $fh = shift;
129 my $peername = shift; 159 my $peername = shift;
130 my $fh = shift;
131 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
132 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
133 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
134 163
164 $self->{remote_addr} =
135 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
136 $self->{time} = $::NOW; 166 $self->{time} = $::NOW;
137 167
168 weaken ($Coro::current->{conn} = $self);
169
138 $::conns++; 170 $::conns++;
171 $::maxconns = $::conns if $::conns > $::maxconns;
139 172
140 $self; 173 $self;
141} 174}
142 175
143sub DESTROY { 176sub DESTROY {
144 my $self = shift; 177 #my $self = shift;
145 $::conns--; 178 $::conns--;
146 $self->eoconn;
147}
148
149# end of connection
150sub eoconn {
151 my $self = shift;
152
153 # clean up hints
154 delete $conn{$self->{remote_id}}{$self*1};
155 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
156} 179}
157 180
158sub slog { 181sub slog {
159 my $self = shift; 182 my $self = shift;
160 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 183 main::slog($_[0], "$self->{remote_id}> $_[1]");
161} 184}
162 185
163sub response { 186sub response {
164 my ($self, $code, $msg, $hdr, $content) = @_; 187 my ($self, $code, $msg, $hdr, $content) = @_;
165 my $res = "HTTP/1.1 $code $msg\015\012"; 188 my $res = "HTTP/1.1 $code $msg\015\012";
166 189
167 $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 }
168 203
169 $res .= "Date: $HTTP_NOW\015\012"; 204 $res .= "Date: $HTTP_NOW\015\012";
170 205
171 while (my ($h, $v) = each %$hdr) { 206 while (my ($h, $v) = each %$hdr) {
172 $res .= "$h: $v\015\012" 207 $res .= "$h: $v\015\012"
173 } 208 }
174 $res .= "\015\012"; 209 $res .= "\015\012";
175 210
176 $res .= $content if defined $content and $self->{method} ne "HEAD"; 211 $res .= $content if defined $content and $self->{method} ne "HEAD";
177 212
178 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";
179 216
180 print $accesslog $log if $accesslog; 217 print $accesslog $log if $accesslog;
181 print STDERR $log; 218 print STDERR $log;
182 219
183 $self->{written} += 220 $self->{written} +=
… …
267 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 304 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
268 } 305 }
269 306
270 $self->{remote_id} = $id; 307 $self->{remote_id} = $id;
271 308
309 weaken (local $conn{$id}{$self*1} = $self);
310
272 if ($blocked{$id}) { 311 if ($blocked{$id}) {
273 $self->err_blocked($blocked{$id}) 312 $self->err_blocked
274 if $blocked{$id} > $::NOW; 313 if $blocked{$id}[0] > $::NOW;
275 314
276 delete $blocked{$id}; 315 delete $blocked{$id};
277 }
278
279 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
280 my $delay = $::PER_TIMEOUT + 15;
281 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
282 if ($delay <= 0) {
283 $self->slog(2, "blocked ip $id");
284 $self->err_blocked;
285 } else {
286 Coro::Event::do_timer(after => 4); $delay -= 4;
287 }
288 }
289 } 316 }
290 317
291 # find out server name and port 318 # find out server name and port
292 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 319 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
293 $host = $1; 320 $host = $1;
… …
297 324
298 if (defined $host) { 325 if (defined $host) {
299 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 326 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
300 } else { 327 } else {
301 ($self->{server_port}, $host) 328 ($self->{server_port}, $host)
302 = unpack_sockaddr_in $self->{fh}->getsockname 329 = unpack_sockaddr_in $self->{fh}->sockname
303 or $self->err(500, "unable to get socket name"); 330 or $self->err(500, "unable to get socket name");
304 $host = inet_ntoa $host; 331 $host = inet_ntoa $host;
305 } 332 }
306 333
307 $self->{server_name} = $host; 334 $self->{server_name} = $host;
308 335
309 # enter ourselves into various lists
310 weaken ($conn{$id}{$self*1} = $self);
311 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 336 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
312 337
313 eval { 338 eval {
314 $self->map_uri; 339 $self->map_uri;
315 $self->respond; 340 $self->respond;
316 }; 341 };
317 342
318 $self->eoconn;
319
320 die if $@ && !ref $@; 343 die if $@ && !ref $@;
321 344
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 345 last if $self->{h}{connection} =~ /close/i;
346
347 $httpevent->broadcast;
323 348
324 $fh->timeout($::PER_TIMEOUT); 349 $fh->timeout($::PER_TIMEOUT);
325 } 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;
326} 359}
327 360
328# uri => path mapping 361# uri => path mapping
329sub map_uri { 362sub map_uri {
330 my $self = shift; 363 my $self = shift;
… …
377 410
378sub respond { 411sub respond {
379 my $self = shift; 412 my $self = shift;
380 my $path = $self->{path}; 413 my $path = $self->{path};
381 414
382 stat $path 415 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
383 or $self->err(404, "not found"); 416 if ($::internal{$1}) {
384 417 $::internal{$1}->($self);
385 $self->{stat} = [stat _];
386
387 # idiotic netscape sends idiotic headers AGAIN
388 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
389 ? str2time $1 : 0;
390
391 if (-d _ && -r _) {
392 # directory
393 if ($path !~ /\/$/) {
394 # create a redirect to get the trailing "/"
395 # we don't try to avoid the :80
396 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
397 } else { 418 } else {
398 $ims < $self->{stat}[9] 419 $self->err(404, "not found");
420 }
421 } else {
422
423 stat $path
399 or $self->err(304, "not modified"); 424 or $self->err(404, "not found");
400 425
401 if (-r "$path/index.html") { 426 $self->{stat} = [stat _];
402 $self->{path} .= "/index.html"; 427
403 $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}/" });
404 } 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 {
405 $self->handle_dir; 447 $self->handle_dir;
406 } 448 }
407 } 449 }
408 } elsif (-f _ && -r _) { 450 } elsif (-f _ && -r _) {
409 -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
410 $self->handle_file; 464 $self->handle_file($queue_file);
411 } else { 465 } else {
412 $self->err(404, "not found"); 466 $self->err(404, "not found");
467 }
413 } 468 }
414} 469}
415 470
416sub handle_dir { 471sub handle_dir {
417 my $self = shift; 472 my $self = shift;
… …
419 474
420 $self->response(200, "ok", 475 $self->response(200, "ok",
421 { 476 {
422 "Content-Type" => "text/html", 477 "Content-Type" => "text/html",
423 "Content-Length" => length $idx, 478 "Content-Length" => length $idx,
479 "Last-Modified" => time2str ($self->{stat}[9]),
424 }, 480 },
425 $idx); 481 $idx);
426} 482}
427 483
428sub handle_file { 484sub handle_file {
429 my $self = shift; 485 my ($self, $queue) = @_;
430 my $length = $self->{stat}[7]; 486 my $length = $self->{stat}[7];
431 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
432 my $hdr = { 487 my $hdr = {
433 "Last-Modified" => time2str ((stat _)[9]), 488 "Last-Modified" => time2str ((stat _)[9]),
434 }; 489 };
435 490
436 my @code = (200, "ok"); 491 my @code = (200, "ok");
… …
453 $self->err(416, "not satisfiable", $hdr, ""); 508 $self->err(416, "not satisfiable", $hdr, "");
454 509
455satisfiable: 510satisfiable:
456 # check for segmented downloads 511 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 512 if ($l && $::NO_SEGMENTED) {
458 my $delay = $::PER_TIMEOUT + 15; 513 my $timeout = $::NOW + 15;
459 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 514 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 515 if ($timeout <= $::NOW) {
516 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
461 $self->err_segmented_download; 517 #$self->err_segmented_download;
462 } else { 518 } else {
463 Coro::Event::do_timer(after => 4); $delay -= 4; 519 $httpevent->wait;
464 } 520 }
465 } 521 }
466 } 522 }
467 523
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 524 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 $self->response(@code, $hdr, ""); 537 $self->response(@code, $hdr, "");
482 538
483 if ($self->{method} eq "GET") { 539 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 540 $self->{time} = $::NOW;
485 541
486 my $fudge = $queue->[0]->waiters; 542 my $current = $Coro::current;
487 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
488
489 $queue->[1] *= $fudge;
490 my $transfer = $queue->[0]->guard;
491
492 if ($fudge != 1) {
493 $queue->[1] /= $fudge;
494 $queue->[1] = $queue->[1] * $::wait_factor
495 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
496 }
497 $self->{time} = $::NOW;
498
499 $self->{fh}->writable or return;
500 543
501 my ($fh, $buf, $r); 544 my ($fh, $buf, $r);
502 my $current = $Coro::current; 545
503 open $fh, "<", $self->{path} 546 open $fh, "<", $self->{path}
504 or die "$self->{path}: late open failure ($!)"; 547 or die "$self->{path}: late open failure ($!)";
505 548
506 $h -= $l - 1; 549 $h -= $l - 1;
507 550
508 if (0) { 551 if (0) { # !AIO
509 if ($l) { 552 if ($l) {
510 sysseek $fh, $l, 0; 553 sysseek $fh, $l, 0;
511 } 554 }
512 } 555 }
556
557 my $transfer = $queue->start_transfer($h);
558 my $locked;
559 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
513 560
514 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
515 if (0) { 574 if (0) { # !AIO
516 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 575 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
517 or last; 576 or last;
518 } else { 577 } else {
519 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 578 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
520 $buf, 0, sub { 579 $buf, 0, sub {
521 $r = $_[0]; 580 $r = $_[0];
522 Coro::ready($current); 581 Coro::ready($current);
523 }); 582 });
524 &Coro::schedule; 583 &Coro::schedule;

Diff Legend

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