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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.16 by root, Tue Aug 14 19:38:25 2001 UTC vs.
Revision 1.29 by root, Sat Aug 25 15:14:03 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	}
…		…
74	use Convert::Scalar 'weaken';	83	use Convert::Scalar 'weaken';
75	use Linux::AIO;	84	use Linux::AIO;
76		85
77	Linux::AIO::min_parallel $::AIO_PARALLEL;	86	Linux::AIO::min_parallel $::AIO_PARALLEL;
78		87
		88	my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
		89
79	Event->io(fd => Linux::AIO::poll_fileno,	90	Event->io(fd => Linux::AIO::poll_fileno,
80	poll => 'r',	91	poll => 'r', async => 1,
81	async => 1,
82	cb => \&Linux::AIO::poll_cb );	92	cb => \&Linux::AIO::poll_cb);
83		93
84	Event->add_hooks(prepare => sub {
85	&Coro::cede while &Coro::nready;
86	1e6;
87	});
88
89	our %conn; # $conn{ip}{fh} => connobj	94	our %conn; # $conn{ip}{self} => connobj
		95	our %uri; # $uri{ip}{uri}{self}
90	our %blocked;	96	our %blocked;
91	our %mimetype;	97	our %mimetype;
92		98
93	sub read_mimetypes {	99	sub read_mimetypes {
94	local *M;	100	local *M;
…		…
127	sub DESTROY {	133	sub DESTROY {
128	my $self = shift;	134	my $self = shift;
129		135
130	$::conns--;	136	$::conns--;
131		137
		138	$self->eoconn;
132	delete $conn{$self->{remote_addr}}{$self*1};	139	delete $conn{$self->{remote_addr}}{$self*1};
		140	}
		141
		142	# end of connection
		143	sub eoconn {
		144	my $self = shift;
133	delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};	145	delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
134	}	146	}
135		147
136	sub slog {	148	sub slog {
137	my $self = shift;	149	my $self = shift;
138	main::slog($_[0], "$self->{remote_addr}> $_[1]");	150	main::slog($_[0], ($self->{remote_id} \|\| $self->{remote_addr}) ."> $_[1]");
139	}	151	}
140		152
141	sub response {	153	sub response {
142	my ($self, $code, $msg, $hdr, $content) = @_;	154	my ($self, $code, $msg, $hdr, $content) = @_;
143	my $res = "HTTP/1.0 $code $msg\015\012";	155	my $res = "HTTP/1.1 $code $msg\015\012";
144		156
145	$res .= "Connection: close\015\012";	157	$self->{h}{connection} \|\|= $hdr->{Connection};
		158
146	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(	159	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(
147		160
148	while (my ($h, $v) = each %$hdr) {	161	while (my ($h, $v) = each %$hdr) {
149	$res .= "$h: $v\015\012"	162	$res .= "$h: $v\015\012"
150	}	163	}
151	$res .= "\015\012";	164	$res .= "\015\012";
152		165
153	$res .= $content if defined $content and $self->{method} ne "HEAD";	166	$res .= $content if defined $content and $self->{method} ne "HEAD";
154		167
155	print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d#	168	my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
		169
		170	print $accesslog $log if $accesslog;
		171	print STDERR $log;
156		172
157	$self->{written} +=	173	$self->{written} +=
158	print {$self->{fh}} $res;	174	print {$self->{fh}} $res;
159	}	175	}
160		176
…		…
165	unless (defined $content) {	181	unless (defined $content) {
166	$content = "$code $msg";	182	$content = "$code $msg";
167	$hdr->{"Content-Type"} = "text/plain";	183	$hdr->{"Content-Type"} = "text/plain";
168	$hdr->{"Content-Length"} = length $content;	184	$hdr->{"Content-Length"} = length $content;
169	}	185	}
		186	$hdr->{"Connection"} = "close";
170		187
171	$self->response($code, $msg, $hdr, $content);	188	$self->response($code, $msg, $hdr, $content);
172		189
173	die bless {}, err::;	190	die bless {}, err::;
174	}	191	}
…		…
176	sub err_blocked {	193	sub err_blocked {
177	my $self = shift;	194	my $self = shift;
178	my $ip = $self->{remote_addr};	195	my $ip = $self->{remote_addr};
179	my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;	196	my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
180		197
181	Coro::Event::do_timer(after => 15);	198	Coro::Event::do_timer(after => 20*rand);
182		199
183	$self->err(401, "too many connections",	200	$self->err(401, "too many connections",
184	{	201	{
185	"Content-Type" => "text/html",	202	"Content-Type" => "text/html",
186	"Retry-After" => $::BLOCKTIME	203	"Retry-After" => $::BLOCKTIME,
		204	"Warning" => "Please do NOT retry, you have been blocked",
		205	"WWW-Authenticate" => "Basic realm=\"Please do NOT retry, you have been blocked\"",
		206	"Connection" => "close",
187	},	207	},
188	<<EOF);	208	<<EOF);
189	<html><p>	209	<html>
		210	<head>
		211	<title>Too many connections</title>
		212	</head>
		213	<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000">
		214
190	You have been blocked because you opened too many connections. You	215	<p>You have been blocked because you opened too many connections. You
191	may retry at</p>	216	may retry at</p>
192		217
193	<p><blockquote>$time.</blockquote></p>	218	<p><blockquote>$time.</blockquote></p>
194		219
195	<p>Until then, each new access will renew the block. You might want to have a	220	<p>Until then, each new access will renew the block. You might want to have a
196	look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>	221	look at the <a href="http://www.goof.com/pcg/marc/animefaq.html#connectionlimit">FAQ</a>.</p>
197	</html>	222
		223	</body></html>
198	EOF	224	EOF
199	}	225	}
200		226
201	sub handle {	227	sub handle {
202	my $self = shift;	228	my $self = shift;
203	my $fh = $self->{fh};	229	my $fh = $self->{fh};
204		230
		231	my $host;
		232
		233	$fh->timeout($::REQ_TIMEOUT);
205	#while() {	234	while() {
		235	$self->{reqs}++;
		236
		237	# read request and parse first line
		238	my $req = $fh->readline("\015\012\015\012");
		239
		240	unless (defined $req) {
		241	if (exists $self->{version}) {
		242	last;
		243	} else {
		244	$self->err(408, "request timeout");
		245	}
		246	}
		247
206	$self->{h} = {};	248	$self->{h} = {};
207		249
208	# read request and parse first line
209	$fh->timeout($::REQ_TIMEOUT);
210	my $req = $fh->readline("\015\012\015\012");
211	$fh->timeout($::RES_TIMEOUT);	250	$fh->timeout($::RES_TIMEOUT);
212
213	defined $req or
214	$self->err(408, "request timeout");
215
216	my $ip = $self->{remote_addr};	251	my $ip = $self->{remote_addr};
217		252
218	if ($blocked{$ip}) {	253	if ($blocked{$ip}) {
219	$self->err_blocked($blocked{$ip})	254	$self->err_blocked($blocked{$ip})
220	if $blocked{$ip} > $::NOW;	255	if $blocked{$ip} > $::NOW;
…		…
232	([^\040]+) \040+	267	([^\040]+) \040+
233	HTTP\/([0-9]+\.[0-9]+)	268	HTTP\/([0-9]+\.[0-9]+)
234	\015\012/gx	269	\015\012/gx
235	or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });	270	or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
236		271
237	$2 ne "1.0"
238	or $self->err(506, "http protocol version not supported");
239
240	$self->{method} = $1;	272	$self->{method} = $1;
241	$self->{uri} = $2;	273	$self->{uri} = $2;
		274	$self->{version} = $3;
		275
		276	$3 =~ /^1\./
		277	or $self->err(506, "http protocol version $3 not supported");
242		278
243	# parse headers	279	# parse headers
244	{	280	{
245	my (%hdr, $h, $v);	281	my (%hdr, $h, $v);
246		282
…		…
257		293
258	$self->{h}{$h} = substr $v, 1	294	$self->{h}{$h} = substr $v, 1
259	while ($h, $v) = each %hdr;	295	while ($h, $v) = each %hdr;
260	}	296	}
261		297
		298	# find out server name and port
		299	if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
		300	$host = $1;
		301	} else {
		302	$host = $self->{h}{host};
		303	}
		304
		305	if (defined $host) {
262	$self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80;	306	$self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
		307	} else {
		308	($self->{server_port}, $host)
		309	= unpack_sockaddr_in $self->{fh}->getsockname
		310	or $self->err(500, "unable to get socket name");
		311	$host = inet_ntoa $host;
		312	}
		313
		314	$self->{server_name} = $host;
		315
		316	# remote id should be unique per user
		317	$self->{remote_id} = $self->{remote_addr};
		318
		319	if (exists $self->{h}{"client-ip"}) {
		320	$self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
		321	} elsif (exists $self->{h}{"x-forwarded-for"}) {
		322	$self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
		323	}
263		324
264	weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);	325	weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);
265		326
		327	eval {
266	$self->map_uri;	328	$self->map_uri;
267	$self->respond;	329	$self->respond;
		330	};
		331
		332	$self->eoconn;
		333
		334	die if $@ && !ref $@;
		335
		336	last if $self->{h}{connection} =~ /close/ \|\| $self->{version} < 1.1;
		337
		338	$fh->timeout($::PER_TIMEOUT);
