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

Diff Legend

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