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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.31 by root, Mon Aug 27 05:05:26 2001 UTC vs.
Revision 1.62 by root, Sun Jan 6 05:29:39 2002 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	use Coro::Signal;
		6
		7	use HTTP::Date;
		8	use POSIX ();
5		9
6	no utf8;	10	no utf8;
7	use bytes;	11	use bytes;
8		12
9	# at least on my machine, this thingy serves files	13	# at least on my machine, this thingy serves files
11	# and quite a bit slower than thttpd :(	15	# and quite a bit slower than thttpd :(
12		16
13	$SIG{PIPE} = 'IGNORE';	17	$SIG{PIPE} = 'IGNORE';
14		18
15	our $accesslog;	19	our $accesslog;
		20	our $errorlog;
		21
		22	our $NOW;
		23	our $HTTP_NOW;
		24
		25	Event->timer(interval => 1, hard => 1, cb => sub {
		26	$NOW = time;
		27	$HTTP_NOW = time2str $NOW;
		28	})->now;
		29
		30	if ($ERROR_LOG) {
		31	use IO::Handle;
		32	open $errorlog, ">>$ERROR_LOG"
		33	or die "$ERROR_LOG: $!";
		34	$errorlog->autoflush(1);
		35	}
16		36
17	if ($ACCESS_LOG) {	37	if ($ACCESS_LOG) {
18	use IO::Handle;	38	use IO::Handle;
19	open $accesslog, ">>$ACCESS_LOG"	39	open $accesslog, ">>$ACCESS_LOG"
20	or die "$ACCESS_LOG: $!";	40	or die "$ACCESS_LOG: $!";
…		…
22	}	42	}
23		43
24	sub slog {	44	sub slog {
25	my $level = shift;	45	my $level = shift;
26	my $format = shift;	46	my $format = shift;
		47	my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
27	printf "---: $format\n", @_;	48	printf "$NOW: $format\n", @_;
		49	printf $errorlog "$NOW: $format\n", @_ if $errorlog;
28	}	50	}
29		51
30	my $connections = new Coro::Semaphore $MAX_CONNECTS;	52	our $connections = new Coro::Semaphore $MAX_CONNECTS \|\| 250;
		53	our $httpevent = new Coro::Signal;
		54
		55	our $queue_file = new transferqueue slots => $MAX_TRANSFERS, maxsize => 250_000_000;
		56	our $queue_index = new transferqueue slots => 10;
		57
		58	our $requests;
