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.68 by root, Mon May 20 04:08:03 2002 UTC vs.
Revision 1.73 by root, Sat Oct 5 09:02:17 2002 UTC

… …
55our $httpevent = new Coro::Signal; 55our $httpevent = new Coro::Signal;
56 56
57our $queue_file = new transferqueue $MAX_TRANSFERS; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10; 58our $queue_index = new transferqueue 10;
59 59
60our $tbf_top = new tbf rate => 200000; 60our $tbf_top = new tbf rate => $TBF_RATE || 100000;
61 61
62my $unused_bytes = 0; 62my $unused_bytes = 0;
63my $unused_last = time; 63my $unused_last = time;
64 64
65sub unused_bandwidth { 65sub unused_bandwidth {
… …
110 if (@pool) { 110 if (@pool) {
111 (pop @pool)->ready; 111 (pop @pool)->ready;
112 } else { 112 } else {
113 async \&handler; 113 async \&handler;
114 } 114 }
115
116 } 115 }
117 }; 116 };
118} 117}
119 118
120my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
… …
193 192
194sub DESTROY { 193sub DESTROY {
195 #my $self = shift; 194 #my $self = shift;
196 $::conns--; 195 $::conns--;
197} 196}
197
198sub prune_cache {
199 my $hash = $_[0];
200
201 for (keys %$hash) {
202 if (ref $hash->{$_} eq HASH::) {
203 prune_cache($hash->{$_});
204 unless (scalar keys %{$hash->{$_}}) {
205 delete $hash->{$_};
206 $d2++;
207 }
208 }
209 }
210}
211
212sub prune_caches {
213 prune_cache \%conn;
214 prune_cache \%uri;
215
216 for (keys %blocked) {
217 delete $blocked{$_} if $blocked{$_}[0] > $::NOW;
218 }
219}
220
221Event->timer(interval => 60, cb => \&prune_caches);
198 222
199sub slog { 223sub slog {
200 my $self = shift; 224 my $self = shift;
201 main::slog($_[0], "$self->{remote_id}> $_[1]"); 225 main::slog($_[0], "$self->{remote_id}> $_[1]");
202} 226}
… …
232 $hdr->{"Content-Length"} = length $content; 256 $hdr->{"Content-Length"} = length $content;
233 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig); 257 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
234 } 258 }
235 259
236 $res .= "Date: $HTTP_NOW\015\012"; 260 $res .= "Date: $HTTP_NOW\015\012";
261 $res .= "Server: $::NAME\015\012";
237 262
238 while (my ($h, $v) = each %$hdr) { 263 while (my ($h, $v) = each %$hdr) {
239 $res .= "$h: $v\015\012" 264 $res .= "$h: $v\015\012"
240 } 265 }
241 $res .= "\015\012"; 266 $res .= "\015\012";
… …
568 593
569 $self->response(@code, $hdr, ""); 594 $self->response(@code, $hdr, "");
570 595
571 if ($self->{method} eq "GET") { 596 if ($self->{method} eq "GET") {
572 $self->{time} = $::NOW; 597 $self->{time} = $::NOW;
598 $self->{written} = 0;
573 599
574 my $current = $Coro::current; 600 my $current = $Coro::current;
575 601
576 my ($fh, $buf, $r); 602 my ($fh, $buf, $r);
577 603
… …
593 while ($h > 0) { 619 while ($h > 0) {
594 unless ($locked) { 620 unless ($locked) {
595 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 621 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
596 $bufsize = $::BUFSIZE; 622 $bufsize = $::BUFSIZE;
597 $self->{time} = $::NOW; 623 $self->{time} = $::NOW;
624 $self->{written} = 0;
598 } 625 }
599 } 626 }
600 627
601 if ($blocked{$self->{remote_id}}) { 628 if ($blocked{$self->{remote_id}}) {
602 $self->{h}{connection} = "close"; 629 $self->{h}{connection} = "close";

Diff Legend

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