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

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

Diff Legend

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

Comparing Coro/myhttpd/httpd.pl (file contents): Revision 1.2 by root, Thu Aug 9 19:11:13 2001 UTC vs. Revision 1.33 by root, Wed Aug 29 01:40:44 2001 UTC

Diff Legend

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.2 by root, Thu Aug 9 19:11:13 2001 UTC vs.
Revision 1.33 by root, Wed Aug 29 01:40:44 2001 UTC