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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.7 by root, Sat Aug 11 00:37:32 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	}
…		…
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	my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
		89
		90	Event->io(fd => Linux::AIO::poll_fileno,
		91	poll => 'r', async => 1,
		92	cb => \&Linux::AIO::poll_cb);
		93
76	our %conn; # $conn{ip}{fh} => connobj	94	our %conn; # $conn{ip}{self} => connobj
		95	our %uri; # $uri{ip}{uri}{self}
77	our %blocked;	96	our %blocked;
		97	our %mimetype;
		98
		99	sub read_mimetypes {
		100	local *M;
		101	if (open M, "<mime_types") {
		102	while (<M>) {
		103	if (/^([^#]\S+)\t+(\S+)$/) {
		104	$mimetype{lc $1} = $2;
		105	}
		106	}
		107	} else {
		108	print "cannot open mime_types\n";
		109	}
		110	}
		111
		112	read_mimetypes;
78		113
79	sub new {	114	sub new {
80	my $class = shift;	115	my $class = shift;
81	my $peername = shift;	116	my $peername = shift;
82	my $fh = shift;	117	my $fh = shift;
83	my $self = bless { fh => $fh }, $class;	118	my $self = bless { fh => $fh }, $class;
84	my (undef, $iaddr) = unpack_sockaddr_in $peername	119	my (undef, $iaddr) = unpack_sockaddr_in $peername
85	or $self->err(500, "unable to decode peername");	120	or $self->err(500, "unable to decode peername");
86		121
87	$self->{remote_addr} = inet_ntoa $iaddr;	122	$self->{remote_addr} = inet_ntoa $iaddr;
		123	$self->{time} = $::NOW;
88		124
89	# enter ourselves into various lists	125	# enter ourselves into various lists
90	weaken ($conn{$self->{remote_addr}}{$self*1} = $self);	126	weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
91		127
		128	$::conns++;
		129
92	$self;	130	$self;
93	}	131	}
94		132
95	sub DESTROY {	133	sub DESTROY {
96	my $self = shift;	134	my $self = shift;
		135
		136	$::conns--;
		137
		138	$self->eoconn;
97	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;
98	delete $uri{$self->{uri}}{$self*1};	145	delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
99	}	146	}
100		147
101	sub slog {	148	sub slog {
102	my $self = shift;	149	my $self = shift;
103	main::slog($_[0], "$self->{remote_addr}> $_[1]");	150	main::slog($_[0], ($self->{remote_id} \|\| $self->{remote_addr}) ."> $_[1]");
104	}	151	}
105		152
106	sub response {	153	sub response {
107	my ($self, $code, $msg, $hdr, $content) = @_;	154	my ($self, $code, $msg, $hdr, $content) = @_;
108	my $res = "HTTP/1.0 $code $msg\015\012";	155	my $res = "HTTP/1.1 $code $msg\015\012";
109		156
110	$res .= "Connection: close\015\012";	157	$self->{h}{connection} \|\|= $hdr->{Connection};
		158
111	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(	159	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(
112		160
113	while (my ($h, $v) = each %$hdr) {	161	while (my ($h, $v) = each %$hdr) {
114	$res .= "$h: $v\015\012"	162	$res .= "$h: $v\015\012"
115	}	163	}
		164	$res .= "\015\012";
116		165
117	$res .= "\015\012$content" if defined $content;	166	$res .= $content if defined $content and $self->{method} ne "HEAD";
118		167
119	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";
120		169
		170	print $accesslog $log if $accesslog;
		171	print STDERR $log;
		172
		173	$self->{written} +=
121	print {$self->{fh}} $res;	174	print {$self->{fh}} $res;
122	}	175	}
123		176
124	sub err {	177	sub err {
125	my $self = shift;	178	my $self = shift;
126	my ($code, $msg, $hdr, $content) = @_;	179	my ($code, $msg, $hdr, $content) = @_;
…		…
128	unless (defined $content) {	181	unless (defined $content) {
129	$content = "$code $msg";	182	$content = "$code $msg";
130	$hdr->{"Content-Type"} = "text/plain";	183	$hdr->{"Content-Type"} = "text/plain";
131	$hdr->{"Content-Length"} = length $content;	184	$hdr->{"Content-Length"} = length $content;
132	}	185	}
		186	$hdr->{"Connection"} = "close";
133		187
134	$self->response($code, $msg, $hdr, $content);	188	$self->response($code, $msg, $hdr, $content);
135		189
136	die bless {}, err::;	190	die bless {}, err::;
137	}	191	}
138		192
139	sub err_blocked {	193	sub err_blocked {
140	my $self = shift;	194	my $self = shift;
141	my $ip = $self->{remote_addr};	195	my $ip = $self->{remote_addr};
142	my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;	196	my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
		197
		198	Coro::Event::do_timer(after => 20*rand);
		199
143	$self->err(403, "too many connections",	200	$self->err(401, "too many connections",
144	{	201	{
145	"Content-Type" => "text/html",	202	"Content-Type" => "text/html",
146	"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",
147	},	207	},
148	<<EOF);	208	<<EOF);
149	<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
150	You have been blocked because you opened too many connections. You	215	<p>You have been blocked because you opened too many connections. You
151	may retry at</p>	216	may retry at</p>
152		217
153	<p><blockquote>$time.</blockquote></p>	218	<p><blockquote>$time.</blockquote></p>
154		219
155	<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
156	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>
157	</html>	222
		223	</body></html>
158	EOF	224	EOF
159	}	225	}
160		226
161	sub handle {	227	sub handle {
162	my $self = shift;	228	my $self = shift;
163	my $fh = $self->{fh};	229	my $fh = $self->{fh};
164		230
		231	my $host;
		232
		233	$fh->timeout($::REQ_TIMEOUT);
165	#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
166	$self->{h} = {};	248	$self->{h} = {};
167		249
168	# read request and parse first line
169	$fh->timeout($::REQ_TIMEOUT);
170	my $req = $fh->readline("\015\012\015\012");
171	$fh->timeout($::RES_TIMEOUT);	250	$fh->timeout($::RES_TIMEOUT);
172
173	defined $req or
174	$self->err(408, "request timeout");
175
176	my $ip = $self->{remote_addr};	251	my $ip = $self->{remote_addr};
177		252
178	if ($blocked{$ip}) {	253	if ($blocked{$ip}) {
179	$self->err_blocked($blocked{$ip})	254	$self->err_blocked($blocked{$ip})
180	if $blocked{$ip} > $::NOW;	255	if $blocked{$ip} > $::NOW;
181		256
182	delete $blocked{$ip};	257	delete $blocked{$ip};
183	}	258	}
184		259
185	if (%{$conn{$ip}} > $::MAX_CONN_IP) {	260	if (%{$conn{$ip}} > $::MAX_CONN_IP) {
186	$self->slog("blocked ip $ip");	261	$self->slog(2, "blocked ip $ip");
187	$self->err_blocked;	262	$self->err_blocked;
188	}	263	}
189		264
190	$req =~ /^(?:\015\012)?	265	$req =~ /^(?:\015\012)?
191	(GET\|HEAD) \040+	266	(GET\|HEAD) \040+
192	([^\040]+) \040+	267	([^\040]+) \040+
193	HTTP\/([0-9]+\.[0-9]+)	268	HTTP\/([0-9]+\.[0-9]+)
194	\015\012/gx	269	\015\012/gx
195	or $self->err(403, "method not allowed", { Allow => "GET,HEAD" });	270	or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
196
197	$2 ne "1.0"
198	or $self->err(506, "http protocol version not supported");
199		271
200	$self->{method} = $1;	272	$self->{method} = $1;
201	$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");
202		278
203	# parse headers	279	# parse headers
204	{	280	{
205	my (%hdr, $h, $v);	281	my (%hdr, $h, $v);
206		282
…		…
217		293
218	$self->{h}{$h} = substr $v, 1	294	$self->{h}{$h} = substr $v, 1
219	while ($h, $v) = each %hdr;	295	while ($h, $v) = each %hdr;
220	}	296	}
221		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) {
222	$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	}
223		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	}
		324
224	weaken ($uri{$self->{uri}}{$self*1} = $self);	325	weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);
225		326
		327	eval {
226	$self->map_uri;	328	$self->map_uri;
227	$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);
228	#}	339	}
229	}	340	}
230		341
231	# uri => path mapping	342	# uri => path mapping
232	sub map_uri {	343	sub map_uri {
233	my $self = shift;	344	my $self = shift;
234	my $host = $self->{h}{host} \|\| "default";	345	my $host = $self->{server_name};
235	my $uri = $self->{uri};	346	my $uri = $self->{uri};
236		347
237	# some massaging, also makes it more secure	348	# some massaging, also makes it more secure
238	$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;
239	$uri =~ s%//+%/%g;	350	$uri =~ s%//+%/%g;
…		…
249	$self->{path} = "$::DOCROOT/$host$uri";	360	$self->{path} = "$::DOCROOT/$host$uri";
250		361
251	$self->access_check;	362	$self->access_check;
252	}	363	}
253		364
254	sub server_address {
255	my $self = shift;
256	my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
257	or $self->err(500, "unable to get socket name");
258	((inet_ntoa $iaddr), $port);
259	}
260
261	sub server_host {
262	my $self = shift;
263	if (exists $self->{h}{host}) {
264	return $self->{h}{host};
265	} else {
266	return (($self->server_address)[0]);
267	}
268	}
269
270	sub server_hostport {
271	my $self = shift;
272	my ($host, $port);
273	if (exists $self->{h}{host}) {
274	($host, $port) = ($self->{h}{host}, $self->{server_port});
275	} else {
276	($host, $port) = $self->server_address;
277	}
278	$port = $port == 80 ? "" : ":$port";
279	$host.$port;
280	}
281
282	sub _cgi {	365	sub _cgi {
283	my $self = shift;	366	my $self = shift;
284	my $path = shift;	367	my $path = shift;
285	my $fh;	368	my $fh;
286		369
287	# no two-way xxx supported	370	# no two-way xxx supported
288	if (0 == fork) {	371	if (0 == fork) {
289	open STDOUT, ">&".fileno($self->{fh});	372	open STDOUT, ">&".fileno($self->{fh});
290	if (chdir $::DOCROOT) {	373	if (chdir $::DOCROOT) {
291	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike	374	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
292	$ENV{HTTP_HOST} = $self->server_host;	375	$ENV{HTTP_HOST} = $self->{server_name};
293	$ENV{HTTP_PORT} = $self->{server_host};	376	$ENV{HTTP_PORT} = $self->{server_port};
294	$ENV{SCRIPT_NAME} = $self->{name};	377	$ENV{SCRIPT_NAME} = $self->{name};
295	exec $::INDEXPROG;	378	exec $path;
296	}	379	}
297	Coro::State::_exit(0);	380	Coro::State::_exit(0);
298	} else {	381	} else {
		382	die;
299	}	383	}
		384	}
		385
		386	sub server_hostport {
		387	$_[0]{server_port} == 80
		388	? $_[0]{server_name}
		389	: "$_[0]{server_name}:$_[0]{server_port}";
300	}	390	}
301		391
302	sub respond {	392	sub respond {
303	my $self = shift;	393	my $self = shift;
304	my $path = $self->{path};	394	my $path = $self->{path};
305		395
306	stat $path	396	stat $path
307	or $self->err(404, "not found");	397	or $self->err(404, "not found");
		398
		399	$self->{stat} = [stat _];
308		400
309	# idiotic netscape sends idiotic headers AGAIN	401	# idiotic netscape sends idiotic headers AGAIN
310	my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/	402	my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
311	? str2time $1 : 0;	403	? str2time $1 : 0;
312		404
313	if (-d _ && -r _) {	405	if (-d _ && -r _) {
314	# directory	406	# directory
315	if ($path !~ /\/$/) {	407	if ($path !~ /\/$/) {
316	# create a redirect to get the trailing "/"	408	# create a redirect to get the trailing "/"
317	my $host = $self->server_hostport;	409	# we don't try to avoid the :80
318	$self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });	410	$self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
319	} else {	411	} else {
320	$ims < (stat _)[9]	412	$ims < $self->{stat}[9]
321	or $self->err(304, "not modified");	413	or $self->err(304, "not modified");
322		414
323	if ($self->{method} eq "GET") {
324	if (-r "$path/index.html") {	415	if (-r "$path/index.html") {
325	$self->{path} .= "/index.html";	416	$self->{path} .= "/index.html";
326	$self->handle_file;	417	$self->handle_file;
327	} else {	418	} else {
328	$self->handle_dir;	419	$self->handle_dir;
329	}
330	}	420	}
331	}	421	}
332	} elsif (-f _ && -r _) {	422	} elsif (-f _ && -r _) {
333	-x _ and $self->err(403, "forbidden");	423	-x _ and $self->err(403, "forbidden");
334	$self->handle_file;	424	$self->handle_file;
…		…
337	}	427	}
338	}	428	}
339		429
340	sub handle_dir {	430	sub handle_dir {
341	my $self = shift;	431	my $self = shift;
342	$self->_cgi($::INDEXPROG);	432	my $idx = $self->diridx;
		433
		434	$self->response(200, "ok",
		435	{
		436	"Content-Type" => "text/html",
		437	"Content-Length" => length $idx,
		438	},
		439	$idx);
343	}	440	}
344		441
345	sub handle_file {	442	sub handle_file {
346	my $self = shift;	443	my $self = shift;
347	my $length = -s _;	444	my $length = -s _;
…		…
360	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);	457	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);
361	} else {	458	} else {
362	($l, $h) = (0, $length - 1);	459	($l, $h) = (0, $length - 1);
363	goto ignore;	460	goto ignore;
364	}	461	}
365	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l;	462	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
366	}	463	}
367	$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"}.")");
368	$self->err(416, "not satisfiable", $hdr);	467	$self->err(416, "not satisfiable", $hdr, "");
369		468
370	satisfiable:	469	satisfiable:
371	# check for segmented downloads	470	# check for segmented downloads
372	if ($l && $NO_SEGMENTED) {	471	if ($l && $::NO_SEGMENTED) {
373	if (%{$uri{$self->{uri}}} > 1) {	472	my $delay = 60;
374	$self->slog("segmented download refused\n");	473	while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {
		474	if ($delay <= 0) {
375	$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	}
376	}	491	}
377	}	492	}
378		493
379	$hdr->{"Content-Range"} = "bytes $l-$h/$length";	494	$hdr->{"Content-Range"} = "bytes $l-$h/$length";
380	@code = (206, "partial content");	495	@code = (206, "partial content");
…		…
383	ignore:	498	ignore:
384	} else {	499	} else {
385	($l, $h) = (0, $length - 1);	500	($l, $h) = (0, $length - 1);
386	}	501	}
387		502
388	if ($self->{path} =~ /\.html$/) {	503	$self->{path} =~ /\.([^.]+)$/;
389	$hdr->{"Content-Type"} = "text/html";
390	} else {
391	$hdr->{"Content-Type"} = "application/octet-stream";	504	$hdr->{"Content-Type"} = $mimetype{lc $1} \|\| "application/octet-stream";
392	}
393
394	$hdr->{"Content-Length"} = $length;	505	$hdr->{"Content-Length"} = $length;
395		506
396	$self->response(@code, $hdr, "");	507	$self->response(@code, $hdr, "");
397		508
398	if ($self->{method} eq "GET") {	509	if ($self->{method} eq "GET") {
399	my ($fh, $buf);	510	my ($fh, $buf, $r);
		511	my $current = $Coro::current;
400	open $fh, "<", $self->{path}	512	open $fh, "<", $self->{path}
401	or die "$self->{path}: late open failure ($!)";	513	or die "$self->{path}: late open failure ($!)";
402		514
403	if ($l) {
404	sysseek $fh, $l, 0
405	or die "$self->{path}: cannot seek to $l ($!)";
406	}
407
408	$h -= $l - 1;	515	$h -= $l - 1;
409		516
		517	if (0) {
		518	if ($l) {
		519	sysseek $fh, $l, 0;
		520	}
		521	}
		522
410	while ($h > 0) {	523	while ($h > 0) {
		524	if (0) {
411	$h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h;	525	sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
		526	or last;
		527	} else {
		528	undef $buf;
		529	$aio_requests->down;
		530	aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
		531	$buf, 0, sub {
		532	$r = $_[0];
		533	$current->ready;
		534	});
		535	&Coro::schedule;
		536	$aio_requests->up;
		537	last unless $r;
		538	}
412	$self->{fh}->syswrite($buf)	539	my $w = $self->{fh}->syswrite($buf)
413	or last;	540	or last;
		541	$::written += $w;
		542	$self->{written} += $w;
		543	$l += $r;
414	}	544	}
415	}	545	}
416		546
417	close $fh;	547	close $fh;
418	}	548	}
419		549
420	sub access_check {
421	my $self = shift;
422	my $whois = ::ip_request($self->{remote_addr});
423
424	if ($whois =~ /^\*cy: (\S+)/m) {
425	$self->slog(9, "COUNTRY($1)");
426	} else {
427	$self->slog(9, "no country($whois)");
428	}
429	}
430
431	1;	550	1;

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.7 by root, Sat Aug 11 00:37:32 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.7 by root, Sat Aug 11 00:37:32 2001 UTC vs.
Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC