From: Rich Bowen Date: Mon, 22 Mar 2010 23:39:55 +0000 (+0000) Subject: 'Apache' -> 'Apache HTTP Server' and 'Apache httpd' X-Git-Tag: 2.3.6~314 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd391d79f25dde10a4e4a765e9aa699ac1d2a1a5;p=thirdparty%2Fapache%2Fhttpd.git 'Apache' -> 'Apache HTTP Server' and 'Apache httpd' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926400 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/prefork.html.en b/docs/manual/mod/prefork.html.en index 722a141ea34..76d94e27b94 100644 --- a/docs/manual/mod/prefork.html.en +++ b/docs/manual/mod/prefork.html.en @@ -33,8 +33,9 @@

Summary

This Multi-Processing Module (MPM) implements a non-threaded, - pre-forking web server that handles requests in a manner similar - to Apache 1.3. It is appropriate for sites that need to avoid + pre-forking web server. Each server process may answer incoming + requests, and a parent process manages the size of the server pool. + It is appropriate for sites that need to avoid threading for compatibility with non-thread-safe libraries. It is also the best MPM for isolating each request, so that a problem with a single request will not affect any other.

@@ -71,7 +72,7 @@
  • How it Works

    • See also

    top
    @@ -79,7 +80,7 @@ uses

    How it Works

    A single control process is responsible for launching child processes which listen for connections and serve them when they - arrive. Apache always tries to maintain several spare + arrive. Apache httpd always tries to maintain several spare or idle server processes, which stand ready to serve incoming requests. In this way, clients do not need to wait for a new child processes to be forked before their requests can be @@ -90,7 +91,7 @@ uses MaxSpareServers, and MaxClients regulate how the parent process creates children to serve requests. In general, - Apache is very self-regulating, so most sites do not need to + Apache httpd is very self-regulating, so most sites do not need to adjust these directives from their default values. Sites which need to serve more than 256 simultaneous requests may need to increase MaxClients, @@ -101,8 +102,8 @@ uses

    While the parent process is usually started as root under Unix in order to bind to port 80, the child processes are - launched by Apache as a less-privileged user. The User and Group directives are used to set - the privileges of the Apache child processes. The child processes + launched by Apache httpd as a less-privileged user. The User and Group directives are used to set + the privileges of the Apache httpd child processes. The child processes must be able to read all the content that will be served, but should have as few privileges beyond that as possible.

    @@ -136,7 +137,7 @@ uses

    Tuning of this parameter should only be necessary on very busy sites. Setting this parameter to a large number is almost always a bad idea. If you are trying to set the value equal to or lower than - MinSpareServers, Apache + MinSpareServers, Apache HTTP Server will automatically adjust it to MinSpareServers + 1.

    See also

    diff --git a/docs/manual/mod/prefork.xml b/docs/manual/mod/prefork.xml index 5ff3464582a..4ffa4d5d73e 100644 --- a/docs/manual/mod/prefork.xml +++ b/docs/manual/mod/prefork.xml @@ -30,8 +30,9 @@

    This Multi-Processing Module (MPM) implements a non-threaded, - pre-forking web server that handles requests in a manner similar - to Apache 1.3. It is appropriate for sites that need to avoid + pre-forking web server. Each server process may answer incoming + requests, and a parent process manages the size of the server pool. + It is appropriate for sites that need to avoid threading for compatibility with non-thread-safe libraries. It is also the best MPM for isolating each request, so that a problem with a single request will not affect any other.

    @@ -43,13 +44,13 @@ small enough to assure that there is enough physical RAM for all processes.

     -Setting which addresses and ports Apache +Setting which addresses and ports Apache HTTP Server uses
    How it Works

    A single control process is responsible for launching child processes which listen for connections and serve them when they - arrive. Apache always tries to maintain several spare + arrive. Apache httpd always tries to maintain several spare or idle server processes, which stand ready to serve incoming requests. In this way, clients do not need to wait for a new child processes to be forked before their requests can be @@ -60,7 +61,7 @@ uses MaxSpareServers, and MaxClients regulate how the parent process creates children to serve requests. In general, - Apache is very self-regulating, so most sites do not need to + Apache httpd is very self-regulating, so most sites do not need to adjust these directives from their default values. Sites which need to serve more than 256 simultaneous requests may need to increase MaxClients, @@ -73,10 +74,10 @@ uses

    While the parent process is usually started as root under Unix in order to bind to port 80, the child processes are - launched by Apache as a less-privileged user. The User and Group directives are used to set - the privileges of the Apache child processes. The child processes + the privileges of the Apache httpd child processes. The child processes must be able to read all the content that will be served, but should have as few privileges beyond that as possible.

    @@ -141,7 +142,7 @@ uses

    Tuning of this parameter should only be necessary on very busy sites. Setting this parameter to a large number is almost always a bad idea. If you are trying to set the value equal to or lower than - MinSpareServers, Apache + MinSpareServers, Apache HTTP Server will automatically adjust it to MinSpareServers + 1.