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

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.12 by root, Sat Aug 11 23:10:56 2001 UTC vs.
Revision 1.36 by root, Sun Sep 2 00:54:00 2001 UTC

…		…
1	use Coro;	1	use Coro;
2	use Coro::Semaphore;	2	use Coro::Semaphore;
3	use Coro::Event;	3	use Coro::Event;
4	use Coro::Socket;	4	use Coro::Socket;
5		5
		6	use HTTP::Date;
		7
6	no utf8;	8	no utf8;
7	use bytes;	9	use bytes;
8		10
9	# at least on my machine, this thingy serves files	11	# at least on my machine, this thingy serves files
10	# quite a bit faster than apache, ;)	12	# quite a bit faster than apache, ;)
11	# and quite a bit slower than thttpd :(	13	# and quite a bit slower than thttpd :(
12		14
13	$SIG{PIPE} = 'IGNORE';	15	$SIG{PIPE} = 'IGNORE';
14		16
		17	our $accesslog;
		18
		19	if ($ACCESS_LOG) {
		20	use IO::Handle;
		21	open $accesslog, ">>$ACCESS_LOG"
		22	or die "$ACCESS_LOG: $!";
		23	$accesslog->autoflush(1);
		24	}
		25
15	sub slog {	26	sub slog {
16	my $level = shift;	27	my $level = shift;
17	my $format = shift;	28	my $format = shift;
18	printf "---: $format\n", @_;	29	printf "---: $format\n", @_;
19	}	30	}
20		31
21	my $connections = new Coro::Semaphore $MAX_CONNECTS;	32	our $connections = new Coro::Semaphore $MAX_CONNECTS \|\| 250;
		33
		34	our $wait_factor = 0.95;
		35
		36	our @transfers = (
		37	[(new Coro::Semaphore $MAX_TRANSFERS_SMALL \|\| 50), 1],
		38	[(new Coro::Semaphore $MAX_TRANSFERS_LARGE \|\| 50), 1],
		39	);
22		40
23	my @newcons;	41	my @newcons;
24	my @pool;	42	my @pool;
25		43
26	# one "execution thread"	44	# one "execution thread"
43		61
44	my $http_port = new Coro::Socket	62	my $http_port = new Coro::Socket
45	LocalAddr => $SERVER_HOST,	63	LocalAddr => $SERVER_HOST,
46	LocalPort => $SERVER_PORT,	64	LocalPort => $SERVER_PORT,
47	ReuseAddr => 1,	65	ReuseAddr => 1,
48	Listen => 1,	66	Listen => 50,
49	or die "unable to start server";	67	or die "unable to start server";
50		68
51	push @listen_sockets, $http_port;	69	push @listen_sockets, $http_port;
		70
		71	our $NOW;
		72	our $HTTP_NOW;
		73
		74	Event->timer(interval => 1, hard => 1, cb => sub {
		75	$NOW = time;
		76	$HTTP_NOW = time2str $NOW;
		77	})->now;
