[ViewVC] Diff of: cvs/cvsroot/Coro/myhttpd/httpd.pl

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.9 by root, Sat Aug 11 12:49:21 2001 UTC vs.
Revision 1.27 by root, Sun Aug 19 23:57:52 2001 UTC

…		…
9	# at least on my machine, this thingy serves files	9	# at least on my machine, this thingy serves files
10	# quite a bit faster than apache, ;)	10	# quite a bit faster than apache, ;)
11	# and quite a bit slower than thttpd :(	11	# and quite a bit slower than thttpd :(
12		12
13	$SIG{PIPE} = 'IGNORE';	13	$SIG{PIPE} = 'IGNORE';
14		14
		15	our $accesslog;
		16
		17	if ($ACCESS_LOG) {
		18	use IO::Handle;
		19	open $accesslog, ">>$ACCESS_LOG"
		20	or die "$ACCESS_LOG: $!";
		21	$accesslog->autoflush(1);
		22	}
		23
15	sub slog {	24	sub slog {
16	my $level = shift;	25	my $level = shift;
17	my $format = shift;	26	my $format = shift;
18	printf "---: $format\n", @_;	27	printf "---: $format\n", @_;
19	}	28	}
…		…
43		52
44	my $http_port = new Coro::Socket	53	my $http_port = new Coro::Socket
45	LocalAddr => $SERVER_HOST,	54	LocalAddr => $SERVER_HOST,
46	LocalPort => $SERVER_PORT,	55	LocalPort => $SERVER_PORT,
47	ReuseAddr => 1,	56	ReuseAddr => 1,
48	Listen => 1,	57	Listen => 50,
49	or die "unable to start server";	58	or die "unable to start server";
50		59
51	push @listen_sockets, $http_port;	60	push @listen_sockets, $http_port;
52		61
53	# the "main thread"	62	# the "main thread"
…		…
70	package conn;	79	package conn;
71		80
72	use Socket;	81	use Socket;
73	use HTTP::Date;	82	use HTTP::Date;
74	use Convert::Scalar 'weaken';	83	use Convert::Scalar 'weaken';
		84	use Linux::AIO;
75		85
		86	Linux::AIO::min_parallel $::AIO_PARALLEL;
		87
		88	Event->io(fd => Linux::AIO::poll_fileno,
		89	poll => 'r', async => 1,
		90	cb => \&Linux::AIO::poll_cb);
		91
76	our %conn; # $conn{ip}{fh} => connobj	92	our %conn; # $conn{ip}{self} => connobj
		93	our %uri; # $uri{ip}{uri}{self}
