From: Jim Jagielski Date: Fri, 23 Jan 1998 00:36:34 +0000 (+0000) Subject: PR: X-Git-Tag: APACHE_1_3b5~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=255333c5fbc1efc8d46279bb7f39e5e912ce74a7;p=thirdparty%2Fapache%2Fhttpd.git 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 a16507b3cb5..93ebbc65184 100644 --- a/docs/manual/misc/FAQ.html +++ b/docs/manual/misc/FAQ.html @@ -15,7 +15,7 @@

Apache Server Frequently Asked Questions

- $Revision: 1.98 $ ($Date: 1998/01/22 23:18:56 $) + $Revision: 1.99 $ ($Date: 1998/01/23 00:36:30 $)

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 #define USE_SHMGET_SCOREBOARD definition in the LINUX section of - src/conf.h and rebuild the server (prior to 1.3b4 the - definition was named #define HAVE_SHMGET). This will produce - a server which is slower and less reliable. + src/conf.h and rebuild the server (prior to 1.3b4, simply + removing #define HAVE_SHMGET would have sufficed). This will + produce a server which is slower and less reliable.

diff --git a/docs/manual/misc/perf-tuning.html b/docs/manual/misc/perf-tuning.html index 65b2ecd7a6e..f75fbf926b1 100644 --- 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 src/main/conf.h file for your architecture and look for either USE_MMAP_SCOREBOARD or -USE_SHMGET_SCOREBOARD. Defining one of those two enables the -supplied shared memory code. If your system has another type of -shared memory then edit the file src/main/http_main.c and -add the hooks necessary to use it in Apache. (Send us back a patch +USE_SHMGET_SCOREBOARD. Defining one of those two (as +well as their companions HAVE_MMAP and HAVE_SHMGET +respectively) enables the supplied shared memory code. If your system has +another type of shared memory, edit the file src/main/http_main.c +and add the hooks necessary to use it in Apache. (Send us back a patch too please.)

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

It may even be the case that mmap isn't used on your architecture, if so then defining USE_MMAP_FILES -might work (if it works then report back to us). +and HAVE_MMAP might work (if it works then report back to us).

Apache does its best to avoid copying bytes around in memory. The first write of any request typically is turned into a writev diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html index 7313020198d..e2b7232ad56 100644 --- 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:

-Linux 1.x users might be able to add -DUSE_SHMGET_SCOREBOARD to +Linux 1.x users might be able to add +-DHAVE_SHMGET -DUSE_SHMGET_SCOREBOARD to the EXTRA_CFLAGS in your Configuration. This might work with some 1.x installations, but won't work with all of -them. (Prior to 1.3b4 this define was named HAVE_SHMGET.)

+them. (Prior to 1.3b4, HAVE_SHMGET would have sufficed.)

-SVR4 users should consider adding -DUSE_SHMGET_SCOREBOARD to the +SVR4 users should consider adding +-DHAVE_SHMGET -DUSE_SHMGET_SCOREBOARD to the EXTRA_CFLAGS in your Configuration. 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 HAVE_SHMGET.)

+release. (Prior to 1.3b4, HAVE_SHMGET would have sufficed.)

See Also: Stopping and Restarting Apache