52		78
53	# the "main thread"	79	# the "main thread"
54	async {	80	async {
55	slog 1, "accepting connections";	81	slog 1, "accepting connections";
56	while () {	82	while () {
57	$connections->down;	83	$connections->down;
58	push @newcons, [$http_port->accept];	84	push @newcons, [$http_port->accept];
59	#slog 3, "accepted @$connections ".scalar(@pool);	85	#slog 3, "accepted @$connections ".scalar(@pool);
60	$::NOW = time;
61	if (@pool) {	86	if (@pool) {
62	(pop @pool)->ready;	87	(pop @pool)->ready;
63	} else {	88	} else {
64	async \&handler;	89	async \&handler;
65	}	90	}
…		…
70	package conn;	95	package conn;
71		96
72	use Socket;	97	use Socket;
73	use HTTP::Date;	98	use HTTP::Date;
74	use Convert::Scalar 'weaken';	99	use Convert::Scalar 'weaken';
		100	use Linux::AIO;
75		101
		102	Linux::AIO::min_parallel $::AIO_PARALLEL;
		103
		104	my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
		105
		106	Event->io(fd => Linux::AIO::poll_fileno,
		107	poll => 'r', async => 1,
		108	cb => \&Linux::AIO::poll_cb);
		109
76	our %conn; # $conn{ip}{fh} => connobj	110	our %conn; # $conn{ip}{self} => connobj
		111	our %uri; # $uri{ip}{uri}{self}
77	our %blocked;	112	our %blocked;
78	our %mimetype;	113	our %mimetype;
79		114
80	sub read_mimetypes {	115	sub read_mimetypes {
81	local *M;	116	local *M;
…		…
101	or $self->err(500, "unable to decode peername");	136	or $self->err(500, "unable to decode peername");
102		137
103	$self->{remote_addr} = inet_ntoa $iaddr;	138	$self->{remote_addr} = inet_ntoa $iaddr;
104	$self->{time} = $::NOW;	139	$self->{time} = $::NOW;
105		140
106	# enter ourselves into various lists	141	$::conns++;
107	weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
108		142
109	$self;	143	$self;
110	}	144	}
111		145
112	sub DESTROY {	146	sub DESTROY {
113	my $self = shift;	147	my $self = shift;
		148
		149	$::conns--;
		150
		151	$self->eoconn;
		152	}
		153
		154	# end of connection
		155	sub eoconn {
		156	my $self = shift;
		157
		158	# clean up hints
114	delete $conn{$self->{remote_addr}}{$self*1};	159	delete $conn{$self->{remote_id}}{$self*1};
115	delete $uri{$self->{uri}}{$self*1};	160	delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
116	}	161	}
117		162
118	sub slog {	163	sub slog {
119	my $self = shift;	164	my $self = shift;
120	main::slog($_[0], "$self->{remote_addr}> $_[1]");	165	main::slog($_[0], ($self->{remote_id} \|\| $self->{remote_addr}) ."> $_[1]");
121	}	166	}
122		167
123	sub response {	168	sub response {
124	my ($self, $code, $msg, $hdr, $content) = @_;	169	my ($self, $code, $msg, $hdr, $content) = @_;
125	my $res = "HTTP/1.0 $code $msg\015\012";	170	my $res = "HTTP/1.1 $code $msg\015\012";
126		171
127	$res .= "Connection: close\015\012";	172	$self->{h}{connection} \|\|= $hdr->{Connection};
128	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(	173
		174	$res .= "Date: $HTTP_NOW\015\012";
129		175
130	while (my ($h, $v) = each %$hdr) {	176	while (my ($h, $v) = each %$hdr) {
131	$res .= "$h: $v\015\012"	177	$res .= "$h: $v\015\012"
132	}	178	}
133	$res .= "\015\012";	179	$res .= "\015\012";
134		180
135	$res .= $content if defined $content and $self->{method} eq "GET";	181	$res .= $content if defined $content and $self->{method} ne "HEAD";
136		182
137	print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d#	183	my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
		184
		185	print $accesslog $log if $accesslog;
		186	print STDERR $log;
138		187
139	$self->{written} +=	188	$self->{written} +=
140	print {$self->{fh}} $res;	189	print {$self->{fh}} $res;
141	}	190	}
142		191
143	sub err {	192	sub err {
144	my $self = shift;	193	my $self = shift;
145	my ($code, $msg, $hdr, $content) = @_;	194	my ($code, $msg, $hdr, $content) = @_;
146		195
147	unless (defined $content) {	196	unless (defined $content) {
148	$content = "$code $msg";	197	$content = "$code $msg\n";
149	$hdr->{"Content-Type"} = "text/plain";	198	$hdr->{"Content-Type"} = "text/plain";
150	$hdr->{"Content-Length"} = length $content;	199	$hdr->{"Content-Length"} = length $content;
151	}	200	}
		201	$hdr->{"Connection"} = "close";
152		202
153	$self->response($code, $msg, $hdr, $content);	203	$self->response($code, $msg, $hdr, $content);
154		204
155	die bless {}, err::;	205	die bless {}, err::;
156	}	206	}
157		207
158	sub err_blocked {
159	my $self = shift;
160	my $ip = $self->{remote_addr};
161	my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
162
163	Coro::Event::do_timer(after => 5);
164
165	$self->err(403, "too many connections",
166	{
167	"Content-Type" => "text/html",
168	"Retry-After" => $::BLOCKTIME
169	},
170	<<EOF);
171	<html><p>
172	You have been blocked because you opened too many connections. You
173	may retry at</p>
174
175	<p><blockquote>$time.</blockquote></p>
176
177	<p>Until then, each new access will renew the block. You might want to have a
178	look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
179	</html>
180	EOF
181	}
182
183	sub handle {	208	sub handle {
184	my $self = shift;	209	my $self = shift;
185	my $fh = $self->{fh};	210	my $fh = $self->{fh};
186		211
		212	my $host;
		213
		214	$fh->timeout($::REQ_TIMEOUT);
187	#while() {	215	while() {
		216	$self->{reqs}++;
		217
		218	# read request and parse first line
		219	my $req = $fh->readline("\015\012\015\012");
		220
		221	unless (defined $req) {
		222	if (exists $self->{version}) {
		223	last;
		224	} else {
		225	$self->err(408, "request timeout");
		226	}
		227	}
		228
188	$self->{h} = {};	229	$self->{h} = {};
189		230
190	# read request and parse first line
191	$fh->timeout($::REQ_TIMEOUT);
192	my $req = $fh->readline("\015\012\015\012");
193	$fh->timeout($::RES_TIMEOUT);	231	$fh->timeout($::RES_TIMEOUT);
194
195	defined $req or
196	$self->err(408, "request timeout");
197
198	my $ip = $self->{remote_addr};
199
200	if ($blocked{$ip}) {
201	$self->err_blocked($blocked{$ip})
202	if $blocked{$ip} > $::NOW;
203
204	delete $blocked{$ip};
205	}
206
207	if (%{$conn{$ip}} > $::MAX_CONN_IP) {
208	$self->slog(2, "blocked ip $ip");
209	$self->err_blocked;
210	}
211		232
212	$req =~ /^(?:\015\012)?	233	$req =~ /^(?:\015\012)?
213	(GET\|HEAD) \040+	234	(GET\|HEAD) \040+
214	([^\040]+) \040+	235	([^\040]+) \040+
215	HTTP\/([0-9]+\.[0-9]+)	236	HTTP\/([0-9]+\.[0-9]+)
216	\015\012/gx	237	\015\012/gx
217	or $self->err(403, "method not allowed", { Allow => "GET,HEAD" });	238	or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
218
219	$2 ne "1.0"
220	or $self->err(506, "http protocol version not supported");
221		239
222	$self->{method} = $1;	240	$self->{method} = $1;
223	$self->{uri} = $2;	241	$self->{uri} = $2;
		242	$self->{version} = $3;
		243
		244	$3 =~ /^1\./
		245	or $self->err(506, "http protocol version $3 not supported");
224		246
225	# parse headers	247	# parse headers
226	{	248	{
227	my (%hdr, $h, $v);	249	my (%hdr, $h, $v);
228		250
…		…
239		261
240	$self->{h}{$h} = substr $v, 1	262	$self->{h}{$h} = substr $v, 1
241	while ($h, $v) = each %hdr;	263	while ($h, $v) = each %hdr;
242	}	264	}
243		265
		266	# remote id should be unique per user
		267	my $id = $self->{remote_addr};
		268
		269	if (exists $self->{h}{"client-ip"}) {
		270	$id .= "[".$self->{h}{"client-ip"}."]";
		271	} elsif (exists $self->{h}{"x-forwarded-for"}) {
		272	$id .= "[".$self->{h}{"x-forwarded-for"}."]";
		273	}
		274
		275	$self->{remote_id} = $id;
		276
		277	if ($blocked{$id}) {
		278	$self->err_blocked($blocked{$id})
		279	if $blocked{$id} > $::NOW;
		280
		281	delete $blocked{$id};
		282	}
		283
		284	if (%{$conn{$id}} >= $::MAX_CONN_IP) {
		285	my $delay = $::PER_TIMEOUT + 15;
		286	while (%{$conn{$id}} >= $::MAX_CONN_IP) {
		287	if ($delay <= 0) {
		288	$self->slog(2, "blocked ip $id");
		289	$self->err_blocked;
		290	} else {
		291	Coro::Event::do_timer(after => 4); $delay -= 4;
		292	}
		293	}
		294	}
		295
		296	# find out server name and port
		297	if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
		298	$host = $1;
		299	} else {
		300	$host = $self->{h}{host};
		301	}
		302
		303	if (defined $host) {
244	$self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80;	304	$self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
		305	} else {
		306	($self->{server_port}, $host)
		307	= unpack_sockaddr_in $self->{fh}->getsockname
		308	or $self->err(500, "unable to get socket name");
		309	$host = inet_ntoa $host;
		310	}
245		311
		312	$self->{server_name} = $host;
		313
		314	# enter ourselves into various lists
		315	weaken ($conn{$id}{$self*1} = $self);
246	weaken ($uri{$self->{uri}}{$self*1} = $self);	316	weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
247		317
		318	eval {
248	$self->map_uri;	319	$self->map_uri;
249	$self->respond;	320	$self->respond;
		321	};
		322
		323	$self->eoconn;
		324
		325	die if $@ && !ref $@;
		326
		327	last if $self->{h}{connection} =~ /close/ \|\| $self->{version} < 1.1;
		328
		329	$fh->timeout($::PER_TIMEOUT);
250	#}	330	}
251	}	331	}
252		332
253	# uri => path mapping	333	# uri => path mapping
254	sub map_uri {	334	sub map_uri {
255	my $self = shift;	335	my $self = shift;
256	my $host = $self->{h}{host} \|\| "default";	336	my $host = $self->{server_name};
257	my $uri = $self->{uri};	337	my $uri = $self->{uri};
258		338
259	# some massaging, also makes it more secure	339	# some massaging, also makes it more secure
260	$uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;	340	$uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
261	$uri =~ s%//+%/%g;	341	$uri =~ s%//+%/%g;
…		…
271	$self->{path} = "$::DOCROOT/$host$uri";	351	$self->{path} = "$::DOCROOT/$host$uri";
272		352
273	$self->access_check;	353	$self->access_check;
274	}	354	}
275		355
276	sub server_address {
277	my $self = shift;
278	my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
279	or $self->err(500, "unable to get socket name");
280	((inet_ntoa $iaddr), $port);
281	}
282
283	sub server_host {
284	my $self = shift;
285	if (exists $self->{h}{host}) {
286	return $self->{h}{host};
287	} else {
288	return (($self->server_address)[0]);
289	}
290	}
291
292	sub server_hostport {
293	my $self = shift;
294	my ($host, $port);
295	if (exists $self->{h}{host}) {
296	($host, $port) = ($self->{h}{host}, $self->{server_port});
297	} else {
298	($host, $port) = $self->server_address;
299	}
300	$port = $port == 80 ? "" : ":$port";
301	$host.$port;
302	}
303
304	sub _cgi {	356	sub _cgi {
305	my $self = shift;	357	my $self = shift;
306	my $path = shift;	358	my $path = shift;
307	my $fh;	359	my $fh;
308		360
309	# no two-way xxx supported	361	# no two-way xxx supported
310	if (0 == fork) {	362	if (0 == fork) {
311	open STDOUT, ">&".fileno($self->{fh});	363	open STDOUT, ">&".fileno($self->{fh});
312	if (chdir $::DOCROOT) {	364	if (chdir $::DOCROOT) {
313	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike	365	$ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
314	$ENV{HTTP_HOST} = $self->server_host;	366	$ENV{HTTP_HOST} = $self->{server_name};
315	$ENV{HTTP_PORT} = $self->{server_host};	367	$ENV{HTTP_PORT} = $self->{server_port};
316	$ENV{SCRIPT_NAME} = $self->{name};	368	$ENV{SCRIPT_NAME} = $self->{name};
317	exec $path;	369	exec $path;
318	}	370	}
319	Coro::State::_exit(0);	371	Coro::State::_exit(0);
320	} else {	372	} else {
		373	die;
321	}	374	}
		375	}
		376
		377	sub server_hostport {
		378	$_[0]{server_port} == 80
		379	? $_[0]{server_name}
		380	: "$_[0]{server_name}:$_[0]{server_port}";
322	}	381	}
323		382
324	sub respond {	383	sub respond {
325	my $self = shift;	384	my $self = shift;
326	my $path = $self->{path};	385	my $path = $self->{path};
…		…
336		395
337	if (-d _ && -r _) {	396	if (-d _ && -r _) {
338	# directory	397	# directory
339	if ($path !~ /\/$/) {	398	if ($path !~ /\/$/) {
340	# create a redirect to get the trailing "/"	399	# create a redirect to get the trailing "/"
341	my $host = $self->server_hostport;	400	# we don't try to avoid the :80
342	$self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });	401	$self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
343	} else {	402	} else {
344	$ims < $self->{stat}[9]	403	$ims < $self->{stat}[9]
345	or $self->err(304, "not modified");	404	or $self->err(304, "not modified");
346		405
347	if ($self->{method} eq "GET") {
348	if (-r "$path/index.html") {	406	if (-r "$path/index.html") {
349	$self->{path} .= "/index.html";	407	$self->{path} .= "/index.html";
350	$self->handle_file;	408	$self->handle_file;
351	} else {	409	} else {
352	$self->handle_dir;	410	$self->handle_dir;
353	}
354	}	411	}
355	}	412	}
356	} elsif (-f _ && -r _) {	413	} elsif (-f _ && -r _) {
357	-x _ and $self->err(403, "forbidden");	414	-x _ and $self->err(403, "forbidden");
358	$self->handle_file;	415	$self->handle_file;
…		…
373	$idx);	430	$idx);
374	}	431	}
375		432
376	sub handle_file {	433	sub handle_file {
377	my $self = shift;	434	my $self = shift;
378	my $length = -s _;	435	my $length = $self->{stat}[7];
		436	my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
379	my $hdr = {	437	my $hdr = {
380	"Last-Modified" => time2str ((stat _)[9]),	438	"Last-Modified" => time2str ((stat _)[9]),
381	};	439	};
382		440
383	my @code = (200, "ok");	441	my @code = (200, "ok");
…		…
391	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);	449	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);
392	} else {	450	} else {
393	($l, $h) = (0, $length - 1);	451	($l, $h) = (0, $length - 1);
394	goto ignore;	452	goto ignore;
395	}	453	}
396	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l;	454	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
397	}	455	}
398	$hdr->{"Content-Range"} = "bytes */$length";	456	$hdr->{"Content-Range"} = "bytes */$length";
		457	$hdr->{"Content-Length"} = $length;
