PR:

Obtained from:
Submitted by:	Jim Jagielski
Reviewed by:
Best of both worlds... Let the world know if we have mmap and/or
shmget as well as controlling which to use for scoreboard. This
should be a complete patch, so if any docs were skipped, feel free
to update 'em

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

diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html
index a16507b3cb5a95da72cd8390d6420a541ad2b54c..93ebbc65184779e630732cf57ddc0c2f05a9f018 100644 (file)
--- 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.98 $ ($Date: 1998/01/22 23:18:56 $)
+  $Revision: 1.99 $ ($Date: 1998/01/23 00:36:30 $)
   </P>
   <P>
   The latest version of this FAQ is always available from the main
@@ -1805,9 +1805,9 @@
   As a last-resort workaround, you can
   comment out the <CODE>#define USE_SHMGET_SCOREBOARD</CODE> definition in the
   <SAMP>LINUX</SAMP> section of
-  <SAMP>src/conf.h</SAMP> and rebuild the server (prior to 1.3b4 the
-  definition was named <CODE>#define HAVE_SHMGET</CODE>).  This will produce
-  a server which is slower and less reliable.
+  <SAMP>src/conf.h</SAMP> and rebuild the server (prior to 1.3b4, simply
+  removing <CODE>#define HAVE_SHMGET</CODE> would have sufficed).  This will
+  produce a server which is slower and less reliable.
   </P>
   <HR>
  </LI>

diff --git a/docs/manual/misc/perf-tuning.html b/docs/manual/misc/perf-tuning.html
index 65b2ecd7a6edd7fb8e3560bdc2fcd8ed7da670f5..f75fbf926b1da09c70c81539c5651fe3ec5a59d3 100644 (file)
--- a/docs/manual/misc/perf-tuning.html
+++ b/docs/manual/misc/perf-tuning.html
@@ -494,10 +494,11 @@ implemented using shared memory.  The rest default to using an
 on-disk file.  The on-disk file is not only slow, but it is unreliable
 (and less featured).  Peruse the <code>src/main/conf.h</code> file
 for your architecture and look for either <code>USE_MMAP_SCOREBOARD</code> or
-<code>USE_SHMGET_SCOREBOARD</code>.  Defining one of those two enables the
-supplied shared memory code.  If your system has another type of
-shared memory then edit the file <code>src/main/http_main.c</code> and
-add the hooks necessary to use it in Apache.  (Send us back a patch
+<code>USE_SHMGET_SCOREBOARD</code>.  Defining one of those two (as
+well as their companions <code>HAVE_MMAP</code> and <code>HAVE_SHMGET</code>
+respectively) enables the supplied shared memory code.  If your system has
+another type of shared memory, edit the file <code>src/main/http_main.c</code>
+and add the hooks necessary to use it in Apache.  (Send us back a patch
 too please.)
 
 <p>Historical note:  The Linux port of Apache didn't start to use
@@ -706,7 +707,7 @@ large may lock out low bandwidth clients unless you also increase the
 
 <p>It may even be the case that <code>mmap</code> isn't
 used on your architecture, if so then defining <code>USE_MMAP_FILES</code>
-might work (if it works then report back to us).
+and <code>HAVE_MMAP</code> might work (if it works then report back to us).
 
 <p>Apache does its best to avoid copying bytes around in memory.  The
 first write of any request typically is turned into a <code>writev</code>

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 7313020198d961d3bfa3366e23f64c62bde66e47..e2b7232ad56bfacbcfaac6069df6e2429f96caf6 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -1477,15 +1477,17 @@ about log file placement and
 
 Apache 1.2 and above:<p>
 
-Linux 1.x users might be able to add <code>-DUSE_SHMGET_SCOREBOARD</code> to
+Linux 1.x users might be able to add
+<code>-DHAVE_SHMGET -DUSE_SHMGET_SCOREBOARD</code> to
 the <code>EXTRA_CFLAGS</code> in your <code>Configuration</code>.  This
 might work with some 1.x installations, but won't work with all of
-them. (Prior to 1.3b4 this define was named <code>HAVE_SHMGET</code>.)<p>
+them. (Prior to 1.3b4, <code>HAVE_SHMGET</code> would have sufficed.)<p>
 
-SVR4 users should consider adding <code>-DUSE_SHMGET_SCOREBOARD</code> to the
+SVR4 users should consider adding
+<code>-DHAVE_SHMGET -DUSE_SHMGET_SCOREBOARD</code> to the
 <code>EXTRA_CFLAGS</code> in your <code>Configuration</code>.  This
 is believed to work, but we were unable to test it in time for 1.2
-release. (Prior to 1.3b4 this define was named <code>HAVE_SHMGET</code>.)<p>
+release. (Prior to 1.3b4, <code>HAVE_SHMGET</code> would have sufficed.)<p>
 
 <strong>See Also</strong>:
 <a href="../stopping.html">Stopping and Restarting Apache</a></p>