From: André Malo Date: Wed, 23 Apr 2003 19:25:50 +0000 (+0000) Subject: keep it consistent with 2.0 X-Git-Tag: pre_ajp_proxy~1792 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2d8de3dc4d9f46387f3c6e74873384bda35f8c0;p=thirdparty%2Fapache%2Fhttpd.git keep it consistent with 2.0 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99546 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index 3cc865a8e62..5cae84498b2 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -82,7 +82,7 @@ accepting requests on network sockets file defined by the LockFile directive.
fcntl
-
uses the fnctl(2) system call to lock the +
uses the fcntl(2) system call to lock the file defined by the LockFile directive.
posixsem
@@ -166,10 +166,10 @@ requests

The Group directive sets the group under which the server will answer requests. In order to use this - directive, the server must be run initially as root. If you start the - server as a non-root user, it will fail to change to the specified - group, and will instead continue to run as the group of the original - user. Unix-group is one of:

+ directive, the server must be run initially as root. If + you start the server as a non-root user, it will fail to change to the + specified group, and will instead continue to run as the group of the + original user. Unix-group is one of:

A group name
@@ -305,7 +305,7 @@ uses of the main server process is automatically appended to the filename.

-

Security:

+

Security

It is best to avoid putting this file in a world writable directory such as /var/tmp because someone could create a denial of service attack and prevent the server from starting by @@ -340,7 +340,7 @@ to serve requests

For non-threaded servers (i.e., prefork), MaxClients translates into the maximum number of child processes that will be launched to serve requests. - The default value is 256; to increase it, you must also raise + The default value is 256; to increase it, you must also raise ServerLimit.

For threaded and hybrid servers (e.g. beos @@ -387,7 +387,7 @@ will handle during its life process will die. If MaxRequestsPerChild is 0, then the process will never expire.

-

Different default values:

+

Different default values

The default value for mpm_netware and mpm_winnt is 0.

@@ -403,7 +403,7 @@ will handle during its life the number of processes when the server load reduces. -

Note:

+

Note

For KeepAlive requests, only the first request is counted towards this limit. In effect, it changes the behavior to limit the number of connections per @@ -537,12 +537,12 @@ of the daemon SIGHUP (kill -1) signal to the process id listed in the PidFile.

-

The PidFile is subject to the same warnings about log file - placement and security.

+

The PidFile is subject to the same + warnings about log file placement and security.

Note

- As of Apache 2 it is recommended to use only the apachectl script for - (re-)starting or stopping the server. +

As of Apache 2 it is recommended to use only the apachectl script for + (re-)starting or stopping the server.

@@ -614,8 +614,8 @@ Apache

For the prefork MPM, this directive sets the maximum configured value for MaxClients for the lifetime of the - Apache process. For the worker MPM, this directive in combination - with ThreadLimit sets + Apache process. For the worker MPM, this directive + in combination with ThreadLimit sets the maximum configured value for MaxClients for the lifetime of the Apache process. Any attempts to change this directive during a restart will be ignored, but MaxClients can be modified during diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index 11d9048c816..8409daa9673 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -42,7 +42,7 @@ accepting requests on network sockets >LockFile directive.

fcntl
-
uses the fnctl(2) system call to lock the +
uses the fcntl(2) system call to lock the file defined by the LockFile directive.
@@ -131,10 +131,10 @@ requests

The Group directive sets the group under which the server will answer requests. In order to use this - directive, the server must be run initially as root. If you start the - server as a non-root user, it will fail to change to the specified - group, and will instead continue to run as the group of the original - user. Unix-group is one of:

+ directive, the server must be run initially as root. If + you start the server as a non-root user, it will fail to change to the + specified group, and will instead continue to run as the group of the + original user. Unix-group is one of:

A group name
@@ -202,14 +202,14 @@ of the daemon SIGHUP (kill -1) signal to the process id listed in the PidFile.

-

The PidFile is subject to the same warnings about log file - placement and The PidFile is subject to the same + warnings about log file placement and security.

Note - As of Apache 2 it is recommended to use only the As of Apache 2 it is recommended to use only the apachectl script for - (re-)starting or stopping the server. + (re-)starting or stopping the server.

 @@ -321,7 +321,7 @@ uses of the main server process is automatically appended to the filename.

- Security: + Security

It is best to avoid putting this file in a world writable directory such as /var/tmp because someone could create a denial of service attack and prevent the server from starting by @@ -355,7 +355,7 @@ to serve requests

For non-threaded servers (i.e., prefork), MaxClients translates into the maximum number of child processes that will be launched to serve requests. - The default value is 256; to increase it, you must also raise + The default value is 256; to increase it, you must also raise ServerLimit.

For threaded and hybrid servers (e.g. beos @@ -411,7 +411,7 @@ will handle during its life process will die. If MaxRequestsPerChild is 0, then the process will never expire.

- Different default values: + Different default values

The default value for mpm_netware and mpm_winnt is 0.

 @@ -427,7 +427,7 @@ will handle during its life the number of processes when the server load reduces. - Note: + Note

For KeepAlive requests, only the first request is counted towards this limit. In effect, it changes the behavior to limit the number of connections per @@ -613,8 +613,9 @@ Apache

For the prefork MPM, this directive sets the maximum configured value for MaxClients for the lifetime of the - Apache process. For the worker MPM, this directive in combination - with ThreadLimit sets + Apache process. For the worker MPM, this directive + in combination with ThreadLimit sets the maximum configured value for MaxClients for the lifetime of the Apache process. Any attempts to change this directive during a