31		59
32	my @newcons;	60	my @newcons;
33	my @pool;	61	my @pool;
34		62
35	# one "execution thread"	63	# one "execution thread"
36	sub handler {	64	sub handler {
37	while () {	65	while () {
38	my $new = pop @newcons;
39	if ($new) {	66	if (@newcons) {
40	eval {	67	eval {
41	conn->new(@$new)->handle;	68	conn->new(@{pop @newcons})->handle;
42	};	69	};
43	slog 1, "$@" if $@ && !ref $@;	70	slog 1, "$@" if $@ && !ref $@;
		71
		72	$httpevent->broadcast; # only for testing, but doesn't matter much
		73
44	$connections->up;	74	$connections->up;
45	} else {	75	} else {
46	last if @pool >= $MAX_POOL;	76	last if @pool >= $MAX_POOL;
47	push @pool, $Coro::current;	77	push @pool, $Coro::current;
48	schedule;	78	schedule;
49	}	79	}
50	}	80	}
		81	}
		82
		83	sub listen_on {
		84	my $listen = $_[0];
		85
		86	push @listen_sockets, $listen;
		87
		88	# the "main thread"
		89	async {
		90	slog 1, "accepting connections";
		91	while () {
		92	$connections->down;
		93	push @newcons, [$listen->accept];
		94	#slog 3, "accepted @$connections ".scalar(@pool);
		95	if (@pool) {
		96	(pop @pool)->ready;
		97	} else {
		98	async \&handler;
		99	}
		100
		101	}
		102	};
51	}	103	}
52		104
53	my $http_port = new Coro::Socket	105	my $http_port = new Coro::Socket
54	LocalAddr => $SERVER_HOST,	106	LocalAddr => $SERVER_HOST,
55	LocalPort => $SERVER_PORT,	107	LocalPort => $SERVER_PORT,
56	ReuseAddr => 1,	108	ReuseAddr => 1,
57	Listen => 50,	109	Listen => 50,
58	or die "unable to start server";	110	or die "unable to start server";
59		111
60	push @listen_sockets, $http_port;	112	listen_on $http_port;
61		113
62	# the "main thread"	114	if ($SERVER_PORT2) {
63	async {	115	my $http_port = new Coro::Socket
64	slog 1, "accepting connections";	116	LocalAddr => $SERVER_HOST,
65	while () {	117	LocalPort => $SERVER_PORT2,
66	$connections->down;	118	ReuseAddr => 1,
67	push @newcons, [$http_port->accept];	119	Listen => 50,
68	#slog 3, "accepted @$connections ".scalar(@pool);	120	or die "unable to start server";
69	$::NOW = time;
70	if (@pool) {
71	(pop @pool)->ready;
72	} else {
73	async \&handler;
74	}
75		121
76	}	122	listen_on $http_port;
77	};	123	}
78		124
79	package conn;	125	package conn;
80		126
81	use Socket;	127	use Socket;
82	use HTTP::Date;	128	use HTTP::Date;
83	use Convert::Scalar 'weaken';	129	use Convert::Scalar 'weaken';
84	use Linux::AIO;	130	use Linux::AIO;
85		131
86	Linux::AIO::min_parallel $::AIO_PARALLEL;	132	Linux::AIO::min_parallel $::AIO_PARALLEL;
87
88	my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
89		133
90	Event->io(fd => Linux::AIO::poll_fileno,	134	Event->io(fd => Linux::AIO::poll_fileno,
91	poll => 'r', async => 1,	135	poll => 'r', async => 1,
92	cb => \&Linux::AIO::poll_cb);	136	cb => \&Linux::AIO::poll_cb);
93		137
…		…
111		155
112	read_mimetypes;	156	read_mimetypes;
113		157
114	sub new {	158	sub new {
115	my $class = shift;	159	my $class = shift;
		160	my $fh = shift;
116	my $peername = shift;	161	my $peername = shift;
117	my $fh = shift;
118	my $self = bless { fh => $fh }, $class;	162	my $self = bless { fh => $fh }, $class;
119	my (undef, $iaddr) = unpack_sockaddr_in $peername	163	my (undef, $iaddr) = unpack_sockaddr_in $peername
120	or $self->err(500, "unable to decode peername");	164	or $self->err(500, "unable to decode peername");
121		165
		166	$self->{remote_addr} =
122	$self->{remote_addr} = inet_ntoa $iaddr;	167	$self->{remote_id} = inet_ntoa $iaddr;
		168
123	$self->{time} = $::NOW;	169	$self->{time} = $::NOW;
124		170
125	# enter ourselves into various lists	171	weaken ($Coro::current->{conn} = $self);
126	weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
127		172
128	$::conns++;	173	$::conns++;
		174	$::maxconns = $::conns if $::conns > $::maxconns;
129		175
130	$self;	176	$self;
131	}	177	}
132		178
133	sub DESTROY {	179	sub DESTROY {
134	my $self = shift;	180	#my $self = shift;
135
136	$::conns--;	181	$::conns--;
137
138	$self->eoconn;
139	delete $conn{$self->{remote_addr}}{$self*1};
140	}
141
142	# end of connection
143	sub eoconn {
144	my $self = shift;
145	delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
146	}	182	}
147		183
148	sub slog {	184	sub slog {
149	my $self = shift;	185	my $self = shift;
150	main::slog($_[0], ($self->{remote_id} \|\| $self->{remote_addr}) ."> $_[1]");	186	main::slog($_[0], "$self->{remote_id}> $_[1]");
151	}	187	}
152		188
153	sub response {	189	sub response {
154	my ($self, $code, $msg, $hdr, $content) = @_;	190	my ($self, $code, $msg, $hdr, $content) = @_;
155	my $res = "HTTP/1.1 $code $msg\015\012";	191	my $res = "HTTP/1.1 $code $msg\015\012";
156		192
157	$self->{h}{connection} \|\|= $hdr->{Connection};	193	if (exists $hdr->{Connection}) {
		194	if ($hdr->{Connection} =~ /close/) {
		195	$self->{h}{connection} = "close"
		196	}
		197	} else {
		198	if ($self->{version} < 1.1) {
		199	if ($self->{h}{connection} =~ /keep-alive/i) {
		200	$hdr->{Connection} = "Keep-Alive";
		201	} else {
		202	$self->{h}{connection} = "close"
		203	}
		204	}
		205	}
158		206
159	$res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :(	207	$res .= "Date: $HTTP_NOW\015\012";
160		208
161	while (my ($h, $v) = each %$hdr) {	209	while (my ($h, $v) = each %$hdr) {
162	$res .= "$h: $v\015\012"	210	$res .= "$h: $v\015\012"
163	}	211	}
164	$res .= "\015\012";	212	$res .= "\015\012";
165		213
166	$res .= $content if defined $content and $self->{method} ne "HEAD";	214	$res .= $content if defined $content and $self->{method} ne "HEAD";
167		215
168	my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";	216	my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
		217	" $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
		218	" \"$self->{h}{referer}\"\n";
169		219
170	print $accesslog $log if $accesslog;	220	print $accesslog $log if $accesslog;
171	print STDERR $log;	221	print STDERR $log;
172		222
173	$self->{written} +=	223	$self->{written} +=
…		…
177	sub err {	227	sub err {
178	my $self = shift;	228	my $self = shift;
179	my ($code, $msg, $hdr, $content) = @_;	229	my ($code, $msg, $hdr, $content) = @_;
180		230
181	unless (defined $content) {	231	unless (defined $content) {
182	$content = "$code $msg";	232	$content = "$code $msg\n";
183	$hdr->{"Content-Type"} = "text/plain";	233	$hdr->{"Content-Type"} = "text/plain";
184	$hdr->{"Content-Length"} = length $content;	234	$hdr->{"Content-Length"} = length $content;
185	}	235	}
186	$hdr->{"Connection"} = "close";	236	$hdr->{"Connection"} = "close";
187		237
…		…
212	}	262	}
213		263
214	$self->{h} = {};	264	$self->{h} = {};
215		265
216	$fh->timeout($::RES_TIMEOUT);	266	$fh->timeout($::RES_TIMEOUT);
217	my $ip = $self->{remote_addr};
218
219	if ($blocked{$ip}) {
220	$self->err_blocked($blocked{$ip})
221	if $blocked{$ip} > $::NOW;
222
223	delete $blocked{$ip};
224	}
225
226	if (%{$conn{$ip}} > $::MAX_CONN_IP) {
227	my $delay = 120;
228	while (%{$conn{$ip}} > $::MAX_CONN_IP) {
229	if ($delay <= 0) {
230	$self->slog(2, "blocked ip $ip");
231	$self->err_blocked;
232	} else {
233	Coro::Event::do_timer(after => 3);
234	$delay -= 3;
235	}
236	}
237	}
238		267
239	$req =~ /^(?:\015\012)?	268	$req =~ /^(?:\015\012)?
240	(GET\|HEAD) \040+	269	(GET\|HEAD) \040+
241	([^\040]+) \040+	270	([^\040]+) \040+
242	HTTP\/([0-9]+\.[0-9]+)	271	HTTP\/([0-9]+\.[0-9]+)
…		…
267		296
268	$self->{h}{$h} = substr $v, 1	297	$self->{h}{$h} = substr $v, 1
269	while ($h, $v) = each %hdr;	298	while ($h, $v) = each %hdr;
270	}	299	}
271		300
		301	$requests++;
		302
		303	# remote id should be unique per user
		304	my $id = $self->{remote_addr};
		305
		306	if (exists $self->{h}{"client-ip"}) {
		307	$id .= "[".$self->{h}{"client-ip"}."]";
		308	} elsif (exists $self->{h}{"x-forwarded-for"}) {
		309	$id .= "[".$self->{h}{"x-forwarded-for"}."]";
		310	}
		311
		312	$self->{remote_id} = $id;
		313
		314	weaken (local $conn{$id}{$self*1} = $self);
		315
		316	if ($blocked{$id}) {
		317	$self->err_blocked
		318	if $blocked{$id}[0] > $::NOW;
		319
		320	delete $blocked{$id};
		321	}
		322
272	# find out server name and port	323	# find out server name and port
273	if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {	324	if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
274	$host = $1;	325	$host = $1;
275	} else {	326	} else {
276	$host = $self->{h}{host};	327	$host = $self->{h}{host};
…		…
278		329
279	if (defined $host) {	330	if (defined $host) {
280	$self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;	331	$self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
281	} else {	332	} else {
282	($self->{server_port}, $host)	333	($self->{server_port}, $host)
283	= unpack_sockaddr_in $self->{fh}->getsockname	334	= unpack_sockaddr_in $self->{fh}->sockname
284	or $self->err(500, "unable to get socket name");	335	or $self->err(500, "unable to get socket name");
285	$host = inet_ntoa $host;	336	$host = inet_ntoa $host;
286	}	337	}
287		338
288	$self->{server_name} = $host;	339	$self->{server_name} = $host;
289		340
290	# remote id should be unique per user
291	$self->{remote_id} = $self->{remote_addr};
292
293	if (exists $self->{h}{"client-ip"}) {
294	$self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
295	} elsif (exists $self->{h}{"x-forwarded-for"}) {
296	$self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
297	}
298
299	weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);	341	weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
300		342
301	eval {	343	eval {
302	$self->map_uri;	344	$self->map_uri;
303	$self->respond;	345	$self->respond;
304	};	346	};
305		347
306	$self->eoconn;
307
308	die if $@ && !ref $@;	348	die if $@ && !ref $@;
309		349
310	last if $self->{h}{connection} =~ /close/ \|\| $self->{version} < 1.1;	350	last if $self->{h}{connection} =~ /close/i;
		351
		352	$httpevent->broadcast;
311		353
312	$fh->timeout($::PER_TIMEOUT);	354	$fh->timeout($::PER_TIMEOUT);
313	}	355	}
		356	}
		357
		358	sub block {
		359	my $self = shift;
		360
		361	$blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
		362	$self->slog(2, "blocked ip $self->{remote_id}");
		363	$self->err_blocked;
314	}	364	}
315		365
316	# uri => path mapping	366	# uri => path mapping
317	sub map_uri {	367	sub map_uri {
318	my $self = shift;	368	my $self = shift;
…		…
365		415
366	sub respond {	416	sub respond {
367	my $self = shift;	417	my $self = shift;
368	my $path = $self->{path};	418	my $path = $self->{path};
369		419
370	stat $path	420	if ($self->{name} =~ s%^/internal/([^/]+)%%) {
371	or $self->err(404, "not found");	421	if ($::internal{$1}) {
372		422	$::internal{$1}->($self);
373	$self->{stat} = [stat _];
374
375	# idiotic netscape sends idiotic headers AGAIN
376	my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
377	? str2time $1 : 0;
378
379	if (-d _ && -r _) {
380	# directory
381	if ($path !~ /\/$/) {
382	# create a redirect to get the trailing "/"
383	# we don't try to avoid the :80
384	$self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
385	} else {	423	} else {
386	$ims < $self->{stat}[9]	424	$self->err(404, "not found");
		425	}
		426	} else {
		427
		428	stat $path
387	or $self->err(304, "not modified");	429	or $self->err(404, "not found");
388		430
389	if (-r "$path/index.html") {	431	$self->{stat} = [stat _];
390	$self->{path} .= "/index.html";	432
391	$self->handle_file;	433	# idiotic netscape sends idiotic headers AGAIN
		434	my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
		435	? str2time $1 : 0;
		436
		437	if (-d _ && -r _) {
		438	# directory
		439	if ($path !~ /\/$/) {
		440	# create a redirect to get the trailing "/"
		441	# we don't try to avoid the :80
		442	$self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
392	} else {	443	} else {
		444	$ims < $self->{stat}[9]
		445	or $self->err(304, "not modified");
		446
		447	if (-r "$path/index.html") {
		448	# replace directory "size" by index.html filesize
		449	$self->{stat} = [stat ($self->{path} .= "/index.html")];
		450	$self->handle_file($queue_index);
		451	} else {
393	$self->handle_dir;	452	$self->handle_dir;
394	}	453	}
395	}	454	}
396	} elsif (-f _ && -r _) {	455	} elsif (-f _ && -r _) {
397	-x _ and $self->err(403, "forbidden");	456	-x _ and $self->err(403, "forbidden");
		457
		458	if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
		459	my $timeout = $::NOW + 10;
		460	while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
		461	if ($timeout < $::NOW) {
		462	$self->block($::BLOCKTIME, "too many connections");
		463	} else {
		464	$httpevent->wait;
		465	}
		466	}
		467	}
		468
398	$self->handle_file;	469	$self->handle_file($queue_file);
399	} else {	470	} else {
400	$self->err(404, "not found");	471	$self->err(404, "not found");
		472	}
401	}	473	}
402	}	474	}
403		475
404	sub handle_dir {	476	sub handle_dir {
405	my $self = shift;	477	my $self = shift;
…		…
407		479
408	$self->response(200, "ok",	480	$self->response(200, "ok",
409	{	481	{
410	"Content-Type" => "text/html",	482	"Content-Type" => "text/html",
411	"Content-Length" => length $idx,	483	"Content-Length" => length $idx,
		484	"Last-Modified" => time2str ($self->{stat}[9]),
412	},	485	},
413	$idx);	486	$idx);
414	}	487	}
415		488
416	sub handle_file {	489	sub handle_file {
417	my $self = shift;	490	my ($self, $queue) = @_;
418	my $length = -s _;	491	my $length = $self->{stat}[7];
419	my $hdr = {	492	my $hdr = {
420	"Last-Modified" => time2str ((stat _)[9]),	493	"Last-Modified" => time2str ((stat _)[9]),
421	};	494	};
422		495
423	my @code = (200, "ok");	496	my @code = (200, "ok");
…		…
435	}	508	}
436	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;	509	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
437	}	510	}
438	$hdr->{"Content-Range"} = "bytes */$length";	511	$hdr->{"Content-Range"} = "bytes */$length";
439	$hdr->{"Content-Length"} = $length;	512	$hdr->{"Content-Length"} = $length;
440	$self->slog(9, "not satisfiable($self->{h}{range}\|".$self->{h}{"user-agent"}.")");
441	$self->err(416, "not satisfiable", $hdr, "");	513	$self->err(416, "not satisfiable", $hdr, "");
442		514
443	satisfiable:	515	satisfiable:
444	# check for segmented downloads	516	# check for segmented downloads
445	if ($l && $::NO_SEGMENTED) {	517	if ($l && $::NO_SEGMENTED) {
446	my $delay = 180;	518	my $timeout = $::NOW + 15;
447	while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {	519	while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
448	if ($delay <= 0) {	520	if ($timeout <= $::NOW) {
		521	$self->block($::BLOCKTIME, "segmented downloads are forbidden");
449	$self->err_segmented_download;	522	#$self->err_segmented_download;
450	} else {	523	} else {
451	Coro::Event::do_timer(after => 3); $delay -= 3;	524	$httpevent->wait;
452	}	525	}
453	}	526	}
454	}	527	}
455		528
456	$hdr->{"Content-Range"} = "bytes $l-$h/$length";	529	$hdr->{"Content-Range"} = "bytes $l-$h/$length";
…		…
467	$hdr->{"Content-Length"} = $length;	540	$hdr->{"Content-Length"} = $length;
468		541
469	$self->response(@code, $hdr, "");	542	$self->response(@code, $hdr, "");
470		543
471	if ($self->{method} eq "GET") {	544	if ($self->{method} eq "GET") {
		545	$self->{time} = $::NOW;
		546
		547	my $current = $Coro::current;
		548
472	my ($fh, $buf, $r);	549	my ($fh, $buf, $r);
473	my $current = $Coro::current;	550
474	open $fh, "<", $self->{path}	551	open $fh, "<", $self->{path}
475	or die "$self->{path}: late open failure ($!)";	552	or die "$self->{path}: late open failure ($!)";
476		553
477	$h -= $l - 1;	554	$h -= $l - 1;
478		555
479	if (0) {	556	if (0) { # !AIO
480	if ($l) {	557	if ($l) {
481	sysseek $fh, $l, 0;	558	sysseek $fh, $l, 0;
482	}	559	}
483	}	560	}
		561
		562	my $transfer = $queue->start_transfer($h);
		563	my $locked;
		564	my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
484		565
485	while ($h > 0) {	566	while ($h > 0) {
		567	unless ($locked) {
		568	if ($locked \|\|= $transfer->try($::WAIT_INTERVAL)) {
		569	$bufsize = $::BUFSIZE;
		570	$self->{time} = $::NOW;
		571	}
		572	}
		573
		574	if ($blocked{$self->{remote_id}}) {
		575	$self->{h}{connection} = "close";
		576	die bless {}, err::;
		577	}
		578
486	if (0) {	579	if (0) { # !AIO
487	sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h	580	sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
488	or last;	581	or last;
489	} else {	582	} else {
490	undef $buf;	583	aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
491	$aio_requests->down;
492	aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
493	$buf, 0, sub {	584	$buf, 0, sub {
494	$r = $_[0];	585	$r = $_[0];
495	$current->ready;	586	Coro::ready($current);
496	});	587	});
497	&Coro::schedule;	588	&Coro::schedule;
498	$aio_requests->up;
499	last unless $r;	589	last unless $r;
500	}	590	}
501	my $w = $self->{fh}->syswrite($buf)	591	my $w = syswrite $self->{fh}, $buf
502	or last;	592	or last;
503	$::written += $w;	593	$::written += $w;
504	$self->{written} += $w;	594	$self->{written} += $w;
505	$l += $r;	595	$l += $r;
506	}	596	}
507	}
508		597
509	close $fh;	598	close $fh;
		599	}
510	}	600	}
511		601
512	1;	602	1;

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.31 by root, Mon Aug 27 05:05:26 2001 UTC vs. Revision 1.62 by root, Sun Jan 6 05:29:39 2002 UTC

Diff Legend

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.31 by root, Mon Aug 27 05:05:26 2001 UTC vs.
Revision 1.62 by root, Sun Jan 6 05:29:39 2002 UTC