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

Diff Legend

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