ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.35 by root, Thu Aug 30 12:35:28 2001 UTC vs.
Revision 1.58 by root, Mon Dec 3 21:32:35 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"
45sub handler { 62sub handler {
46 while () { 63 while () {
47 my $new = pop @newcons;
48 if ($new) { 64 if (@newcons) {
49 eval { 65 eval {
50 conn->new(@$new)->handle; 66 conn->new(@{pop @newcons})->handle;
51 }; 67 };
52 slog 1, "$@" if $@ && !ref $@; 68 slog 1, "$@" if $@ && !ref $@;
69
70 $httpevent->broadcast; # only for testing, but doesn't matter much
71
53 $connections->up; 72 $connections->up;
54 } else { 73 } else {
55 last if @pool >= $MAX_POOL; 74 last if @pool >= $MAX_POOL;
56 push @pool, $Coro::current; 75 push @pool, $Coro::current;
57 schedule; 76 schedule;
58 } 77 }
59 } 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 };
60} 101}
61 102
62my $http_port = new Coro::Socket 103my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 104 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 105 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 106 ReuseAddr => 1,
66 Listen => 50, 107 Listen => 50,
67 or die "unable to start server"; 108 or die "unable to start server";
68 109
69push @listen_sockets, $http_port; 110listen_on $http_port;
70 111
71our $NOW; 112if ($SERVER_PORT2) {
72our $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";
73 119
74Event->timer(interval => 1, hard => 1, cb => sub { 120 listen_on $http_port;
75 $NOW = time; 121}
76 $HTTP_NOW = time2str $NOW;
77})->now;
78
79# the "main thread"
80async {
81 slog 1, "accepting connections";
82 while () {
83 $connections->down;
84 push @newcons, [$http_port->accept];
85 #slog 3, "accepted @$connections ".scalar(@pool);
86 if (@pool) {
87 (pop @pool)->ready;
88 } else {
89 async \&handler;
90 }
91
92 }
93};
94 122
95package conn; 123package conn;
96 124
97use Socket; 125use Socket;
98use HTTP::Date; 126use HTTP::Date;
99use Convert::Scalar 'weaken'; 127use Convert::Scalar 'weaken';
100use Linux::AIO; 128use Linux::AIO;
101 129
102Linux::AIO::min_parallel $::AIO_PARALLEL; 130Linux::AIO::min_parallel $::AIO_PARALLEL;
103
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105 131
106Event->io(fd => Linux::AIO::poll_fileno, 132Event->io(fd => Linux::AIO::poll_fileno,
107 poll => 'r', async => 1, 133 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 134 cb => \&Linux::AIO::poll_cb);
109 135
… …
127 153
128read_mimetypes; 154read_mimetypes;
129 155
130sub new { 156sub new {
131 my $class = shift; 157 my $class = shift;
158 my $fh = shift;
132 my $peername = shift; 159 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
137 163
164 $self->{remote_addr} =
138 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
139 $self->{time} = $::NOW; 166 $self->{time} = $::NOW;
140 167
141 # enter ourselves into various lists 168 weaken ($Coro::current->{conn} = $self);
142 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
143 169
144 $::conns++; 170 $::conns++;
171 $::maxconns = $::conns if $::conns > $::maxconns;
145 172
146 $self; 173 $self;
147} 174}
148 175
149sub DESTROY { 176sub DESTROY {
150 my $self = shift; 177 #my $self = shift;
151
152 $::conns--; 178 $::conns--;
153
154 $self->eoconn;
155 delete $conn{$self->{remote_addr}}{$self*1};
156}
157
158# end of connection
159sub eoconn {
160 my $self = shift;
161 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
162} 179}
163 180
164sub slog { 181sub slog {
165 my $self = shift; 182 my $self = shift;
166 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 183 main::slog($_[0], "$self->{remote_id}> $_[1]");
167} 184}
168 185
169sub response { 186sub response {
170 my ($self, $code, $msg, $hdr, $content) = @_; 187 my ($self, $code, $msg, $hdr, $content) = @_;
171 my $res = "HTTP/1.1 $code $msg\015\012"; 188 my $res = "HTTP/1.1 $code $msg\015\012";
172 189
173 $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 }
174 203
175 $res .= "Date: $HTTP_NOW\015\012"; 204 $res .= "Date: $HTTP_NOW\015\012";
176 205
177 while (my ($h, $v) = each %$hdr) { 206 while (my ($h, $v) = each %$hdr) {
178 $res .= "$h: $v\015\012" 207 $res .= "$h: $v\015\012"
179 } 208 }
180 $res .= "\015\012"; 209 $res .= "\015\012";
181 210
182 $res .= $content if defined $content and $self->{method} ne "HEAD"; 211 $res .= $content if defined $content and $self->{method} ne "HEAD";
183 212
184 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";
185 216
186 print $accesslog $log if $accesslog; 217 print $accesslog $log if $accesslog;
187 print STDERR $log; 218 print STDERR $log;
188 219
189 $self->{written} += 220 $self->{written} +=
… …
228 } 259 }
229 260
230 $self->{h} = {}; 261 $self->{h} = {};
231 262
232 $fh->timeout($::RES_TIMEOUT); 263 $fh->timeout($::RES_TIMEOUT);
233 my $ip = $self->{remote_addr};
234
235 if ($blocked{$ip}) {
236 $self->err_blocked($blocked{$ip})
237 if $blocked{$ip} > $::NOW;
238
239 delete $blocked{$ip};
240 }
241
242 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
243 my $delay = 120;
244 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
245 if ($delay <= 0) {
246 $self->slog(2, "blocked ip $ip");
247 $self->err_blocked;
248 } else {
249 Coro::Event::do_timer(after => 3);
250 $delay -= 3;
251 }
252 }
253 }
254 264
255 $req =~ /^(?:\015\012)? 265 $req =~ /^(?:\015\012)?
256 (GET|HEAD) \040+ 266 (GET|HEAD) \040+
257 ([^\040]+) \040+ 267 ([^\040]+) \040+
258 HTTP\/([0-9]+\.[0-9]+) 268 HTTP\/([0-9]+\.[0-9]+)
… …
283 293
284 $self->{h}{$h} = substr $v, 1 294 $self->{h}{$h} = substr $v, 1
285 while ($h, $v) = each %hdr; 295 while ($h, $v) = each %hdr;
286 } 296 }
287 297
298 # remote id should be unique per user
299 my $id = $self->{remote_addr};
300
301 if (exists $self->{h}{"client-ip"}) {
302 $id .= "[".$self->{h}{"client-ip"}."]";
303 } elsif (exists $self->{h}{"x-forwarded-for"}) {
304 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
305 }
306
307 $self->{remote_id} = $id;
308
309 weaken (local $conn{$id}{$self*1} = $self);
310
311 if ($blocked{$id}) {
312 $self->err_blocked
313 if $blocked{$id}[0] > $::NOW;
314
315 delete $blocked{$id};
316 }
317
288 # find out server name and port 318 # find out server name and port
289 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 319 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
290 $host = $1; 320 $host = $1;
291 } else { 321 } else {
292 $host = $self->{h}{host}; 322 $host = $self->{h}{host};
… …
294 324
295 if (defined $host) { 325 if (defined $host) {
296 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 326 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
297 } else { 327 } else {
298 ($self->{server_port}, $host) 328 ($self->{server_port}, $host)
299 = unpack_sockaddr_in $self->{fh}->getsockname 329 = unpack_sockaddr_in $self->{fh}->sockname
300 or $self->err(500, "unable to get socket name"); 330 or $self->err(500, "unable to get socket name");
301 $host = inet_ntoa $host; 331 $host = inet_ntoa $host;
302 } 332 }
303 333
304 $self->{server_name} = $host; 334 $self->{server_name} = $host;
305 335
306 # remote id should be unique per user
307 $self->{remote_id} = $self->{remote_addr};
308
309 if (exists $self->{h}{"client-ip"}) {
310 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
311 } elsif (exists $self->{h}{"x-forwarded-for"}) {
312 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
313 }
314
315 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 336 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
316 337
317 eval { 338 eval {
318 $self->map_uri; 339 $self->map_uri;
319 $self->respond; 340 $self->respond;
320 }; 341 };
321 342
322 $self->eoconn;
323
324 die if $@ && !ref $@; 343 die if $@ && !ref $@;
325 344
326 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 345 last if $self->{h}{connection} =~ /close/i;
346
347 $httpevent->broadcast;
327 348
328 $fh->timeout($::PER_TIMEOUT); 349 $fh->timeout($::PER_TIMEOUT);
329 } 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;
330} 359}
331 360
332# uri => path mapping 361# uri => path mapping
333sub map_uri { 362sub map_uri {
334 my $self = shift; 363 my $self = shift;
… …
381 410
382sub respond { 411sub respond {
383 my $self = shift; 412 my $self = shift;
384 my $path = $self->{path}; 413 my $path = $self->{path};
385 414
386 stat $path 415 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
387 or $self->err(404, "not found"); 416 if ($::internal{$1}) {
388 417 $::internal{$1}->($self);
389 $self->{stat} = [stat _];
390
391 # idiotic netscape sends idiotic headers AGAIN
392 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
393 ? str2time $1 : 0;
394
395 if (-d _ && -r _) {
396 # directory
397 if ($path !~ /\/$/) {
398 # create a redirect to get the trailing "/"
399 # we don't try to avoid the :80
400 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
401 } else { 418 } else {
402 $ims < $self->{stat}[9] 419 $self->err(404, "not found");
420 }
421 } else {
422
423 stat $path
403 or $self->err(304, "not modified"); 424 or $self->err(404, "not found");
404 425
405 if (-r "$path/index.html") { 426 $self->{stat} = [stat _];
406 $self->{path} .= "/index.html"; 427
407 $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}/" });
408 } 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 {
409 $self->handle_dir; 447 $self->handle_dir;
410 } 448 }
411 } 449 }
412 } elsif (-f _ && -r _) { 450 } elsif (-f _ && -r _) {
413 -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
414 $self->handle_file; 464 $self->handle_file($queue_file);
415 } else { 465 } else {
416 $self->err(404, "not found"); 466 $self->err(404, "not found");
467 }
417 } 468 }
418} 469}
419 470
420sub handle_dir { 471sub handle_dir {
421 my $self = shift; 472 my $self = shift;
… …
423 474
424 $self->response(200, "ok", 475 $self->response(200, "ok",
425 { 476 {
426 "Content-Type" => "text/html", 477 "Content-Type" => "text/html",
427 "Content-Length" => length $idx, 478 "Content-Length" => length $idx,
479 "Last-Modified" => time2str ($self->{stat}[9]),
428 }, 480 },
429 $idx); 481 $idx);
430} 482}
431 483
432sub handle_file { 484sub handle_file {
433 my $self = shift; 485 my ($self, $queue) = @_;
434 my $length = $self->{stat}[7]; 486 my $length = $self->{stat}[7];
435 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
436 my $hdr = { 487 my $hdr = {
437 "Last-Modified" => time2str ((stat _)[9]), 488 "Last-Modified" => time2str ((stat _)[9]),
438 }; 489 };
439 490
440 my @code = (200, "ok"); 491 my @code = (200, "ok");
… …
457 $self->err(416, "not satisfiable", $hdr, ""); 508 $self->err(416, "not satisfiable", $hdr, "");
458 509
459satisfiable: 510satisfiable:
460 # check for segmented downloads 511 # check for segmented downloads
461 if ($l && $::NO_SEGMENTED) { 512 if ($l && $::NO_SEGMENTED) {
462 my $delay = 180; 513 my $timeout = $::NOW + 15;
463 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 514 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
464 if ($delay <= 0) { 515 if ($timeout <= $::NOW) {
516 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
465 $self->err_segmented_download; 517 #$self->err_segmented_download;
466 } else { 518 } else {
467 Coro::Event::do_timer(after => 3); $delay -= 3; 519 $httpevent->wait;
468 } 520 }
469 } 521 }
470 } 522 }
471 523
472 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 524 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
485 $self->response(@code, $hdr, ""); 537 $self->response(@code, $hdr, "");
486 538
487 if ($self->{method} eq "GET") { 539 if ($self->{method} eq "GET") {
488 $self->{time} = $::NOW; 540 $self->{time} = $::NOW;
489 541
490 my $fudge = $queue->[0]->waiters; 542 my $current = $Coro::current;
491 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
492
493 $queue->[1] *= $fudge;
494 my $transfer = $queue->[0]->guard;
495
496 if ($fudge != 1) {
497 $queue->[1] /= $fudge;
498 $queue->[1] = $queue->[1] * $::wait_factor
499 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
500 }
501 $self->{time} = $::NOW;
502
503 $self->{fh}->writable or return;
504 543
505 my ($fh, $buf, $r); 544 my ($fh, $buf, $r);
506 my $current = $Coro::current; 545
507 open $fh, "<", $self->{path} 546 open $fh, "<", $self->{path}
508 or die "$self->{path}: late open failure ($!)"; 547 or die "$self->{path}: late open failure ($!)";
509 548
510 $h -= $l - 1; 549 $h -= $l - 1;
511 550
512 if (0) { 551 if (0) { # !AIO
513 if ($l) { 552 if ($l) {
514 sysseek $fh, $l, 0; 553 sysseek $fh, $l, 0;
515 } 554 }
516 } 555 }
556
557 my $transfer = $queue->start_transfer($h);
558 my $locked;
559 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
517 560
518 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
519 if (0) { 574 if (0) { # !AIO
520 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 575 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
521 or last; 576 or last;
522 } else { 577 } else {
523 undef $buf; 578 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
524 $aio_requests->down;
525 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
526 $buf, 0, sub { 579 $buf, 0, sub {
527 $r = $_[0]; 580 $r = $_[0];
528 $current->ready; 581 Coro::ready($current);
529 }); 582 });
530 &Coro::schedule; 583 &Coro::schedule;
531 $aio_requests->up;
532 last unless $r; 584 last unless $r;
533 } 585 }
534 my $w = $self->{fh}->syswrite($buf) 586 my $w = syswrite $self->{fh}, $buf
535 or last; 587 or last;
536 $::written += $w; 588 $::written += $w;
537 $self->{written} += $w; 589 $self->{written} += $w;
538 $l += $r; 590 $l += $r;
539 } 591 }

Diff Legend

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