Commit 0d11448a authored by Joe Orton's avatar Joe Orton
Browse files

* docs/manual/mod/mpm_common.xml: s/depreciated/deprecated/ 

* server/core.c: Likewise.


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

docs/manual/mod/mpm_common.xml

+5 −5
Changes for docs/manual/mod/mpm_common.xml: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -61,14 +61,14 @@ accepting requests on network sockets</description> 
      file defined by the optional <var>/path/to/lockfile</var>

      parameter. One can also use the <directive module="mpm_common"

      >LockFile</directive> directive to specify the lockfile,

      although this is depreciated.</dd>

      although this is deprecated.</dd>



      <dt><code>fcntl&lt;<var>:/path/to/lockfile</var>&gt;</code></dt>

      <dd>uses the <code>fcntl(2)</code> system call to lock the

      file defined by the optional <var>/path/to/lockfile</var>

      parameter. One can also use the <directive module="mpm_common"

      >LockFile</directive> directive to specify the lockfile,

      although this is depreciated.</dd>

      although this is deprecated.</dd>



      <dt><code>file&lt;<var>:/path/to/lockfile</var>&gt;</code></dt>

      <dd>This directive tells Apache to pick the "best" file locking
@@ -404,7 +404,7 @@ The <var>protocol</var> argument was added in 2.1.5</compatibility> 


<directivesynopsis>

<name>LockFile</name>

<description>Location of the accept serialization lock file <em>(depreciated)</em></description>

<description>Location of the accept serialization lock file <em>(deprecated)</em></description>

<syntax>LockFile <var>filename</var></syntax>

<default>LockFile logs/accept.lock</default>

<contextlist><context>server config</context></contextlist>
@@ -430,8 +430,8 @@ The <var>protocol</var> argument was added in 2.1.5</compatibility> 
      creating a lockfile with the same name as the one the server will try

      to create.</p>

    </note>

    <note type="warning"><title>Depreciated</title>

      <p>This directive is depreciated. It is strongly suggested that

    <note type="warning"><title>Deprecated</title>

      <p>This directive is deprecated. It is strongly suggested that

      you use <directive module="mpm_common">AcceptMutex</directive> to

      specify both the mutex locking implementation as well as

      the lockfile location.</p>

server/core.c

+1 −1
Changes for server/core.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3323,7 +3323,7 @@ AP_INIT_TAKE1("ScoreBoardFile", ap_mpm_set_scoreboard, NULL, RSRC_CONF, 
#endif

#ifdef AP_MPM_WANT_SET_LOCKFILE

AP_INIT_TAKE1("LockFile",  ap_mpm_set_lockfile, NULL, RSRC_CONF,

              "The lockfile used when Apache needs to lock the accept() call (depreciated)"),

              "The lockfile used when Apache needs to lock the accept() call (deprecated)"),

#endif

#ifdef AP_MPM_WANT_SET_MAX_REQUESTS

AP_INIT_TAKE1("MaxRequestsPerChild", ap_mpm_set_max_requests, NULL, RSRC_CONF,