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.40 by root, Mon Sep 3 00:06:06 2001 UTC vs.
Revision 1.63 by root, Wed Jan 23 03:07:05 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;
35 58our $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 59
41my @newcons; 60my @newcons;
42my @pool; 61my @pool;
43 62
44# one "execution thread" 63# one "execution thread"
… …
47 if (@newcons) { 66 if (@newcons) {
48 eval { 67 eval {
49 conn->new(@{pop @newcons})->handle; 68 conn->new(@{pop @newcons})->handle;
50 }; 69 };
51 slog 1, "$@" if $@ && !ref $@; 70 slog 1, "$@" if $@ && !ref $@;
71
72 $httpevent->broadcast; # only for testing, but doesn't matter much
73
52 $connections->up; 74 $connections->up;
53 } else { 75 } else {
54 last if @pool >= $MAX_POOL; 76 last if @pool >= $MAX_POOL;
55 push @pool, $Coro::current; 77 push @pool, $Coro::current;
56 schedule; 78 schedule;
… …
87 Listen => 50, 109 Listen => 50,
88 or die "unable to start server"; 110 or die "unable to start server";
89 111
90listen_on $http_port; 112listen_on $http_port;
91 113
114if ($SERVER_PORT2) {
92my $http_port = new Coro::Socket 115 my $http_port = new Coro::Socket
93 LocalAddr => $SERVER_HOST, 116 LocalAddr => $SERVER_HOST,
94 LocalPort => $SERVER_PORT2, 117 LocalPort => $SERVER_PORT2,
95 ReuseAddr => 1, 118 ReuseAddr => 1,
96 Listen => 50, 119 Listen => 50,
97 or die "unable to start server"; 120 or die "unable to start server";
98 121
99listen_on $http_port; 122 listen_on $http_port;
100 123}
101our $NOW;
102our $HTTP_NOW;
103
104Event->timer(interval => 1, hard => 1, cb => sub {
105 $NOW = time;
106 $HTTP_NOW = time2str $NOW;
107})->now;
108 124
109package conn; 125package conn;
110 126
111use Socket; 127use Socket;
112use HTTP::Date; 128use HTTP::Date;
… …
139 155
140read_mimetypes; 156read_mimetypes;
141 157
142sub new { 158sub new {
143 my $class = shift; 159 my $class = shift;
160 my $fh = shift;
144 my $peername = shift; 161 my $peername = shift;
145 my $fh = shift;
146 my $self = bless { fh => $fh }, $class; 162 my $self = bless { fh => $fh }, $class;
147 my (undef, $iaddr) = unpack_sockaddr_in $peername 163 my (undef, $iaddr) = unpack_sockaddr_in $peername
148 or $self->err(500, "unable to decode peername"); 164 or $self->err(500, "unable to decode peername");
149 165
166 $self->{remote_addr} =
150 $self->{remote_addr} = inet_ntoa $iaddr; 167 $self->{remote_id} = inet_ntoa $iaddr;
168
151 $self->{time} = $::NOW; 169 $self->{time} = $::NOW;
152 170
171 weaken ($Coro::current->{conn} = $self);
172
153 $::conns++; 173 $::conns++;
174 $::maxconns = $::conns if $::conns > $::maxconns;
154 175
155 $self; 176 $self;
156} 177}
157 178
158sub DESTROY { 179sub DESTROY {
159 my $self = shift; 180 #my $self = shift;
160 $::conns--; 181 $::conns--;
161 $self->eoconn;
162}
163
164# end of connection
165sub eoconn {
166 my $self = shift;
167
168 # clean up hints
169 delete $conn{$self->{remote_id}}{$self*1};
170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
171} 182}
172 183
173sub slog { 184sub slog {
174 my $self = shift; 185 my $self = shift;
175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 186 main::slog($_[0], "$self->{remote_id}> $_[1]");
176} 187}
177 188
178sub response { 189sub response {
179 my ($self, $code, $msg, $hdr, $content) = @_; 190 my ($self, $code, $msg, $hdr, $content) = @_;
180 my $res = "HTTP/1.1 $code $msg\015\012"; 191 my $res = "HTTP/1.1 $code $msg\015\012";
192 my $GZ = "";
181 193
182 $self->{h}{connection} ||= $hdr->{Connection}; 194 if (exists $hdr->{Connection}) {
195 if ($hdr->{Connection} =~ /close/) {
196 $self->{h}{connection} = "close"
197 }
198 } else {
199 if ($self->{version} < 1.1) {
200 if ($self->{h}{connection} =~ /keep-alive/i) {
201 $hdr->{Connection} = "Keep-Alive";
202 } else {
203 $self->{h}{connection} = "close"
204 }
205 }
206 }
207
208 if ($self->{method} ne "HEAD"
209 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
210 && $hdr->{"Content-Length"} == length $content
211 && !exists $hdr->{"Content-Encoding"}
212 ) {
213 my $orig = length $content;
214 $hdr->{"Content-Encoding"} = "gzip";
215 $content = Compress::Zlib::memGzip(\$content);
216 $hdr->{"Content-Length"} = length $content;
217 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
218 }
183 219
184 $res .= "Date: $HTTP_NOW\015\012"; 220 $res .= "Date: $HTTP_NOW\015\012";
185 221
186 while (my ($h, $v) = each %$hdr) { 222 while (my ($h, $v) = each %$hdr) {
187 $res .= "$h: $v\015\012" 223 $res .= "$h: $v\015\012"
188 } 224 }
189 $res .= "\015\012"; 225 $res .= "\015\012";
190 226
191 $res .= $content if defined $content and $self->{method} ne "HEAD"; 227 $res .= $content if defined $content and $self->{method} ne "HEAD";
192 228
193 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 229 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
230 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
231 " \"$self->{h}{referer}\"\n";
194 232
195 print $accesslog $log if $accesslog; 233 print $accesslog $log if $accesslog;
196 print STDERR $log; 234 print STDERR $log;
197 235
198 $self->{written} += 236 $self->{written} +=
… …
259 my (%hdr, $h, $v); 297 my (%hdr, $h, $v);
260 298
261 $hdr{lc $1} .= ",$2" 299 $hdr{lc $1} .= ",$2"
262 while $req =~ /\G 300 while $req =~ /\G
263 ([^:\000-\040]+): 301 ([^:\000-\040]+):
264 [\008\040]* 302 [\010\040]*
265 ((?: [^\015\012]+ | \015\012[\008\040] )*) 303 ((?: [^\015\012]+ | \015\012[\010\040] )*)
266 \015\012 304 \015\012
267 /gxc; 305 /gxc;
268 306
269 $req =~ /\G\015\012$/ 307 $req =~ /\G\015\012$/
270 or $self->err(400, "bad request"); 308 or $self->err(400, "bad request");
… …
282 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 320 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
283 } 321 }
284 322
285 $self->{remote_id} = $id; 323 $self->{remote_id} = $id;
286 324
325 weaken (local $conn{$id}{$self*1} = $self);
326
287 if ($blocked{$id}) { 327 if ($blocked{$id}) {
288 $self->err_blocked($blocked{$id}) 328 $self->err_blocked
289 if $blocked{$id} > $::NOW; 329 if $blocked{$id}[0] > $::NOW;
290 330
291 delete $blocked{$id}; 331 delete $blocked{$id};
292 }
293
294 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
295 my $delay = $::PER_TIMEOUT + 15;
296 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 if ($delay <= 0) {
298 $self->slog(2, "blocked ip $id");
299 $self->err_blocked;
300 } else {
301 Coro::Event::do_timer(after => 4); $delay -= 4;
302 }
303 }
304 } 332 }
305 333
306 # find out server name and port 334 # find out server name and port
307 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 335 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
308 $host = $1; 336 $host = $1;
… …
312 340
313 if (defined $host) { 341 if (defined $host) {
314 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 342 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
315 } else { 343 } else {
316 ($self->{server_port}, $host) 344 ($self->{server_port}, $host)
317 = unpack_sockaddr_in $self->{fh}->getsockname 345 = unpack_sockaddr_in $self->{fh}->sockname
318 or $self->err(500, "unable to get socket name"); 346 or $self->err(500, "unable to get socket name");
319 $host = inet_ntoa $host; 347 $host = inet_ntoa $host;
320 } 348 }
321 349
322 $self->{server_name} = $host; 350 $self->{server_name} = $host;
323 351
324 # enter ourselves into various lists
325 weaken ($conn{$id}{$self*1} = $self);
326 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 352 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
327 353
328 eval { 354 eval {
329 $self->map_uri; 355 $self->map_uri;
330 $self->respond; 356 $self->respond;
331 }; 357 };
332 358
333 $self->eoconn;
334
335 die if $@ && !ref $@; 359 die if $@ && !ref $@;
336 360
337 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 361 last if $self->{h}{connection} =~ /close/i;
362
363 $httpevent->broadcast;
338 364
339 $fh->timeout($::PER_TIMEOUT); 365 $fh->timeout($::PER_TIMEOUT);
340 } 366 }
367}
368
369sub block {
370 my $self = shift;
371
372 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
373 $self->slog(2, "blocked ip $self->{remote_id}");
374 $self->err_blocked;
341} 375}
342 376
343# uri => path mapping 377# uri => path mapping
344sub map_uri { 378sub map_uri {
345 my $self = shift; 379 my $self = shift;
… …
392 426
393sub respond { 427sub respond {
394 my $self = shift; 428 my $self = shift;
395 my $path = $self->{path}; 429 my $path = $self->{path};
396 430
397 stat $path 431 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
398 or $self->err(404, "not found"); 432 if ($::internal{$1}) {
399 433 $::internal{$1}->($self);
400 $self->{stat} = [stat _];
401
402 # idiotic netscape sends idiotic headers AGAIN
403 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
404 ? str2time $1 : 0;
405
406 if (-d _ && -r _) {
407 # directory
408 if ($path !~ /\/$/) {
409 # create a redirect to get the trailing "/"
410 # we don't try to avoid the :80
411 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
412 } else { 434 } else {
413 $ims < $self->{stat}[9] 435 $self->err(404, "not found");
436 }
437 } else {
438
439 stat $path
414 or $self->err(304, "not modified"); 440 or $self->err(404, "not found");
415 441
416 if (-r "$path/index.html") { 442 $self->{stat} = [stat _];
417 $self->{path} .= "/index.html"; 443
418 $self->handle_file; 444 # idiotic netscape sends idiotic headers AGAIN
445 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
446 ? str2time $1 : 0;
447
448 if (-d _ && -r _) {
449 # directory
450 if ($path !~ /\/$/) {
451 # create a redirect to get the trailing "/"
452 # we don't try to avoid the :80
453 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
419 } else { 454 } else {
455 $ims < $self->{stat}[9]
456 or $self->err(304, "not modified");
457
458 if (-r "$path/index.html") {
459 # replace directory "size" by index.html filesize
460 $self->{stat} = [stat ($self->{path} .= "/index.html")];
461 $self->handle_file($queue_index);
462 } else {
420 $self->handle_dir; 463 $self->handle_dir;
421 } 464 }
422 } 465 }
423 } elsif (-f _ && -r _) { 466 } elsif (-f _ && -r _) {
424 -x _ and $self->err(403, "forbidden"); 467 -x _ and $self->err(403, "forbidden");
468
469 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
470 my $timeout = $::NOW + 10;
471 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
472 if ($timeout < $::NOW) {
473 $self->block($::BLOCKTIME, "too many connections");
474 } else {
475 $httpevent->wait;
476 }
477 }
478 }
479
425 $self->handle_file; 480 $self->handle_file($queue_file);
426 } else { 481 } else {
427 $self->err(404, "not found"); 482 $self->err(404, "not found");
483 }
428 } 484 }
429} 485}
430 486
431sub handle_dir { 487sub handle_dir {
432 my $self = shift; 488 my $self = shift;
… …
434 490
435 $self->response(200, "ok", 491 $self->response(200, "ok",
436 { 492 {
437 "Content-Type" => "text/html", 493 "Content-Type" => "text/html",
438 "Content-Length" => length $idx, 494 "Content-Length" => length $idx,
495 "Last-Modified" => time2str ($self->{stat}[9]),
439 }, 496 },
440 $idx); 497 $idx);
441} 498}
442 499
443sub handle_file { 500sub handle_file {
444 my $self = shift; 501 my ($self, $queue) = @_;
445 my $length = $self->{stat}[7]; 502 my $length = $self->{stat}[7];
446 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
447 my $hdr = { 503 my $hdr = {
448 "Last-Modified" => time2str ((stat _)[9]), 504 "Last-Modified" => time2str ((stat _)[9]),
449 }; 505 };
450 506
451 my @code = (200, "ok"); 507 my @code = (200, "ok");
… …
468 $self->err(416, "not satisfiable", $hdr, ""); 524 $self->err(416, "not satisfiable", $hdr, "");
469 525
470satisfiable: 526satisfiable:
471 # check for segmented downloads 527 # check for segmented downloads
472 if ($l && $::NO_SEGMENTED) { 528 if ($l && $::NO_SEGMENTED) {
473 my $delay = $::PER_TIMEOUT + 15; 529 my $timeout = $::NOW + 15;
474 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 530 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
475 if ($delay <= 0) { 531 if ($timeout <= $::NOW) {
532 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
476 $self->err_segmented_download; 533 #$self->err_segmented_download;
477 } else { 534 } else {
478 Coro::Event::do_timer(after => 4); $delay -= 4; 535 $httpevent->wait;
479 } 536 }
480 } 537 }
481 } 538 }
482 539
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 540 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
496 $self->response(@code, $hdr, ""); 553 $self->response(@code, $hdr, "");
497 554
498 if ($self->{method} eq "GET") { 555 if ($self->{method} eq "GET") {
499 $self->{time} = $::NOW; 556 $self->{time} = $::NOW;
500 557
501 my $fudge = $queue->[0]->waiters; 558 my $current = $Coro::current;
502 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
503
504 $queue->[1] *= $fudge;
505 my $transfer = $queue->[0]->guard;
506
507 if ($fudge != 1) {
508 $queue->[1] /= $fudge;
509 $queue->[1] = $queue->[1] * $::wait_factor
510 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
511 }
512 $self->{time} = $::NOW;
513
514 $self->{fh}->writable or return;
515 559
516 my ($fh, $buf, $r); 560 my ($fh, $buf, $r);
517 my $current = $Coro::current; 561
518 open $fh, "<", $self->{path} 562 open $fh, "<", $self->{path}
519 or die "$self->{path}: late open failure ($!)"; 563 or die "$self->{path}: late open failure ($!)";
520 564
521 $h -= $l - 1; 565 $h -= $l - 1;
522 566
523 if (0) { 567 if (0) { # !AIO
524 if ($l) { 568 if ($l) {
525 sysseek $fh, $l, 0; 569 sysseek $fh, $l, 0;
526 } 570 }
527 } 571 }
572
573 my $transfer = $queue->start_transfer($h);
574 my $locked;
575 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
528 576
529 while ($h > 0) { 577 while ($h > 0) {
578 unless ($locked) {
579 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
580 $bufsize = $::BUFSIZE;
581 $self->{time} = $::NOW;
582 }
583 }
584
585 if ($blocked{$self->{remote_id}}) {
586 $self->{h}{connection} = "close";
587 die bless {}, err::;
588 }
589
530 if (0) { 590 if (0) { # !AIO
531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 591 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
532 or last; 592 or last;
533 } else { 593 } else {
534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 594 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
535 $buf, 0, sub { 595 $buf, 0, sub {
536 $r = $_[0]; 596 $r = $_[0];
537 Coro::ready($current); 597 Coro::ready($current);
538 }); 598 });
539 &Coro::schedule; 599 &Coro::schedule;

Diff Legend

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