77	our %blocked;	94	our %blocked;
78	our %mimetype;	95	our %mimetype;
79		96
80	sub read_mimetypes {	97	sub read_mimetypes {
81	local *M;	98	local *M;
82	if (open M, "<mimetypes") {	99	if (open M, "<mime_types") {
83	while (<M>) {	100	while (<M>) {
84	if (/^([^#]\S+)\t+(\S+)$/) {	101	if (/^([^#]\S+)\t+(\S+)$/) {
85	$mimetype{lc $1} = $2;	102	$mimetype{lc $1} = $2;
86	}	103	}
87	}	104	}
88	} else {	105	} else {
89	$self->slog(1, "cannot open mimetypes\n");	106	print "cannot open mime_types\n";
90	}	107	}
91	}	108	}
		109
		110	read_mimetypes;
92		111
93	sub new {	112	sub new {
94	my $class = shift;	113	my $class = shift;
95	my $peername = shift;	114	my $peername = shift;
96	my $fh = shift;	115	my $fh = shift;
97	my $self = bless { fh => $fh }, $class;	116	my $self = bless { fh => $fh }, $class;
98	my (undef, $iaddr) = unpack_sockaddr_in $peername	117	my (undef, $iaddr) = unpack_sockaddr_in $peername
99	or $self->err(500, "unable to decode peername");	118	or $self->err(500, "unable to decode peername");
100		119
101	$self->{remote_addr} = inet_ntoa $iaddr;	120	$self->{remote_addr} = inet_ntoa $iaddr;
		121	$self->{time} = $::NOW;
102		122
103	# enter ourselves into various lists	123	# enter ourselves into various lists
104	weaken ($conn{$self->{remote_addr}}{$self*1} = $self);	124	weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
105		125
		126	$::conns++;
		127
106	$self;	128	$self;
107	}	129	}
108		130
109	sub DESTROY {	131	sub DESTROY {
110	my $self = shift;	132	my $self = shift;
		133
		134	$::conns--;
		135
		136	$self->eoconn;
111	delete $conn{$self->{remote_addr}}{$self*1};	137	delete $conn{$self->{remote_addr}}{$self*1};
		138	}
		139
		140	# end of connection
		141	sub eoconn {
		142	my $self = shift;
112	delete $uri{$self->{uri}}{$self*1};	143	delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
113	}	144	}
114		145
115	sub slog {	146	sub slog {
116	my $self = shift;	147	my $self = shift;
117	main::slog($_[0], "$self->{remote_addr}> $_[1]");	148	main::slog($_[0], "$self->{remote_addr}> $_[1]");
118	}	149	}
119		150
120	sub response {	151	sub response {
121	my ($self, $code, $msg, $hdr, $content) = @_;	152	my ($self, $code, $msg, $hdr, $content) = @_;
122	my $res = "HTTP/1.0 $code $msg\015\012";	153	my $res = "HTTP/1.1 $code $msg\015\012";
123		154
124	$res .= "Connection: close\015\012";	155	#$res .= "Connection: close\015\012";
125	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(	156	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(
126		157
127	while (my ($h, $v) = each %$hdr) {	158	while (my ($h, $v) = each %$hdr) {
128	$res .= "$h: $v\015\012"	159	$res .= "$h: $v\015\012"
129	}	160	}
		161	$res .= "\015\012";
130		162
131	$res .= "\015\012$content" if defined $content;	163	$res .= $content if defined $content and $self->{method} ne "HEAD";
132		164
133	print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d#	165	my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
134		166
		167	print $accesslog $log if $accesslog;
		168	print STDERR $log;
		169
		170	$self->{written} +=
135	print {$self->{fh}} $res;	171	print {$self->{fh}} $res;
136	}	172	}
137		173
138	sub err {	174	sub err {
139	my $self = shift;	175	my $self = shift;
140	my ($code, $msg, $hdr, $content) = @_;	176	my ($code, $msg, $hdr, $content) = @_;
…		…
142	unless (defined $content) {	178	unless (defined $content) {
143	$content = "$code $msg";	179	$content = "$code $msg";
144	$hdr->{"Content-Type"} = "text/plain";	180	$hdr->{"Content-Type"} = "text/plain";
145	$hdr->{"Content-Length"} = length $content;	181	$hdr->{"Content-Length"} = length $content;
146	}	182	}
		183	$hdr->{"Connection"} = "close";
147		184
148	$self->response($code, $msg, $hdr, $content);	185	$self->response($code, $msg, $hdr, $content);
149		186
150	die bless {}, err::;	187	die bless {}, err::;
151	}	188	}
152		189
153	sub err_blocked {	190	sub err_blocked {
154	my $self = shift;	191	my $self = shift;
155	my $ip = $self->{remote_addr};	192	my $ip = $self->{remote_addr};
156	my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;	193	my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
		194
		195	Coro::Event::do_timer(after => 20*rand);
		196
157	$self->err(403, "too many connections",	197	$self->err(401, "too many connections",
158	{	198	{
159	"Content-Type" => "text/html",	199	"Content-Type" => "text/html",
160	"Retry-After" => $::BLOCKTIME	200	"Retry-After" => $::BLOCKTIME,
		201	"Warning" => "Please do NOT retry, you have been blocked",
		202	"WWW-Authenticate" => "Basic realm=\"Please do NOT retry, you have been blocked\"",
161	},	203	},
162	<<EOF);	204	<<EOF);
163	<html><p>	205	<html>
		206	<head>
		207	<title>Too many connections</title>
		208	</head>
		209	<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000">
		210
164	You have been blocked because you opened too many connections. You	211	<p>You have been blocked because you opened too many connections. You
165	may retry at</p>	212	may retry at</p>
166		213
167	<p><blockquote>$time.</blockquote></p>	214	<p><blockquote>$time.</blockquote></p>
168		215
169	<p>Until then, each new access will renew the block. You might want to have a	216	<p>Until then, each new access will renew the block. You might want to have a
170	look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>	217	look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
171	</html>	218
		219	</body></html>
172	EOF	220	EOF
173	}	221	}
174		222
175	sub handle {	223	sub handle {
176	my $self = shift;	224	my $self = shift;
177	my $fh = $self->{fh};	225	my $fh = $self->{fh};
178		226
		227	$fh->timeout($::REQ_TIMEOUT);
179	#while() {	228	while() {
		229	$self->{reqs}++;
		230
		231	# read request and parse first line
		232	my $req = $fh->readline("\015\012\015\012");
		233
		234	unless (defined $req) {
		235	if (exists $self->{version}) {
		236	last;
		237	} else {
		238	$self->err(408, "request timeout");
		239	}
		240	}
		241
180	$self->{h} = {};	242	$self->{h} = {};
181		243
182	# read request and parse first line
183	$fh->timeout($::REQ_TIMEOUT);
184	my $req = $fh->readline("\015\012\015\012");
185	$fh->timeout($::RES_TIMEOUT);	244	$fh->timeout($::RES_TIMEOUT);
186
187	defined $req or
188	$self->err(408, "request timeout");
189
190	my $ip = $self->{remote_addr};	245	my $ip = $self->{remote_addr};
191		246
192	if ($blocked{$ip}) {	247	if ($blocked{$ip}) {
193	$self->err_blocked($blocked{$ip})	248	$self->err_blocked($blocked{$ip})
194	if $blocked{$ip} > $::NOW;	249	if $blocked{$ip} > $::NOW;
195		250
196	delete $blocked{$ip};	251	delete $blocked{$ip};
197	}	252	}
198		253
199	if (%{$conn{$ip}} > $::MAX_CONN_IP) {	254	if (%{$conn{$ip}} > $::MAX_CONN_IP) {
200	$self->slog("blocked ip $ip");	255	$self->slog(2, "blocked ip $ip");
201	$self->err_blocked;	256	$self->err_blocked;
202	}	257	}
203		258
204	$req =~ /^(?:\015\012)?	259	$req =~ /^(?:\015\012)?
205	(GET\|HEAD) \040+	260	(GET\|HEAD) \040+
206	([^\040]+) \040+	261	([^\040]+) \040+
207	HTTP\/([0-9]+\.[0-9]+)	262	HTTP\/([0-9]+\.[0-9]+)
208	\015\012/gx	263	\015\012/gx
209	or $self->err(403, "method not allowed", { Allow => "GET,HEAD" });	264	or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
210
211	$2 ne "1.0"
212	or $self->err(506, "http protocol version not supported");
213		265
214	$self->{method} = $1;	266	$self->{method} = $1;
215	$self->{uri} = $2;	267	$self->{uri} = $2;
		268	$self->{version} = $3;
		269
		270	$3 =~ /^1\./
		271	or $self->err(506, "http protocol version $3 not supported");
216		272
217	# parse headers	273	# parse headers
218	{	274	{
219	my (%hdr, $h, $v);	275	my (%hdr, $h, $v);
220		276
…		…
233	while ($h, $v) = each %hdr;	289	while ($h, $v) = each %hdr;
234	}	290	}
235		291
236	$self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80;	292	$self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80;
237		293
238	weaken ($uri{$self->{uri}}{$self*1} = $self);	294	weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);
239		295
		296	eval {
240	$self->map_uri;	297	$self->map_uri;
241	$self->respond;	298	$self->respond;
		299	};
		300
		301	$self->eoconn;
		302
		303	die if $@ && !ref $@;
		304
		305	last if $self->{h}{connection} =~ /close/ \|\| $self->{version} lt "1.1";
		306
		307	$self->slog(9, "persistent connection [".$self->{h}{"user-agent"}."][$self->{reqs}]");
		308	$fh->timeout($::PER_TIMEOUT);
242	#}	309	}
243	}	310	}
244		311
245	# uri => path mapping	312	# uri => path mapping
246	sub map_uri {	313	sub map_uri {
247	my $self = shift;	314	my $self = shift;
…		…
304	if (chdir $::DOCROOT) {	371	if (chdir $::DOCROOT) {
305	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike	372	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
306	$ENV{HTTP_HOST} = $self->server_host;	373	$ENV{HTTP_HOST} = $self->server_host;
307	$ENV{HTTP_PORT} = $self->{server_host};	374	$ENV{HTTP_PORT} = $self->{server_host};
308	$ENV{SCRIPT_NAME} = $self->{name};	375	$ENV{SCRIPT_NAME} = $self->{name};
309	exec $::INDEXPROG;	376	exec $path;
310	}	377	}
311	Coro::State::_exit(0);	378	Coro::State::_exit(0);
312	} else {	379	} else {
313	}	380	}
314	}	381	}
…		…
317	my $self = shift;	384	my $self = shift;
318	my $path = $self->{path};	385	my $path = $self->{path};
319		386
320	stat $path	387	stat $path
321	or $self->err(404, "not found");	388	or $self->err(404, "not found");
		389
		390	$self->{stat} = [stat _];
