You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2012/08/07 16:49:44 UTC
svn commit: r1370288 - in /httpd/httpd/trunk: CHANGES
docs/manual/mod/core.xml server/util_mutex.c
Author: trawick
Date: Tue Aug 7 14:49:44 2012
New Revision: 1370288
URL: http://svn.apache.org/viewvc?rev=1370288&view=rev
Log:
Mutex directive: finish support of DefaultRuntimeDir
a partial conversion was made in r1299718, but I'm not
sure when that change is effective
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/manual/mod/core.xml
httpd/httpd/trunk/server/util_mutex.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1370288&r1=1370287&r2=1370288&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Aug 7 14:49:44 2012
@@ -25,7 +25,8 @@ Changes with Apache 2.5.0
*) The following now respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:
- APIs: ap_log_pid(), ap_remove_pid, ap_read_pid()
- - core: the scoreboard (ScoreBoardFile) and pid file (PidFile)
+ - core: the scoreboard (ScoreBoardFile), pid file (PidFile), and
+ mutexes (Mutex)
- mod_lbmethod_heartbeat, mod_heartmonitor: heartbeat storage file
- mod_socache_shmcb, mod_socache_dbm: shared memory or dbm for cache
[Jeff Trawick]
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1370288&r1=1370287&r2=1370288&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Tue Aug 7 14:49:44 2012
@@ -3142,9 +3142,11 @@ or specified mutexes</description>
<p>With the file-based mechanisms <em>fcntl</em> and <em>flock</em>,
the path, if provided, is a directory where the lock file will be created.
- The default directory is httpd's run-time file directory relative to
- <directive module="core">ServerRoot</directive>. Always use a local disk
- filesystem for <code>/path/to/mutex</code> and never a directory residing
+ The default directory is httpd's run-time file directory,
+ <directive module="core">DefaultRuntimeDir</directive>. If a relative
+ path is provided, it is relative to
+ <directive module="core">DefaultRuntimeDir</directive>. Always use a local
+ disk filesystem for <code>/path/to/mutex</code> and never a directory residing
on a NFS- or AFS-filesystem. The basename of the file will be the mutex
type, an optional instance string provided by the module, and unless the
<code>OmitPID</code> keyword is specified, the process id of the httpd
Modified: httpd/httpd/trunk/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_mutex.c?rev=1370288&r1=1370287&r2=1370288&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_mutex.c (original)
+++ httpd/httpd/trunk/server/util_mutex.c Tue Aug 7 14:49:44 2012
@@ -117,7 +117,7 @@ AP_DECLARE(apr_status_t) ap_parse_mutex(
* are looking to use
*/
if (file) {
- *mutexfile = ap_server_root_relative(pool, file);
+ *mutexfile = ap_runtime_dir_relative(pool, file);
if (!*mutexfile) {
return APR_BADARG;
}
@@ -304,7 +304,7 @@ static const char *get_mutex_filename(ap
}
#endif
- return ap_server_root_relative(p,
+ return ap_runtime_dir_relative(p,
apr_pstrcat(p,
mxcfg->dir,
"/",
@@ -552,7 +552,7 @@ AP_CORE_DECLARE(void) ap_dump_mutexes(ap
}
if (mxcfg->dir)
- dir = ap_server_root_relative(p, mxcfg->dir);
+ dir = ap_runtime_dir_relative(p, mxcfg->dir);
apr_file_printf(out, "Mutex %s: dir=\"%s\" mechanism=%s %s\n", name, dir, mech,
mxcfg->omit_pid ? "[OmitPid]" : "");