399	$self->err(416, "not satisfiable", $hdr);	458	$self->err(416, "not satisfiable", $hdr, "");
400		459
401	satisfiable:	460	satisfiable:
402	# check for segmented downloads	461	# check for segmented downloads
403	if ($l && $::NO_SEGMENTED) {	462	if ($l && $::NO_SEGMENTED) {
		463	my $delay = $::PER_TIMEOUT + 15;
404	if (%{$uri{$self->{uri}}} > 1) {	464	while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
405	$self->err(400, "segmented downloads are not allowed");	465	if ($delay <= 0) {
		466	$self->err_segmented_download;
		467	} else {
		468	Coro::Event::do_timer(after => 4); $delay -= 4;
		469	}
406	}	470	}
407	}	471	}
408		472
409	$hdr->{"Content-Range"} = "bytes $l-$h/$length";	473	$hdr->{"Content-Range"} = "bytes $l-$h/$length";
410	@code = (206, "partial content");	474	@code = (206, "partial content");
…		…
420	$hdr->{"Content-Length"} = $length;	484	$hdr->{"Content-Length"} = $length;
421		485
422	$self->response(@code, $hdr, "");	486	$self->response(@code, $hdr, "");
423		487
424	if ($self->{method} eq "GET") {	488	if ($self->{method} eq "GET") {
		489	$self->{time} = $::NOW;
		490
		491	my $fudge = $queue->[0]->waiters;
		492	$fudge = $fudge ? ($fudge+1)/$fudge : 1;
		493
		494	$queue->[1] *= $fudge;
		495	my $transfer = $queue->[0]->guard;
		496
		497	if ($fudge != 1) {
		498	$queue->[1] /= $fudge;
		499	$queue->[1] = $queue->[1] * $::wait_factor
		500	+ ($::NOW - $self->{time}) * (1 - $::wait_factor);
		501	}
		502	$self->{time} = $::NOW;
		503
		504	$self->{fh}->writable or return;
		505
425	my ($fh, $buf);	506	my ($fh, $buf, $r);
		507	my $current = $Coro::current;
426	open $fh, "<", $self->{path}	508	open $fh, "<", $self->{path}
427	or die "$self->{path}: late open failure ($!)";	509	or die "$self->{path}: late open failure ($!)";
428		510
429	if ($l) {
430	sysseek $fh, $l, 0
431	or die "$self->{path}: cannot seek to $l ($!)";
432	}
433
434	$h -= $l - 1;	511	$h -= $l - 1;
435		512
		513	if (0) {
		514	if ($l) {
		515	sysseek $fh, $l, 0;
		516	}
		517	}
		518
436	while ($h > 0) {	519	while ($h > 0) {
		520	if (0) {
437	$h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h;	521	sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
		522	or last;
		523	} else {
		524	undef $buf;
		525	$aio_requests->down;
		526	aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
		527	$buf, 0, sub {
		528	$r = $_[0];
		529	$current->ready;
		530	});
		531	&Coro::schedule;
		532	$aio_requests->up;
		533	last unless $r;
		534	}
438	my $w = $self->{fh}->syswrite($buf)	535	my $w = $self->{fh}->syswrite($buf)
439	or last;	536	or last;
440	$::written += $w;	537	$::written += $w;
441	$self->{written} += $w;	538	$self->{written} += $w;
		539	$l += $r;
442	}	540	}
443	}
444		541
445	close $fh;	542	close $fh;
		543	}
446	}	544	}
447		545
448	1;	546	1;

Diff Legend

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

Comparing Coro/myhttpd/httpd.pl (file contents): Revision 1.12 by root, Sat Aug 11 23:10:56 2001 UTC vs. Revision 1.36 by root, Sun Sep 2 00:54:00 2001 UTC

Diff Legend

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.12 by root, Sat Aug 11 23:10:56 2001 UTC vs.
Revision 1.36 by root, Sun Sep 2 00:54:00 2001 UTC