322		391
323	# idiotic netscape sends idiotic headers AGAIN	392	# idiotic netscape sends idiotic headers AGAIN
324	my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/	393	my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
325	? str2time $1 : 0;	394	? str2time $1 : 0;
326		395
…		…
329	if ($path !~ /\/$/) {	398	if ($path !~ /\/$/) {
330	# create a redirect to get the trailing "/"	399	# create a redirect to get the trailing "/"
331	my $host = $self->server_hostport;	400	my $host = $self->server_hostport;
332	$self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });	401	$self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
333	} else {	402	} else {
334	$ims < (stat _)[9]	403	$ims < $self->{stat}[9]
335	or $self->err(304, "not modified");	404	or $self->err(304, "not modified");
336		405
337	if ($self->{method} eq "GET") {
338	if (-r "$path/index.html") {	406	if (-r "$path/index.html") {
339	$self->{path} .= "/index.html";	407	$self->{path} .= "/index.html";
340	$self->handle_file;	408	$self->handle_file;
341	} else {	409	} else {
342	$self->handle_dir;	410	$self->handle_dir;
343	}
344	}	411	}
345	}	412	}
346	} elsif (-f _ && -r _) {	413	} elsif (-f _ && -r _) {
347	-x _ and $self->err(403, "forbidden");	414	-x _ and $self->err(403, "forbidden");
348	$self->handle_file;	415	$self->handle_file;
…		…
351	}	418	}
352	}	419	}
353		420
354	sub handle_dir {	421	sub handle_dir {
355	my $self = shift;	422	my $self = shift;
356	$self->_cgi($::INDEXPROG);	423	my $idx = $self->diridx;
		424
		425	$self->response(200, "ok",
		426	{
		427	"Content-Type" => "text/html",
		428	"Content-Length" => length $idx,
		429	},
		430	$idx);
357	}	431	}
358		432
359	sub handle_file {	433	sub handle_file {
360	my $self = shift;	434	my $self = shift;
361	my $length = -s _;	435	my $length = -s _;
…		…
374	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);	448	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);
375	} else {	449	} else {
376	($l, $h) = (0, $length - 1);	450	($l, $h) = (0, $length - 1);
377	goto ignore;	451	goto ignore;
378	}	452	}
379	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l;	453	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
380	}	454	}
381	$hdr->{"Content-Range"} = "bytes */$length";	455	$hdr->{"Content-Range"} = "bytes */$length";
		456	$hdr->{"Content-Length"} = $length;
		457	$self->slog(9, "not satisfiable($self->{h}{range}\|".$self->{h}{"user-agent"}.")");