268	#}	339	}
269	}	340	}
270		341
271	# uri => path mapping	342	# uri => path mapping
272	sub map_uri {	343	sub map_uri {
273	my $self = shift;	344	my $self = shift;
274	my $host = $self->{h}{host} \|\| "default";	345	my $host = $self->{server_name};
275	my $uri = $self->{uri};	346	my $uri = $self->{uri};
276		347
277	# some massaging, also makes it more secure	348	# some massaging, also makes it more secure
278	$uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;	349	$uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
279	$uri =~ s%//+%/%g;	350	$uri =~ s%//+%/%g;
…		…
289	$self->{path} = "$::DOCROOT/$host$uri";	360	$self->{path} = "$::DOCROOT/$host$uri";
290		361
291	$self->access_check;	362	$self->access_check;
292	}	363	}
293		364
294	sub server_address {
295	my $self = shift;
296	my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
297	or $self->err(500, "unable to get socket name");
298	((inet_ntoa $iaddr), $port);
299	}
300
301	sub server_host {
302	my $self = shift;
303	if (exists $self->{h}{host}) {
304	return $self->{h}{host};
305	} else {
306	return (($self->server_address)[0]);
307	}
308	}
309
310	sub server_hostport {
311	my $self = shift;
312	my ($host, $port);
313	if (exists $self->{h}{host}) {
314	($host, $port) = ($self->{h}{host}, $self->{server_port});
315	} else {
316	($host, $port) = $self->server_address;
317	}
318	$port = $port == 80 ? "" : ":$port";
319	$host.$port;
320	}
321
322	sub _cgi {	365	sub _cgi {
323	my $self = shift;	366	my $self = shift;
324	my $path = shift;	367	my $path = shift;
325	my $fh;	368	my $fh;
326		369
327	# no two-way xxx supported	370	# no two-way xxx supported
328	if (0 == fork) {	371	if (0 == fork) {
329	open STDOUT, ">&".fileno($self->{fh});	372	open STDOUT, ">&".fileno($self->{fh});
330	if (chdir $::DOCROOT) {	373	if (chdir $::DOCROOT) {
331	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike	374	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
332	$ENV{HTTP_HOST} = $self->server_host;	375	$ENV{HTTP_HOST} = $self->{server_name};
333	$ENV{HTTP_PORT} = $self->{server_host};	376	$ENV{HTTP_PORT} = $self->{server_port};
334	$ENV{SCRIPT_NAME} = $self->{name};	377	$ENV{SCRIPT_NAME} = $self->{name};
335	exec $path;	378	exec $path;
336	}	379	}
337	Coro::State::_exit(0);	380	Coro::State::_exit(0);
338	} else {	381	} else {
		382	die;
339	}	383	}
		384	}
		385
		386	sub server_hostport {
		387	$_[0]{server_port} == 80
		388	? $_[0]{server_name}
		389	: "$_[0]{server_name}:$_[0]{server_port}";
340	}	390	}
341		391
342	sub respond {	392	sub respond {
343	my $self = shift;	393	my $self = shift;
344	my $path = $self->{path};	394	my $path = $self->{path};
…		…
354		404
355	if (-d _ && -r _) {	405	if (-d _ && -r _) {
356	# directory	406	# directory
357	if ($path !~ /\/$/) {	407	if ($path !~ /\/$/) {
358	# create a redirect to get the trailing "/"	408	# create a redirect to get the trailing "/"
359	my $host = $self->server_hostport;	409	# we don't try to avoid the :80
360	$self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });	410	$self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
361	} else {	411	} else {
362	$ims < $self->{stat}[9]	412	$ims < $self->{stat}[9]
363	or $self->err(304, "not modified");	413	or $self->err(304, "not modified");
364		414
365	if ($self->{method} eq "GET") {
366	if (-r "$path/index.html") {	415	if (-r "$path/index.html") {
367	$self->{path} .= "/index.html";	416	$self->{path} .= "/index.html";
368	$self->handle_file;	417	$self->handle_file;
369	} else {	418	} else {
370	$self->handle_dir;	419	$self->handle_dir;
371	}
372	}	420	}
373	}	421	}
374	} elsif (-f _ && -r _) {	422	} elsif (-f _ && -r _) {
375	-x _ and $self->err(403, "forbidden");	423	-x _ and $self->err(403, "forbidden");
376	$self->handle_file;	424	$self->handle_file;
…		…
409	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);	457	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);
410	} else {	458	} else {
411	($l, $h) = (0, $length - 1);	459	($l, $h) = (0, $length - 1);
412	goto ignore;	460	goto ignore;
413	}	461	}
414	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l;	462	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
415	}	463	}
416	$hdr->{"Content-Range"} = "bytes */$length";	464	$hdr->{"Content-Range"} = "bytes */$length";
		465	$hdr->{"Content-Length"} = $length;
		466	$self->slog(9, "not satisfiable($self->{h}{range}\|".$self->{h}{"user-agent"}.")");
