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.51 by root, Thu Nov 29 01:50:41 2001 UTC vs.
Revision 1.63 by root, Wed Jan 23 03:07:05 2002 UTC

… …
5use Coro::Signal; 5use Coro::Signal;
6 6
7use HTTP::Date; 7use HTTP::Date;
8use POSIX (); 8use POSIX ();
9 9
10use Compress::Zlib ();
11
10no utf8; 12no utf8;
11use bytes; 13use bytes;
12 14
13# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
14# quite a bit faster than apache, ;) 16# quite a bit faster than apache, ;)
15# and quite a bit slower than thttpd :( 17# and quite a bit slower than thttpd :(
16 18
17$SIG{PIPE} = 'IGNORE'; 19$SIG{PIPE} = 'IGNORE';
18 20
19our $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}
20 38
21if ($ACCESS_LOG) { 39if ($ACCESS_LOG) {
22 use IO::Handle; 40 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 41 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 42 or die "$ACCESS_LOG: $!";
… …
26} 44}
27 45
28sub slog { 46sub slog {
29 my $level = shift; 47 my $level = shift;
30 my $format = shift; 48 my $format = shift;
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 50 printf "$NOW: $format\n", @_;
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 52}
33 53
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal; 55our $httpevent = new Coro::Signal;
36 56
37our $wait_factor = 0.95; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
38 58our $queue_index = new transferqueue 10;
39our @transfers = (
40 (new transferqueue $MAX_TRANSFERS_SMALL),
41 (new transferqueue $MAX_TRANSFERS_LARGE),
42);
43 59
44my @newcons; 60my @newcons;
45my @pool; 61my @pool;
46 62
47# one "execution thread" 63# one "execution thread"
… …
50 if (@newcons) { 66 if (@newcons) {
51 eval { 67 eval {
52 conn->new(@{pop @newcons})->handle; 68 conn->new(@{pop @newcons})->handle;
53 }; 69 };
54 slog 1, "$@" if $@ && !ref $@; 70 slog 1, "$@" if $@ && !ref $@;
71
72 $httpevent->broadcast; # only for testing, but doesn't matter much
73
55 $connections->up; 74 $connections->up;
56 } else { 75 } else {
57 last if @pool >= $MAX_POOL; 76 last if @pool >= $MAX_POOL;
58 push @pool, $Coro::current; 77 push @pool, $Coro::current;
59 schedule; 78 schedule;
… …
101 or die "unable to start server"; 120 or die "unable to start server";
102 121
103 listen_on $http_port; 122 listen_on $http_port;
104} 123}
105 124
106our $NOW;
107our $HTTP_NOW;
108
109Event->timer(interval => 1, hard => 1, cb => sub {
110 $NOW = time;
111 $HTTP_NOW = time2str $NOW;
112})->now;
113
114package conn; 125package conn;
115 126
116use Socket; 127use Socket;
117use HTTP::Date; 128use HTTP::Date;
118use Convert::Scalar 'weaken'; 129use Convert::Scalar 'weaken';
… …
152 my (undef, $iaddr) = unpack_sockaddr_in $peername 163 my (undef, $iaddr) = unpack_sockaddr_in $peername
153 or $self->err(500, "unable to decode peername"); 164 or $self->err(500, "unable to decode peername");
154 165
155 $self->{remote_addr} = 166 $self->{remote_addr} =
156 $self->{remote_id} = inet_ntoa $iaddr; 167 $self->{remote_id} = inet_ntoa $iaddr;
168
157 $self->{time} = $::NOW; 169 $self->{time} = $::NOW;
158 170
159 weaken ($Coro::current->{conn} = $self); 171 weaken ($Coro::current->{conn} = $self);
160 172
161 $::conns++; 173 $::conns++;
174 $::maxconns = $::conns if $::conns > $::maxconns;
162 175
163 $self; 176 $self;
164} 177}
165 178
166sub DESTROY { 179sub DESTROY {
167 my $self = shift; 180 #my $self = shift;
168 $::conns--; 181 $::conns--;
169 $self->eoconn;
170}
171
172# end of connection
173sub eoconn {
174 my $self = shift;
175
176 # clean up hints
177 delete $conn{$self->{remote_id}}{$self*1};
178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
179
180 $httpevent->broadcast;
181} 182}
182 183
183sub slog { 184sub slog {
184 my $self = shift; 185 my $self = shift;
185 main::slog($_[0], "$self->{remote_id}> $_[1]"); 186 main::slog($_[0], "$self->{remote_id}> $_[1]");
186} 187}
187 188
188sub response { 189sub response {
189 my ($self, $code, $msg, $hdr, $content) = @_; 190 my ($self, $code, $msg, $hdr, $content) = @_;
190 my $res = "HTTP/1.1 $code $msg\015\012"; 191 my $res = "HTTP/1.1 $code $msg\015\012";
192 my $GZ = "";
191 193
192 if (exists $hdr->{Connection}) { 194 if (exists $hdr->{Connection}) {
193 if ($hdr->{Connection} =~ /close/) { 195 if ($hdr->{Connection} =~ /close/) {
194 $self->{h}{connection} = "close" 196 $self->{h}{connection} = "close"
195 } 197 }
… …
201 $self->{h}{connection} = "close" 203 $self->{h}{connection} = "close"
202 } 204 }
203 } 205 }
204 } 206 }
205 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 }
219
206 $res .= "Date: $HTTP_NOW\015\012"; 220 $res .= "Date: $HTTP_NOW\015\012";
207 221
208 while (my ($h, $v) = each %$hdr) { 222 while (my ($h, $v) = each %$hdr) {
209 $res .= "$h: $v\015\012" 223 $res .= "$h: $v\015\012"
210 } 224 }
211 $res .= "\015\012"; 225 $res .= "\015\012";
212 226
213 $res .= $content if defined $content and $self->{method} ne "HEAD"; 227 $res .= $content if defined $content and $self->{method} ne "HEAD";
214 228
215 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 229 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
216 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 230 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
217 " \"$self->{h}{referer}\"\n"; 231 " \"$self->{h}{referer}\"\n";
218 232
219 print $accesslog $log if $accesslog; 233 print $accesslog $log if $accesslog;
220 print STDERR $log; 234 print STDERR $log;
221 235
… …
283 my (%hdr, $h, $v); 297 my (%hdr, $h, $v);
284 298
285 $hdr{lc $1} .= ",$2" 299 $hdr{lc $1} .= ",$2"
286 while $req =~ /\G 300 while $req =~ /\G
287 ([^:\000-\040]+): 301 ([^:\000-\040]+):
288 [\008\040]* 302 [\010\040]*
289 ((?: [^\015\012]+ | \015\012[\008\040] )*) 303 ((?: [^\015\012]+ | \015\012[\010\040] )*)
290 \015\012 304 \015\012
291 /gxc; 305 /gxc;
292 306
293 $req =~ /\G\015\012$/ 307 $req =~ /\G\015\012$/
294 or $self->err(400, "bad request"); 308 or $self->err(400, "bad request");
… …
306 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 320 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
307 } 321 }
308 322
309 $self->{remote_id} = $id; 323 $self->{remote_id} = $id;
310 324
325 weaken (local $conn{$id}{$self*1} = $self);
326
311 if ($blocked{$id}) { 327 if ($blocked{$id}) {
312 $self->err_blocked($blocked{$id}) 328 $self->err_blocked
313 if $blocked{$id} > $::NOW; 329 if $blocked{$id}[0] > $::NOW;
314 330
315 delete $blocked{$id}; 331 delete $blocked{$id};
316 }
317
318 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
319 my $delay = $::PER_TIMEOUT + $::NOW + 15;
320 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
321 if ($delay < $::NOW) {
322 $self->slog(2, "blocked ip $id");
323 $self->err_blocked;
324 } else {
325 $httpevent->wait;
326 }
327 }
328 } 332 }
329 333
330 # find out server name and port 334 # find out server name and port
331 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 335 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
332 $host = $1; 336 $host = $1;
… …
343 $host = inet_ntoa $host; 347 $host = inet_ntoa $host;
344 } 348 }
345 349
346 $self->{server_name} = $host; 350 $self->{server_name} = $host;
347 351
348 # enter ourselves into various lists
349 weaken ($conn{$id}{$self*1} = $self);
350 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 352 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
351 353
352 eval { 354 eval {
353 $self->map_uri; 355 $self->map_uri;
354 $self->respond; 356 $self->respond;
355 }; 357 };
356 358
357 $self->eoconn;
358
359 die if $@ && !ref $@; 359 die if $@ && !ref $@;
360 360
361 last if $self->{h}{connection} =~ /close/; 361 last if $self->{h}{connection} =~ /close/i;
362 362
363 $httpevent->broadcast; 363 $httpevent->broadcast;
364 364
365 $fh->timeout($::PER_TIMEOUT); 365 $fh->timeout($::PER_TIMEOUT);
366 } 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;
367} 375}
368 376
369# uri => path mapping 377# uri => path mapping
370sub map_uri { 378sub map_uri {
371 my $self = shift; 379 my $self = shift;
… …
447 $ims < $self->{stat}[9] 455 $ims < $self->{stat}[9]
448 or $self->err(304, "not modified"); 456 or $self->err(304, "not modified");
449 457
450 if (-r "$path/index.html") { 458 if (-r "$path/index.html") {
451 # replace directory "size" by index.html filesize 459 # replace directory "size" by index.html filesize
452 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 460 $self->{stat} = [stat ($self->{path} .= "/index.html")];
453 $self->handle_file; 461 $self->handle_file($queue_index);
454 } else { 462 } else {
455 $self->handle_dir; 463 $self->handle_dir;
456 } 464 }
457 } 465 }
458 } elsif (-f _ && -r _) { 466 } elsif (-f _ && -r _) {
459 -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
460 $self->handle_file; 480 $self->handle_file($queue_file);
461 } else { 481 } else {
462 $self->err(404, "not found"); 482 $self->err(404, "not found");
463 } 483 }
464 } 484 }
465} 485}
… …
470 490
471 $self->response(200, "ok", 491 $self->response(200, "ok",
472 { 492 {
473 "Content-Type" => "text/html", 493 "Content-Type" => "text/html",
474 "Content-Length" => length $idx, 494 "Content-Length" => length $idx,
475 #d# directories change all the time, so X-
476 "X-Last-Modified" => time2str ((stat _)[9]), 495 "Last-Modified" => time2str ($self->{stat}[9]),
477 }, 496 },
478 $idx); 497 $idx);
479} 498}
480 499
481sub handle_file { 500sub handle_file {
482 my $self = shift; 501 my ($self, $queue) = @_;
483 my $length = $self->{stat}[7]; 502 my $length = $self->{stat}[7];
484 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
485 my $hdr = { 503 my $hdr = {
486 "Last-Modified" => time2str ((stat _)[9]), 504 "Last-Modified" => time2str ((stat _)[9]),
487 }; 505 };
488 506
489 my @code = (200, "ok"); 507 my @code = (200, "ok");
… …
506 $self->err(416, "not satisfiable", $hdr, ""); 524 $self->err(416, "not satisfiable", $hdr, "");
507 525
508satisfiable: 526satisfiable:
509 # check for segmented downloads 527 # check for segmented downloads
510 if ($l && $::NO_SEGMENTED) { 528 if ($l && $::NO_SEGMENTED) {
511 my $delay = $::NOW + $::PER_TIMEOUT + 15; 529 my $timeout = $::NOW + 15;
512 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 530 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
513 if ($delay <= $::NOW) { 531 if ($timeout <= $::NOW) {
532 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
514 $self->err_segmented_download; 533 #$self->err_segmented_download;
515 } else { 534 } else {
516 $httpevent->wait; 535 $httpevent->wait;
517 } 536 }
518 } 537 }
519 } 538 }
… …
549 if ($l) { 568 if ($l) {
550 sysseek $fh, $l, 0; 569 sysseek $fh, $l, 0;
551 } 570 }
552 } 571 }
553 572
554 my $transfer = $queue->start_transfer; 573 my $transfer = $queue->start_transfer($h);
555 my $locked; 574 my $locked;
556 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 575 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
557 576
558 while ($h > 0) { 577 while ($h > 0) {
559 unless ($locked) { 578 unless ($locked) {
560 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 579 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
561 $bufsize = $::BUFSIZE; 580 $bufsize = $::BUFSIZE;
562 $self->{time} = $::NOW; 581 $self->{time} = $::NOW;
563 } 582 }
583 }
584
585 if ($blocked{$self->{remote_id}}) {
586 $self->{h}{connection} = "close";
587 die bless {}, err::;
564 } 588 }
565 589
566 if (0) { # !AIO 590 if (0) { # !AIO
567 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 591 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
568 or last; 592 or last;

Diff Legend

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