From: dgaudet <dgaudet@unknown>
Date: Sat, 28 Jun 1997 20:58:16 +0000 (+0000)
Subject: Update with latest from HEAD.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ecaae9ee822f71b571c67180275af035652e59b;p=thirdparty%2Fapache%2Fhttpd.git

Update with latest from HEAD.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_1_2_X@78408 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html
index e19bb35f393..220761518a2 100644
--- a/docs/manual/misc/FAQ.html
+++ b/docs/manual/misc/FAQ.html
@@ -15,7 +15,7 @@
   <!--#include virtual="header.html" -->
   <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
   <P>
-  $Revision: 1.63.2.3 $ ($Date: 1997/06/27 03:02:04 $)
+  $Revision: 1.63.2.4 $ ($Date: 1997/06/28 20:58:16 $)
   </P>
   <P>
   The latest version of this FAQ is always available from the main
@@ -1481,6 +1481,15 @@
   file, then re-running <CODE>Configure</CODE>, should resolve the
   problem.
   </P>
+  <p><b>Note:</b> As of BIND 8.1.1, the bind libraries and files are
+  installed under <code>/usr/local/bind</code> by default.  So you
+  should not run into this problem.  Should you want to use the bind
+  resolvers you'll have to add the following to the respective lines:
+  <blockquote><pre>
+  EXTRA_CFLAGS=-I/usr/local/bind/include
+  EXTRA_LFLAGS=-L/usr/local/bind/lib
+  EXTRA_LIBS=-lbind
+  </pre></blockquote>
   <HR>
  </LI>
  <LI><A NAME="set-servername">
diff --git a/docs/manual/misc/fin_wait_2.html b/docs/manual/misc/fin_wait_2.html
index 2d9e946d174..4b9d60ad3aa 100644
--- a/docs/manual/misc/fin_wait_2.html
+++ b/docs/manual/misc/fin_wait_2.html
@@ -266,6 +266,12 @@ many systems, this can be done by adding the line
 mbuf clusters you want to your kernel config file and rebuilding your 
 kernel.<P>
 </DL>
+
+<H3>Disable KeepAlive</H3>
+<P>If you are unable to do any of the above then you should, as a last
+resort, disable KeepAlive.  Edit your httpd.conf and change "KeepAlive On"
+to "KeepAlive Off".
+
 <H2><LI>Feedback</H2>
 
 If you have any information to add to this page, please contact me at