417	$self->err(416, "not satisfiable", $hdr);	467	$self->err(416, "not satisfiable", $hdr, "");
418		468
419	satisfiable:	469	satisfiable:
420	# check for segmented downloads	470	# check for segmented downloads
421	if ($l && $::NO_SEGMENTED) {	471	if ($l && $::NO_SEGMENTED) {
		472	my $delay = 60;
422	if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {	473	while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {
423	Coro::Event::do_timer(after => 15);	474	if ($delay <= 0) {
424
425	$self->err(400, "segmented downloads are not allowed");	475	$self->err(400, "segmented downloads are not allowed",
		476	{ "Content-Type" => "text/html", Connection => "close" }, <<EOF);
		477	<html>
		478	<head>
		479	<title>Segmented downloads are not allowed</title>
		480	</head>
		481	<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000">
		482
		483	<p>Segmented downloads are not allowed on this server. Please refer to the
		484	<a href="http://www.goof.com/pcg/marc/animefaq.html#segmented_downloads">FAQ</a>.</p>
		485
		486	</body></html>
		487	EOF
		488	} else {
		489	Coro::Event::do_timer(after => 3); $delay -= 3;
		490	}
426	}	491	}
427	}	492	}
428		493
429	$hdr->{"Content-Range"} = "bytes $l-$h/$length";	494	$hdr->{"Content-Range"} = "bytes $l-$h/$length";
430	@code = (206, "partial content");	495	@code = (206, "partial content");
…		…
447	open $fh, "<", $self->{path}	512	open $fh, "<", $self->{path}
448	or die "$self->{path}: late open failure ($!)";	513	or die "$self->{path}: late open failure ($!)";
449		514
450	$h -= $l - 1;	515	$h -= $l - 1;
451		516
		517	if (0) {
		518	if ($l) {
		519	sysseek $fh, $l, 0;
		520	}
		521	}
		522
452	while ($h > 0) {	523	while ($h > 0) {
		524	if (0) {
		525	sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
		526	or last;
		527	} else {
		528	undef $buf;
		529	$aio_requests->down;
453	aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),	530	aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
454	$buf, 0, sub {	531	$buf, 0, sub {
455	$r = $_[0];	532	$r = $_[0];
456	$current->ready;	533	$current->ready;
457	});	534	});
458	&Coro::schedule;	535	&Coro::schedule;
		536	$aio_requests->up;
459	last unless $r;	537	last unless $r;
		538	}
460	my $w = $self->{fh}->syswrite($buf)	539	my $w = $self->{fh}->syswrite($buf)
461	or last;	540	or last;
462	$::written += $w;	541	$::written += $w;
463	$self->{written} += $w;	542	$self->{written} += $w;
464	$l += $r;	543	$l += $r;

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.16 by root, Tue Aug 14 19:38:25 2001 UTC vs. Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC

Diff Legend

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.16 by root, Tue Aug 14 19:38:25 2001 UTC vs.
Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC