From: Jeff Trawick <trawick@apache.org>
Date: Fri, 9 Nov 2012 08:44:08 +0000 (+0000)
Subject: The following now respects DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:
X-Git-Tag: 2.5.0-alpha~6141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85ec79e3ced9795177ccba200bb56a0e781ffd17;p=thirdparty%2Fapache%2Fhttpd.git

The following now respects DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:

- mod_cache: thundering herd lock directory


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

diff --git a/CHANGES b/CHANGES
index 6ab23424db4..92381809ce7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -147,6 +147,7 @@ Changes with Apache 2.5.0
      - APIs: ap_log_pid(), ap_remove_pid, ap_read_pid()
      - core: the scoreboard (ScoreBoardFile), pid file (PidFile), and
        mutexes (Mutex)
+     - mod_cache: thundering herd lock directory
      - mod_lbmethod_heartbeat, mod_heartmonitor: heartbeat storage file
      - mod_ldap: shared memory cache
      - mod_socache_shmcb, mod_socache_dbm: shared memory or dbm for cache
diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml
index 4e16dab612e..a34b576e36c 100644
--- a/docs/manual/mod/mod_cache.xml
+++ b/docs/manual/mod/mod_cache.xml
@@ -855,13 +855,15 @@ LastModified date.</description>
   for the given URL space.</p>
 
   <p>In a minimal configuration the following directive is all that is needed to
-  enable the thundering herd lock in the default system temp directory.</p>
+  enable the thundering herd lock in the default run-time file directory.</p>
 
   <highlight language="config">
 # Enable cache lock
 CacheLock on
   </highlight>
 
+  <p>Locks consist of empty files that only exist for stale URLs in flight, so this
+  is significantly less resource intensive than the traditional disk cache.</p>
 </usage>
 </directivesynopsis>
 
@@ -869,17 +871,15 @@ CacheLock on
 <name>CacheLockPath</name>
 <description>Set the lock path directory.</description>
 <syntax>CacheLockPath <var>directory</var></syntax>
-<default>CacheLockPath /tmp/mod_cache-lock</default>
+<default>CacheLockPath mod_cache-lock</default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 
 <usage>
   <p>The <directive>CacheLockPath</directive> directive allows you to specify the
-  directory in which the locks are created. By default, the system's temporary
-  folder is used. Locks consist of empty files that only exist for stale URLs
-  in flight, so is significantly less resource intensive than the traditional
-  disk cache.</p>
-
+  directory in which the locks are created.  If <var>directory</var> is not an absolute
+  path, the location specified will be relative to the value of 
+  <directive module="core">DefaultRuntimeDir</directive>.</p>
 </usage>
 </directivesynopsis>
 
diff --git a/modules/cache/cache_util.h b/modules/cache/cache_util.h
index eec38f3a6a3..2ee24971010 100644
--- a/modules/cache/cache_util.h
+++ b/modules/cache/cache_util.h
@@ -95,7 +95,7 @@ extern "C" {
 #define DEFAULT_X_CACHE         0
 #define DEFAULT_X_CACHE_DETAIL  0
 #define DEFAULT_CACHE_STALE_ON_ERROR 1
-#define DEFAULT_CACHE_LOCKPATH "/mod_cache-lock"
+#define DEFAULT_CACHE_LOCKPATH "mod_cache-lock"
 #define CACHE_LOCKNAME_KEY "mod_cache-lockname"
 #define CACHE_LOCKFILE_KEY "mod_cache-lockfile"
 #define CACHE_CTX_KEY "mod_cache-ctx"
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index c5c4d3b1fe7..c106aedba15 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1801,7 +1801,6 @@ static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) {
 
 static void * create_cache_config(apr_pool_t *p, server_rec *s)
 {
-    const char *tmppath;
     cache_server_conf *ps = apr_pcalloc(p, sizeof(cache_server_conf));
 
     /* array of URL prefixes for which caching is enabled */
@@ -1824,10 +1823,7 @@ static void * create_cache_config(apr_pool_t *p, server_rec *s)
     ps->ignore_session_id_set = CACHE_IGNORE_SESSION_ID_UNSET;
     ps->lock = 0; /* thundering herd lock defaults to off */
     ps->lock_set = 0;
-    apr_temp_dir_get(&tmppath, p);
-    if (tmppath) {
-        ps->lockpath = apr_pstrcat(p, tmppath, DEFAULT_CACHE_LOCKPATH, NULL);
-    }
+    ps->lockpath = ap_runtime_dir_relative(p, DEFAULT_CACHE_LOCKPATH);
     ps->lockmaxage = apr_time_from_sec(DEFAULT_CACHE_MAXAGE);
     ps->x_cache = DEFAULT_X_CACHE;
     ps->x_cache_detail = DEFAULT_X_CACHE_DETAIL;
@@ -2202,7 +2198,7 @@ static const char *set_cache_lock_path(cmd_parms *parms, void *dummy,
         (cache_server_conf *)ap_get_module_config(parms->server->module_config,
                                                   &cache_module);
 
-    conf->lockpath = ap_server_root_relative(parms->pool, arg);
+    conf->lockpath = ap_runtime_dir_relative(parms->pool, arg);
     if (!conf->lockpath) {
         return apr_pstrcat(parms->pool, "Invalid CacheLockPath path ",
                            arg, NULL);
@@ -2380,8 +2376,8 @@ static const command_rec cache_cmds[] =
                  "Enable or disable the thundering herd lock."),
     AP_INIT_TAKE1("CacheLockPath", set_cache_lock_path, NULL, RSRC_CONF,
                   "The thundering herd lock path. Defaults to the '"
-                  DEFAULT_CACHE_LOCKPATH "' directory in the system "
-                  "temp directory."),
+                  DEFAULT_CACHE_LOCKPATH "' directory relative to the "
+                  "DefaultRuntimeDir setting."),
     AP_INIT_TAKE1("CacheLockMaxAge", set_cache_lock_maxage, NULL, RSRC_CONF,
                   "Maximum age of any thundering herd lock."),
     AP_INIT_FLAG("CacheHeader", set_cache_x_cache, NULL, RSRC_CONF | ACCESS_CONF,