Update with latest from HEAD.

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/APACHE_1_2_X/htdocs/manual/misc/FAQ.html b/APACHE_1_2_X/htdocs/manual/misc/FAQ.html
index e19bb35f3932adb59ebaeb5bbc1af95194f83b19..220761518a28ca356eea3080d044bd3e093253a5 100644 (file)
--- a/APACHE_1_2_X/htdocs/manual/misc/FAQ.html
+++ b/APACHE_1_2_X/htdocs/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/APACHE_1_2_X/htdocs/manual/misc/fin_wait_2.html b/APACHE_1_2_X/htdocs/manual/misc/fin_wait_2.html
index 2d9e946d174429af4f116995e86df5d593358ce8..4b9d60ad3aa37fd9745d2094f40c4e1ed28fbcc8 100644 (file)
--- a/APACHE_1_2_X/htdocs/manual/misc/fin_wait_2.html
+++ b/APACHE_1_2_X/htdocs/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

diff --git a/APACHE_1_2_X/htdocs/manual/misc/known_bugs.html b/APACHE_1_2_X/htdocs/manual/misc/known_bugs.html
index 4d9ec526b1b846523e9dcdbf1e146cc0c46e08af..0b4dfc8efc8d7123dc504c78518ba033a97d512a 100644 (file)
--- a/APACHE_1_2_X/htdocs/manual/misc/known_bugs.html
+++ b/APACHE_1_2_X/htdocs/manual/misc/known_bugs.html
@@ -41,10 +41,11 @@ in early versions have been fixed in 1.2.
     source file <code>conf.h</code> for your architecture.
     This will be tracked as
     <a href="http://www.apache.org/bugdb.cgi/full/467">PR#467</a>.
-    </LI>
+    <P></LI>
 
     <a name="cnegbug"></a>
-    <LI>Apache's <A HREF="../content-negotiation.html">Content
+    <LI><b>Fixed in 1.2.1.</b>
+    Apache's <A HREF="../content-negotiation.html">Content
     Negotiation</A> should pick the smallest variant if there
     are several that are equally acceptable. A bug in 1.2 means it no
     longer does this unless all the variants have character sets. 
@@ -53,13 +54,13 @@ in early versions have been fixed in 1.2.
     pick the last equally acceptable variant instead of the first.
     This will be tracked as
     <a href="http://www.apache.org/bugdb.cgi/full/94">PR#94</a>.
-    </LI>
+    <P></LI>
 
     <LI>
     The PATH_INFO part of a request URI cannot include the sequence
     <CODE>%2f</CODE>. This will be tracked as 
     <A HREF="http://www.apache.org/bugdb.cgi/full/543">PR#543</A>.
-    </LI>
+    <P></LI>
 
     <LI>Users of early 1.2 betas reported problems with many
     connections stuck in the FIN_WAIT_2 state due to server
@@ -68,12 +69,14 @@ in early versions have been fixed in 1.2.
     see sockets in FIN_WAIT_2 state due to network or operating system
     issues outside the control of Apache. See our <A
     HREF="fin_wait_2.html">FIN_WAIT_2</A> page for more details.
-    </LI>
+    <P><b>Note:</b>  Depending on client mixture, SunOS 4.x boxes
+    may need all keepalives disabled with "KeepAlive off".
+    <P></LI>
 
     <LI>Compilation fails on SCO3 when using gcc instead of cc, complaining
     with "<CODE>gcc: noinline: No such file or directory</CODE>". Fix
     is given in <a href="http://www.apache.org/bugdb.cgi/full/695">PR#695</A>.
-    </LI>
+    <P></LI>
 
     <LI>If compilation fails complaining about "unknown symbol __inet_ntoa()"
     then you have probably installed version 8 of bind. You will need to
@@ -81,39 +84,34 @@ in early versions have been fixed in 1.2.
     to <CODE>EXTRA_LFLAGS</CODE> in <CODE>Configuration</CODE>. See
     <A HREF="http://www.apache.org/bugdb.cgi/full/616">PR#616</A>
     and the 
-    <A HREF="http://192.168.2.4:8080/htdocs/manual/misc/FAQ.html#bind8.1">Apache FAQ</A>.
-    </LI>
+    <A HREF="FAQ.html#bind8.1">Apache FAQ</A>.
+    <P></LI>
 
     <LI>The message "<CODE>created shared memory segment #730499</CODE>"
     in error_log is not an error and should be ignored. See 
     <a href="http://www.apache.org/bugdb.cgi/full/696">PR#696</A>.
-    </LI>
+    <P></LI>
 
     <LI>
     Compiling on Solaris 2 with SunSoft's C compiler gives the warning
     <CODE>"mod_include.c", line 1123: warning: end-of-loop code not
     reached</CODE>. This is a bogus warning and can be ignored.
     See <A HREF="http://www.apache.org/bugdb.cgi/full/681">PR#681</A>.
-    </LI>
+    <P></LI>
 
-    <LI>
+    <LI><b>Workaround available in 1.2.1.</b>
     There appears to be a problem on BSDI 2.1 with large numbers of
     virtual hosts. This appears similar to a file-descriptor limit
     but BSDI should not have this problem. This will be tracked as
     <A HREF="http://www.apache.org/bugdb.cgi/full/611">PR#611</A>.
-    See also the 
-    <A HREF="http://192.168.2.4:8080/htdocs/manual/misc/FAQ.html#fdlim">Apache
-    FAQ</A>. 
-    </LI>
+    See also the <A HREF="FAQ.html#fdlim">Apache FAQ</A>. 
+    <P></LI>
 
-    <LI>
+    <LI><b>Workaround available in 1.2.1.</b>
     Solaris 2 has problems with large numbers of virtual hosts. This is
     because of an operating system limit of 256 file pointers, not due
-    to Apache. 
-    See also the 
-    <A HREF="http://192.168.2.4:8080/htdocs/manual/misc/FAQ.html#fdlim">Apache
-    FAQ</A>.
-    </LI>
+    to Apache.   See also the <A HREF="FAQ.html#fdlim">Apache FAQ</A>.
+    <P></LI>
 
 </OL>