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

Diff Legend

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