From: Rich Bowen Date: Sun, 29 Oct 2006 13:01:56 +0000 (+0000) Subject: and aren't valid in your docs stylesheet. Changing to something X-Git-Tag: 2.3.0~2039 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87b529ed9ddcbc49d47c9d90707a215950518995;p=apache and aren't valid in your docs stylesheet. Changing to something that will build. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@468892 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index fa759d5030..b00cd1e846 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -70,7 +70,8 @@ accepting requests on network sockets Module:leader, perchild, prefork, threadpool, worker

The AcceptMutex directives sets the - method that Apache uses to serialize multiple children accepting + method (and lockfile location if appropriate) that Apache uses to + serialize multiple children accepting requests on network sockets. Prior to Apache 2.0, the method was selectable only at compile time. The optimal method to use is highly architecture and platform dependent. For further details, @@ -85,23 +86,40 @@ accepting requests on network sockets listing the available methods.

-
flock
+
flock<:/path/to/lockfile>
uses the flock(2) system call to lock the - file defined by the LockFile directive.
+ file defined by the optional /path/to/lockfile + parameter. One can also use the LockFile directive to specify the lockfile, + although this is depreciated. -
fcntl
+
fcntl<:/path/to/lockfile>
uses the fcntl(2) system call to lock the - file defined by the LockFile directive.
+ file defined by the optional /path/to/lockfile + parameter. One can also use the LockFile directive to specify the lockfile, + although this is depreciated. + +
file<:/path/to/lockfile>
+
This directive tells Apache to pick the "best" file locking + implementation available to it, choosing between fcntl and + flock, in that order. It is only available when the underlying + platform and APR supports at least one of the 2.
posixsem
uses POSIX compatible semaphores to implement the mutex.
+
sysvsem
+
uses SySV-style semaphores to implement the mutex.
+ +
sem
+
This directive tells Apache to pick the "best" semaphore + implementation available to it, choosing between Posix and SystemV IPC, + in that order. It is only available when the underlying platform and + APR supports at least one of the 2.
+
pthread
uses POSIX mutexes as implemented by the POSIX Threads (PThreads) specification.
-
sysvsem
-
uses SySV-style semaphores to implement the mutex.

If you want to find out the compile time chosen default @@ -353,7 +371,7 @@ The protocol argument was added in 2.1.5

top

LockFile Directive

- + @@ -376,6 +394,13 @@ The protocol argument was added in 2.1.5 creating a lockfile with the same name as the one the server will try to create.

+

Depreciated

+

This directive is depreciated. It is strongly suggested that + you use AcceptMutex to + specify both the mutex locking implementation as well as + the lockfile location.

+
+

See also

    diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index fd3dadfe59..90e2d4e562 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -56,21 +56,21 @@ accepting requests on network sockets listing the available methods.

    -
    flock<:/path/to/lockfile>
    +
    flock<:/path/to/lockfile>
    uses the flock(2) system call to lock the - file defined by the optional /path/to/lockfile + file defined by the optional /path/to/lockfile parameter. One can also use the LockFile directive to specify the lockfile, although this is depreciated.
    -
    fcntl<:/path/to/lockfile>
    +
    fcntl<:/path/to/lockfile>
    uses the fcntl(2) system call to lock the - file defined by the optional /path/to/lockfile + file defined by the optional /path/to/lockfile parameter. One can also use the LockFile directive to specify the lockfile, although this is depreciated.
    -
    file<:/path/to/lockfile>
    +
    file<:/path/to/lockfile>
    This directive tells Apache to pick the "best" file locking implementation available to it, choosing between fcntl and flock, in that order. It is only available when the underlying @@ -404,7 +404,7 @@ The protocol argument was added in 2.1.5 LockFile -Location of the accept serialization lock file (depreciated) +Location of the accept serialization lock file (depreciated) LockFile filename LockFile logs/accept.lock server config
Description:Location of the accept serialization lock file
Description:Location of the accept serialization lock file (depreciated)
Syntax:LockFile filename
Default:LockFile logs/accept.lock
Context:server config