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.10 by root, Sat Aug 11 16:34:47 2001 UTC vs.
Revision 1.18 by root, Wed Aug 15 03:13:36 2001 UTC

… …
43 43
44my $http_port = new Coro::Socket 44my $http_port = new Coro::Socket
45 LocalAddr => $SERVER_HOST, 45 LocalAddr => $SERVER_HOST,
46 LocalPort => $SERVER_PORT, 46 LocalPort => $SERVER_PORT,
47 ReuseAddr => 1, 47 ReuseAddr => 1,
48 Listen => 1, 48 Listen => 50,
49 or die "unable to start server"; 49 or die "unable to start server";
50 50
51push @listen_sockets, $http_port; 51push @listen_sockets, $http_port;
52 52
53# the "main thread" 53# the "main thread"
… …
70package conn; 70package conn;
71 71
72use Socket; 72use Socket;
73use HTTP::Date; 73use HTTP::Date;
74use Convert::Scalar 'weaken'; 74use Convert::Scalar 'weaken';
75use Linux::AIO;
76
77Linux::AIO::min_parallel $::AIO_PARALLEL;
78
79Event->io(fd => Linux::AIO::poll_fileno,
80 poll => 'r', async => 1,
81 cb => \&Linux::AIO::poll_cb );
75 82
76our %conn; # $conn{ip}{fh} => connobj 83our %conn; # $conn{ip}{fh} => connobj
77our %blocked; 84our %blocked;
78our %mimetype; 85our %mimetype;
79 86
… …
99 my $self = bless { fh => $fh }, $class; 106 my $self = bless { fh => $fh }, $class;
100 my (undef, $iaddr) = unpack_sockaddr_in $peername 107 my (undef, $iaddr) = unpack_sockaddr_in $peername
101 or $self->err(500, "unable to decode peername"); 108 or $self->err(500, "unable to decode peername");
102 109
103 $self->{remote_addr} = inet_ntoa $iaddr; 110 $self->{remote_addr} = inet_ntoa $iaddr;
111 $self->{time} = $::NOW;
104 112
105 # enter ourselves into various lists 113 # enter ourselves into various lists
106 weaken ($conn{$self->{remote_addr}}{$self*1} = $self); 114 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
107 115
116 $::conns++;
117
108 $self; 118 $self;
109} 119}
110 120
111sub DESTROY { 121sub DESTROY {
112 my $self = shift; 122 my $self = shift;
123
124 $::conns--;
125
113 delete $conn{$self->{remote_addr}}{$self*1}; 126 delete $conn{$self->{remote_addr}}{$self*1};
114 delete $uri{$self->{uri}}{$self*1}; 127 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
115} 128}
116 129
117sub slog { 130sub slog {
118 my $self = shift; 131 my $self = shift;
119 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 132 main::slog($_[0], "$self->{remote_addr}> $_[1]");
120} 133}
121 134
122sub response { 135sub response {
123 my ($self, $code, $msg, $hdr, $content) = @_; 136 my ($self, $code, $msg, $hdr, $content) = @_;
124 my $res = "HTTP/1.0 $code $msg\015\012"; 137 my $res = "HTTP/1.1 $code $msg\015\012";
125 138
126 $res .= "Connection: close\015\012"; 139 #$res .= "Connection: close\015\012";
127 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 140 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(
128 141
129 while (my ($h, $v) = each %$hdr) { 142 while (my ($h, $v) = each %$hdr) {
130 $res .= "$h: $v\015\012" 143 $res .= "$h: $v\015\012"
131 } 144 }
132 $res .= "\015\012"; 145 $res .= "\015\012";
133 146
134 $res .= $content if defined $content and $self->{method} eq "GET"; 147 $res .= $content if defined $content and $self->{method} ne "HEAD";
135 148
136 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 149 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d#
137 150
151 $self->{written} +=
138 print {$self->{fh}} $res; 152 print {$self->{fh}} $res;
139} 153}
140 154
141sub err { 155sub err {
142 my $self = shift; 156 my $self = shift;
143 my ($code, $msg, $hdr, $content) = @_; 157 my ($code, $msg, $hdr, $content) = @_;
… …
145 unless (defined $content) { 159 unless (defined $content) {
146 $content = "$code $msg"; 160 $content = "$code $msg";
147 $hdr->{"Content-Type"} = "text/plain"; 161 $hdr->{"Content-Type"} = "text/plain";
148 $hdr->{"Content-Length"} = length $content; 162 $hdr->{"Content-Length"} = length $content;
149 } 163 }
164 $hdr->{"Connection"} = "close";
150 165
151 $self->response($code, $msg, $hdr, $content); 166 $self->response($code, $msg, $hdr, $content);
152 167
153 die bless {}, err::; 168 die bless {}, err::;
154} 169}
… …
156sub err_blocked { 171sub err_blocked {
157 my $self = shift; 172 my $self = shift;
158 my $ip = $self->{remote_addr}; 173 my $ip = $self->{remote_addr};
159 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME; 174 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
160 175
161 Coro::Event::do_timer(after => 5); 176 Coro::Event::do_timer(after => 15);
162 177
163 $self->err(403, "too many connections", 178 $self->err(401, "too many connections",
164 { 179 {
165 "Content-Type" => "text/html", 180 "Content-Type" => "text/html",
166 "Retry-After" => $::BLOCKTIME 181 "Retry-After" => $::BLOCKTIME
167 }, 182 },
168 <<EOF); 183 <<EOF);
… …
180 195
181sub handle { 196sub handle {
182 my $self = shift; 197 my $self = shift;
183 my $fh = $self->{fh}; 198 my $fh = $self->{fh};
184 199
200 $fh->timeout($::REQ_TIMEOUT);
185 #while() { 201 while() {
202 $self->{reqs}++;
203
204 # read request and parse first line
205 my $req = $fh->readline("\015\012\015\012");
206
207 unless (defined $req) {
208 if (exists $self->{version}) {
209 last;
210 } else {
211 $self->err(408, "request timeout");
212 }
213 }
214
186 $self->{h} = {}; 215 $self->{h} = {};
187 216
188 # read request and parse first line
189 $fh->timeout($::REQ_TIMEOUT);
190 my $req = $fh->readline("\015\012\015\012");
191 $fh->timeout($::RES_TIMEOUT); 217 $fh->timeout($::RES_TIMEOUT);
192
193 defined $req or
194 $self->err(408, "request timeout");
195
196 my $ip = $self->{remote_addr}; 218 my $ip = $self->{remote_addr};
197 219
198 if ($blocked{$ip}) { 220 if ($blocked{$ip}) {
199 $self->err_blocked($blocked{$ip}) 221 $self->err_blocked($blocked{$ip})
200 if $blocked{$ip} > $::NOW; 222 if $blocked{$ip} > $::NOW;
201 223
202 delete $blocked{$ip}; 224 delete $blocked{$ip};
203 } 225 }
204 226
205 if (%{$conn{$ip}} > $::MAX_CONN_IP) { 227 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
206 $self->slog("blocked ip $ip"); 228 $self->slog(2, "blocked ip $ip");
207 $self->err_blocked; 229 $self->err_blocked;
208 } 230 }
209 231
210 $req =~ /^(?:\015\012)? 232 $req =~ /^(?:\015\012)?
211 (GET|HEAD) \040+ 233 (GET|HEAD) \040+
212 ([^\040]+) \040+ 234 ([^\040]+) \040+
213 HTTP\/([0-9]+\.[0-9]+) 235 HTTP\/([0-9]+\.[0-9]+)
214 \015\012/gx 236 \015\012/gx
215 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 237 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
216
217 $2 ne "1.0"
218 or $self->err(506, "http protocol version not supported");
219 238
220 $self->{method} = $1; 239 $self->{method} = $1;
221 $self->{uri} = $2; 240 $self->{uri} = $2;
241 $self->{version} = $3;
242
243 $3 eq "1.0" or $3 eq "1.1"
244 or $self->err(506, "http protocol version $3 not supported");
222 245
223 # parse headers 246 # parse headers
224 { 247 {
225 my (%hdr, $h, $v); 248 my (%hdr, $h, $v);
226 249
… …
239 while ($h, $v) = each %hdr; 262 while ($h, $v) = each %hdr;
240 } 263 }
241 264
242 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 265 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80;
243 266
244 weaken ($uri{$self->{uri}}{$self*1} = $self); 267 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);
245 268
246 $self->map_uri; 269 $self->map_uri;
247 $self->respond; 270 $self->respond;
271
272 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1";
273
274 $self->slog(9, "persistant connection [".$self->{h}{"user-agent"}."][$self->{reqs}]");
275 $fh->timeout($::PER_TIMEOUT);
248 #} 276 }
249} 277}
250 278
251# uri => path mapping 279# uri => path mapping
252sub map_uri { 280sub map_uri {
253 my $self = shift; 281 my $self = shift;
… …
397 $self->err(416, "not satisfiable", $hdr); 425 $self->err(416, "not satisfiable", $hdr);
398 426
399satisfiable: 427satisfiable:
400 # check for segmented downloads 428 # check for segmented downloads
401 if ($l && $::NO_SEGMENTED) { 429 if ($l && $::NO_SEGMENTED) {
402 if (%{$uri{$self->{uri}}} > 1) { 430 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {
403 $self->slog("segmented download refused\n"); 431 Coro::Event::do_timer(after => 15);
432
404 $self->err(400, "segmented downloads are not allowed"); 433 $self->err(400, "segmented downloads are not allowed");
405 } 434 }
406 } 435 }
407 436
408 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 437 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
419 $hdr->{"Content-Length"} = $length; 448 $hdr->{"Content-Length"} = $length;
420 449
421 $self->response(@code, $hdr, ""); 450 $self->response(@code, $hdr, "");
422 451
423 if ($self->{method} eq "GET") { 452 if ($self->{method} eq "GET") {
424 my ($fh, $buf); 453 my ($fh, $buf, $r);
454 my $current = $Coro::current;
425 open $fh, "<", $self->{path} 455 open $fh, "<", $self->{path}
426 or die "$self->{path}: late open failure ($!)"; 456 or die "$self->{path}: late open failure ($!)";
427 457
428 if ($l) {
429 sysseek $fh, $l, 0
430 or die "$self->{path}: cannot seek to $l ($!)";
431 }
432
433 $h -= $l - 1; 458 $h -= $l - 1;
434 459
435 while ($h > 0) { 460 while ($h > 0) {
436 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 461 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
462 $buf, 0, sub {
463 $r = $_[0];
464 $current->ready;
465 });
466 &Coro::schedule;
467 last unless $r;
437 $self->{fh}->syswrite($buf) 468 my $w = $self->{fh}->syswrite($buf)
438 or last; 469 or last;
470 $::written += $w;
471 $self->{written} += $w;
472 $l += $r;
439 } 473 }
440 } 474 }
441 475
442 close $fh; 476 close $fh;
443} 477}

Diff Legend

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