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.67 by root, Sun May 19 21:00:47 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 ();
9
10use Compress::Zlib ();
7 11
8no utf8; 12no utf8;
9use bytes; 13use bytes;
10 14
11# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
… …
13# and quite a bit slower than thttpd :( 17# and quite a bit slower than thttpd :(
14 18
15$SIG{PIPE} = 'IGNORE'; 19$SIG{PIPE} = 'IGNORE';
16 20
17our $accesslog; 21our $accesslog;
22our $errorlog;
23
24our $NOW;
25our $HTTP_NOW;
26
27Event->timer(interval => 1, hard => 1, cb => sub {
28 $NOW = time;
29 $HTTP_NOW = time2str $NOW;
30})->now;
31
32if ($ERROR_LOG) {
33 use IO::Handle;
34 open $errorlog, ">>$ERROR_LOG"
35 or die "$ERROR_LOG: $!";
36 $errorlog->autoflush(1);
37}
18 38
19if ($ACCESS_LOG) { 39if ($ACCESS_LOG) {
20 use IO::Handle; 40 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG" 41 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!"; 42 or die "$ACCESS_LOG: $!";
… …
24} 44}
25 45
26sub slog { 46sub slog {
27 my $level = shift; 47 my $level = shift;
28 my $format = shift; 48 my $format = shift;
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
29 printf "---: $format\n", @_; 50 printf "$NOW: $format\n", @_;
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
30} 52}
31 53
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
55our $httpevent = new Coro::Signal;
33 56
34our $wait_factor = 0.95; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10;
35 59
36our @transfers = ( 60our $tbf_top = new tbf rate => 200000;
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39);
40 61
41my @newcons; 62my @newcons;
42my @pool; 63my @pool;
43 64
44# one "execution thread" 65# one "execution thread"
… …
47 if (@newcons) { 68 if (@newcons) {
48 eval { 69 eval {
49 conn->new(@{pop @newcons})->handle; 70 conn->new(@{pop @newcons})->handle;
50 }; 71 };
51 slog 1, "$@" if $@ && !ref $@; 72 slog 1, "$@" if $@ && !ref $@;
73
74 $httpevent->broadcast; # only for testing, but doesn't matter much
75
52 $connections->up; 76 $connections->up;
53 } else { 77 } else {
54 last if @pool >= $MAX_POOL; 78 last if @pool >= $MAX_POOL;
55 push @pool, $Coro::current; 79 push @pool, $Coro::current;
56 schedule; 80 schedule;
57 } 81 }
58 } 82 }
83}
84
85sub listen_on {
86 my $listen = $_[0];
87
88 push @listen_sockets, $listen;
89
90 # the "main thread"
91 async {
92 slog 1, "accepting connections";
93 while () {
94 $connections->down;
95 push @newcons, [$listen->accept];
96 #slog 3, "accepted @$connections ".scalar(@pool);
97 if (@pool) {
98 (pop @pool)->ready;
99 } else {
100 async \&handler;
101 }
102
103 }
104 };
59} 105}
60 106
61my $http_port = new Coro::Socket 107my $http_port = new Coro::Socket
62 LocalAddr => $SERVER_HOST, 108 LocalAddr => $SERVER_HOST,
63 LocalPort => $SERVER_PORT, 109 LocalPort => $SERVER_PORT,
64 ReuseAddr => 1, 110 ReuseAddr => 1,
65 Listen => 50, 111 Listen => 50,
66 or die "unable to start server"; 112 or die "unable to start server";
67 113
68push @listen_sockets, $http_port; 114listen_on $http_port;
69 115
70our $NOW; 116if ($SERVER_PORT2) {
71our $HTTP_NOW; 117 my $http_port = new Coro::Socket
118 LocalAddr => $SERVER_HOST,
119 LocalPort => $SERVER_PORT2,
120 ReuseAddr => 1,
121 Listen => 50,
122 or die "unable to start server";
72 123
73Event->timer(interval => 1, hard => 1, cb => sub { 124 listen_on $http_port;
74 $NOW = time; 125}
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 126
94package conn; 127package conn;
95 128
96use Socket; 129use Socket;
97use HTTP::Date; 130use HTTP::Date;
… …
124 157
125read_mimetypes; 158read_mimetypes;
126 159
127sub new { 160sub new {
128 my $class = shift; 161 my $class = shift;
162 my $fh = shift;
129 my $peername = shift; 163 my $peername = shift;
130 my $fh = shift;
131 my $self = bless { fh => $fh }, $class; 164 my $self = bless { fh => $fh }, $class;
132 my (undef, $iaddr) = unpack_sockaddr_in $peername 165 my (undef, $iaddr) = unpack_sockaddr_in $peername
133 or $self->err(500, "unable to decode peername"); 166 or $self->err(500, "unable to decode peername");
134 167
168 $self->{remote_addr} =
135 $self->{remote_addr} = inet_ntoa $iaddr; 169 $self->{remote_id} = inet_ntoa $iaddr;
170
136 $self->{time} = $::NOW; 171 $self->{time} = $::NOW;
137 172
173 weaken ($Coro::current->{conn} = $self);
174
138 $::conns++; 175 $::conns++;
176 $::maxconns = $::conns if $::conns > $::maxconns;
139 177
140 $self; 178 $self;
141} 179}
142 180
143sub DESTROY { 181sub DESTROY {
144 my $self = shift; 182 #my $self = shift;
145 $::conns--; 183 $::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} 184}
157 185
158sub slog { 186sub slog {
159 my $self = shift; 187 my $self = shift;
160 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 188 main::slog($_[0], "$self->{remote_id}> $_[1]");
161} 189}
162 190
163sub response { 191sub response {
164 my ($self, $code, $msg, $hdr, $content) = @_; 192 my ($self, $code, $msg, $hdr, $content) = @_;
165 my $res = "HTTP/1.1 $code $msg\015\012"; 193 my $res = "HTTP/1.1 $code $msg\015\012";
194 my $GZ = "";
166 195
167 $self->{h}{connection} ||= $hdr->{Connection}; 196 if (exists $hdr->{Connection}) {
197 if ($hdr->{Connection} =~ /close/) {
198 $self->{h}{connection} = "close"
199 }
200 } else {
201 if ($self->{version} < 1.1) {
202 if ($self->{h}{connection} =~ /keep-alive/i) {
203 $hdr->{Connection} = "Keep-Alive";
204 } else {
205 $self->{h}{connection} = "close"
206 }
207 }
208 }
209
210 if ($self->{method} ne "HEAD"
211 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
212 && 400 < length $content
213 && $hdr->{"Content-Length"} == length $content
214 && !exists $hdr->{"Content-Encoding"}
215 ) {
216 my $orig = length $content;
217 $hdr->{"Content-Encoding"} = "gzip";
218 $content = Compress::Zlib::memGzip(\$content);
219 $hdr->{"Content-Length"} = length $content;
220 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
221 }
168 222
169 $res .= "Date: $HTTP_NOW\015\012"; 223 $res .= "Date: $HTTP_NOW\015\012";
170 224
171 while (my ($h, $v) = each %$hdr) { 225 while (my ($h, $v) = each %$hdr) {
172 $res .= "$h: $v\015\012" 226 $res .= "$h: $v\015\012"
173 } 227 }
174 $res .= "\015\012"; 228 $res .= "\015\012";
175 229
176 $res .= $content if defined $content and $self->{method} ne "HEAD"; 230 $res .= $content if defined $content and $self->{method} ne "HEAD";
177 231
178 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 232 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
233 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
234 " \"$self->{h}{referer}\"\n";
179 235
180 print $accesslog $log if $accesslog; 236 print $::accesslog $log if $::accesslog;
181 print STDERR $log; 237 print STDERR $log;
182 238
183 $self->{written} += 239 $tbf_top->request(length $res, 1e6);
184 print {$self->{fh}} $res; 240 $self->{written} += print {$self->{fh}} $res;
185} 241}
186 242
187sub err { 243sub err {
188 my $self = shift; 244 my $self = shift;
189 my ($code, $msg, $hdr, $content) = @_; 245 my ($code, $msg, $hdr, $content) = @_;
… …
244 my (%hdr, $h, $v); 300 my (%hdr, $h, $v);
245 301
246 $hdr{lc $1} .= ",$2" 302 $hdr{lc $1} .= ",$2"
247 while $req =~ /\G 303 while $req =~ /\G
248 ([^:\000-\040]+): 304 ([^:\000-\040]+):
249 [\008\040]* 305 [\011\040]*
250 ((?: [^\015\012]+ | \015\012[\008\040] )*) 306 ((?: [^\015\012]+ | \015\012[\011\040] )*)
251 \015\012 307 \015\012
252 /gxc; 308 /gxc;
253 309
254 $req =~ /\G\015\012$/ 310 $req =~ /\G\015\012$/
255 or $self->err(400, "bad request"); 311 or $self->err(400, "bad request");
… …
267 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 323 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
268 } 324 }
269 325
270 $self->{remote_id} = $id; 326 $self->{remote_id} = $id;
271 327
328 weaken (local $conn{$id}{$self*1} = $self);
329
272 if ($blocked{$id}) { 330 if ($blocked{$id}) {
273 $self->err_blocked($blocked{$id}) 331 $self->err_blocked
274 if $blocked{$id} > $::NOW; 332 if $blocked{$id}[0] > $::NOW;
275 333
276 delete $blocked{$id}; 334 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 } 335 }
290 336
291 # find out server name and port 337 # find out server name and port
292 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 338 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
293 $host = $1; 339 $host = $1;
… …
297 343
298 if (defined $host) { 344 if (defined $host) {
299 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 345 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
300 } else { 346 } else {
301 ($self->{server_port}, $host) 347 ($self->{server_port}, $host)
302 = unpack_sockaddr_in $self->{fh}->getsockname 348 = unpack_sockaddr_in $self->{fh}->sockname
303 or $self->err(500, "unable to get socket name"); 349 or $self->err(500, "unable to get socket name");
304 $host = inet_ntoa $host; 350 $host = inet_ntoa $host;
305 } 351 }
306 352
307 $self->{server_name} = $host; 353 $self->{server_name} = $host;
308 354
309 # enter ourselves into various lists
310 weaken ($conn{$id}{$self*1} = $self);
311 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 355 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
312 356
313 eval { 357 eval {
314 $self->map_uri; 358 $self->map_uri;
315 $self->respond; 359 $self->respond;
316 }; 360 };
317 361
318 $self->eoconn;
319
320 die if $@ && !ref $@; 362 die if $@ && !ref $@;
321 363
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 364 last if $self->{h}{connection} =~ /close/i;
365
366 $httpevent->broadcast;
323 367
324 $fh->timeout($::PER_TIMEOUT); 368 $fh->timeout($::PER_TIMEOUT);
325 } 369 }
370}
371
372sub block {
373 my $self = shift;
374
375 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
376 $self->slog(2, "blocked ip $self->{remote_id}");
377 $self->err_blocked;
326} 378}
327 379
328# uri => path mapping 380# uri => path mapping
329sub map_uri { 381sub map_uri {
330 my $self = shift; 382 my $self = shift;
… …
377 429
378sub respond { 430sub respond {
379 my $self = shift; 431 my $self = shift;
380 my $path = $self->{path}; 432 my $path = $self->{path};
381 433
382 stat $path 434 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
383 or $self->err(404, "not found"); 435 if ($::internal{$1}) {
384 436 $::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 { 437 } else {
398 $ims < $self->{stat}[9] 438 $self->err(404, "not found");
439 }
440 } else {
441
442 stat $path
399 or $self->err(304, "not modified"); 443 or $self->err(404, "not found");
400 444
401 if (-r "$path/index.html") { 445 $self->{stat} = [stat _];
402 $self->{path} .= "/index.html"; 446
403 $self->handle_file; 447 # idiotic netscape sends idiotic headers AGAIN
448 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
449 ? str2time $1 : 0;
450
451 if (-d _ && -r _) {
452 # directory
453 if ($path !~ /\/$/) {
454 # create a redirect to get the trailing "/"
455 # we don't try to avoid the :80
456 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
404 } else { 457 } else {
458 $ims < $self->{stat}[9]
459 or $self->err(304, "not modified");
460
461 if (-r "$path/index.html") {
462 # replace directory "size" by index.html filesize
463 $self->{stat} = [stat ($self->{path} .= "/index.html")];
464 $self->handle_file($queue_index, $tbf_top);
465 } else {
405 $self->handle_dir; 466 $self->handle_dir;
406 } 467 }
407 } 468 }
408 } elsif (-f _ && -r _) { 469 } elsif (-f _ && -r _) {
409 -x _ and $self->err(403, "forbidden"); 470 -x _ and $self->err(403, "forbidden");
410 $self->handle_file; 471
472 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
473 my $timeout = $::NOW + 10;
474 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
475 if ($timeout < $::NOW) {
476 $self->block($::BLOCKTIME, "too many connections");
477 } else {
478 $httpevent->wait;
479 }
480 }
481 }
482
483 $self->handle_file($queue_file, $tbf_top);
411 } else { 484 } else {
412 $self->err(404, "not found"); 485 $self->err(404, "not found");
486 }
413 } 487 }
414} 488}
415 489
416sub handle_dir { 490sub handle_dir {
417 my $self = shift; 491 my $self = shift;
… …
419 493
420 $self->response(200, "ok", 494 $self->response(200, "ok",
421 { 495 {
422 "Content-Type" => "text/html", 496 "Content-Type" => "text/html",
423 "Content-Length" => length $idx, 497 "Content-Length" => length $idx,
498 "Last-Modified" => time2str ($self->{stat}[9]),
424 }, 499 },
425 $idx); 500 $idx);
426} 501}
427 502
428sub handle_file { 503sub handle_file {
429 my $self = shift; 504 my ($self, $queue, $tbf) = @_;
430 my $length = $self->{stat}[7]; 505 my $length = $self->{stat}[7];
431 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
432 my $hdr = { 506 my $hdr = {
433 "Last-Modified" => time2str ((stat _)[9]), 507 "Last-Modified" => time2str ((stat _)[9]),
434 }; 508 };
435 509
436 my @code = (200, "ok"); 510 my @code = (200, "ok");
… …
453 $self->err(416, "not satisfiable", $hdr, ""); 527 $self->err(416, "not satisfiable", $hdr, "");
454 528
455satisfiable: 529satisfiable:
456 # check for segmented downloads 530 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 531 if ($l && $::NO_SEGMENTED) {
458 my $delay = $::PER_TIMEOUT + 15; 532 my $timeout = $::NOW + 15;
459 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 533 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 534 if ($timeout <= $::NOW) {
535 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
461 $self->err_segmented_download; 536 #$self->err_segmented_download;
462 } else { 537 } else {
463 Coro::Event::do_timer(after => 4); $delay -= 4; 538 $httpevent->wait;
464 } 539 }
465 } 540 }
466 } 541 }
467 542
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 543 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 $self->response(@code, $hdr, ""); 556 $self->response(@code, $hdr, "");
482 557
483 if ($self->{method} eq "GET") { 558 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 559 $self->{time} = $::NOW;
485 560
486 my $fudge = $queue->[0]->waiters; 561 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 562
501 my ($fh, $buf, $r); 563 my ($fh, $buf, $r);
502 my $current = $Coro::current; 564
503 open $fh, "<", $self->{path} 565 open $fh, "<", $self->{path}
504 or die "$self->{path}: late open failure ($!)"; 566 or die "$self->{path}: late open failure ($!)";
505 567
506 $h -= $l - 1; 568 $h -= $l - 1;
507 569
508 if (0) { 570 if (0) { # !AIO
509 if ($l) { 571 if ($l) {
510 sysseek $fh, $l, 0; 572 sysseek $fh, $l, 0;
511 } 573 }
512 } 574 }
575
576 my $transfer = $queue->start_transfer($h);
577 my $locked;
578 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
513 579
514 while ($h > 0) { 580 while ($h > 0) {
581 unless ($locked) {
582 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
583 $bufsize = $::BUFSIZE;
584 $self->{time} = $::NOW;
585 }
586 }
587
588 if ($blocked{$self->{remote_id}}) {
589 $self->{h}{connection} = "close";
590 die bless {}, err::;
591 }
592
515 if (0) { 593 if (0) { # !AIO
516 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 594 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
517 or last; 595 or last;
518 } else { 596 } else {
519 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 597 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
520 $buf, 0, sub { 598 $buf, 0, sub {
521 $r = $_[0]; 599 $r = $_[0];
522 Coro::ready($current); 600 Coro::ready($current);
523 }); 601 });
524 &Coro::schedule; 602 &Coro::schedule;
525 last unless $r; 603 last unless $r;
526 } 604 }
605
606 $tbf->request(length $buf);
527 my $w = syswrite $self->{fh}, $buf 607 my $w = syswrite $self->{fh}, $buf
528 or last; 608 or last;
529 $::written += $w; 609 $::written += $w;
530 $self->{written} += $w; 610 $self->{written} += $w;
531 $l += $r; 611 $l += $r;

Diff Legend

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