382	$self->err(416, "not satisfiable", $hdr);	458	$self->err(416, "not satisfiable", $hdr, "");
383		459
384	satisfiable:	460	satisfiable:
385	# check for segmented downloads	461	# check for segmented downloads
386	if ($l && $NO_SEGMENTED) {	462	if ($l && $::NO_SEGMENTED) {
387	if (%{$uri{$self->{uri}}} > 1) {	463	if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {
388	$self->slog("segmented download refused\n");
389	$self->err(400, "segmented downloads are not allowed");	464	$self->err(400, "segmented downloads are not allowed");
390	}	465	}
391	}	466	}
392		467
393	$hdr->{"Content-Range"} = "bytes $l-$h/$length";	468	$hdr->{"Content-Range"} = "bytes $l-$h/$length";
…		…
404	$hdr->{"Content-Length"} = $length;	479	$hdr->{"Content-Length"} = $length;
405		480
406	$self->response(@code, $hdr, "");	481	$self->response(@code, $hdr, "");
407		482
408	if ($self->{method} eq "GET") {	483	if ($self->{method} eq "GET") {
409	my ($fh, $buf);	484	my ($fh, $buf, $r);
		485	my $current = $Coro::current;
410	open $fh, "<", $self->{path}	486	open $fh, "<", $self->{path}
411	or die "$self->{path}: late open failure ($!)";	487	or die "$self->{path}: late open failure ($!)";
412		488
413	if ($l) {
414	sysseek $fh, $l, 0
415	or die "$self->{path}: cannot seek to $l ($!)";
416	}
417
418	$h -= $l - 1;	489	$h -= $l - 1;
419		490
		491	if (0) {
		492	if ($l) {
		493	sysseek $fh, $l, 0;
		494	}
		495	}
		496
420	while ($h > 0) {	497	while ($h > 0) {
		498	if (0) {
421	$h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h;	499	sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
		500	or last;
		501	} else {
		502	aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
		503	$buf, 0, sub {
		504	$r = $_[0];
		505	$current->ready;
		506	});
		507	&Coro::schedule;
		508	last unless $r;
		509	}
422	$self->{fh}->syswrite($buf)	510	my $w = $self->{fh}->syswrite($buf)
423	or last;	511	or last;
		512	$::written += $w;
		513	$self->{written} += $w;
		514	$l += $r;
424	}	515	}
425	}	516	}
426		517
427	close $fh;	518	close $fh;
428	}	519	}

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.9 by root, Sat Aug 11 12:49:21 2001 UTC vs. Revision 1.27 by root, Sun Aug 19 23:57:52 2001 UTC

Diff Legend

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.9 by root, Sat Aug 11 12:49:21 2001 UTC vs.
Revision 1.27 by root, Sun Aug 19 23:57:52 2001 UTC