mod_socache_shmcb and mod_socache_dbm: finish support of

DefaultRuntimeDir

a partial conversion was made in r1299718, affecting cases
where no filename was specified

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

diff --git a/CHANGES b/CHANGES
index 72a75f51110c52a76cdc3c56f095bbd064d1922b..887dfd33871b6e52319f6f7f4dec0922c4eb36ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@ Changes with Apache 2.5.0
      - APIs: ap_log_pid(), ap_remove_pid, ap_read_pid()
      - core: the scoreboard (ScoreBoardFile) and pid file (PidFile)
      - mod_lbmethod_heartbeat, mod_heartmonitor: heartbeat storage file
+     - mod_socache_shmcb, mod_socache_dbm: shared memory or dbm for cache
      [Jeff Trawick]
 
   *) mod_ssl: Add RFC 5878 support. [Ben Laurie]

diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
index c766bb2fa52179c65e19b43fe0131e6463c8e54b..e7c6204ab7ea4ad4a9f99e44cfa3367fc6bd4bab 100644 (file)
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -72,8 +72,8 @@ SSLPassPhraseDialog  builtin
 #   Inter-Process Session Cache:
 #   Configure the SSL Session Cache: First the mechanism 
 #   to use and second the expiring timeout (in seconds).
-#SSLSessionCache         "dbm:@exp_runtimedir@/ssl_scache"
-SSLSessionCache        "shmcb:@exp_runtimedir@/ssl_scache(512000)"
+#SSLSessionCache         "dbm:ssl_scache"
+SSLSessionCache        "shmcb:ssl_scache(512000)"
 SSLSessionCacheTimeout  300
 
 ##

diff --git a/docs/manual/mod/mod_socache_dbm.xml b/docs/manual/mod/mod_socache_dbm.xml
index d8aac6b99f1e388e8c7c7d80480a3c57dd51b1a6..eaa0bc10e0c71135d9c29512a34f541fc2a41f91 100644 (file)
--- a/docs/manual/mod/mod_socache_dbm.xml
+++ b/docs/manual/mod/mod_socache_dbm.xml
@@ -38,6 +38,9 @@
     dbm:/path/to/datafile
     </example>
 
+    <p>If the path is not absolute then it is assumed to be relative to
+    the <directive module="core">DefaultRuntimeDir</directive>.</p>
+
     <p>Details of other shared object cache providers can be found
     <a href="../socache.html">here</a>.
     </p>

diff --git a/docs/manual/mod/mod_socache_shmcb.xml b/docs/manual/mod/mod_socache_shmcb.xml
index c3d839802ecc124b514ce79a320ae9fcf1bf6eca..fc824264004cca1f5e11055f2f914eeafaf3ffb8 100644 (file)
--- a/docs/manual/mod/mod_socache_shmcb.xml
+++ b/docs/manual/mod/mod_socache_shmcb.xml
@@ -38,6 +38,9 @@
     shmcb:/path/to/datafile(512000)
     </example>
 
+    <p>If the path is not absolute then it is assumed to be relative to
+    the <directive module="core">DefaultRuntimeDir</directive>.</p>
+
     <p>Details of other shared object cache providers can be found
     <a href="../socache.html">here</a>.
     </p>

diff --git a/modules/cache/mod_socache_dbm.c b/modules/cache/mod_socache_dbm.c
index 0d7c302bafa031456cde978545ef0bb64a360cb8..984d2b7111c312a23e721651670ac51e0785669c 100644 (file)
--- a/modules/cache/mod_socache_dbm.c
+++ b/modules/cache/mod_socache_dbm.c
@@ -84,7 +84,7 @@ static const char *socache_dbm_create(ap_socache_instance_t **context,
     *context = ctx = apr_pcalloc(p, sizeof *ctx);
 
     if (arg && *arg) {
-        ctx->data_file = ap_server_root_relative(p, arg);
+        ctx->data_file = ap_runtime_dir_relative(p, arg);
         if (!ctx->data_file) {
             return apr_psprintf(tmp, "Invalid cache file path %s", arg);
         }

diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index 4c892d07ce60e5118ca408cfcb06d460bd161986..e86e7de57657a9afbb7faaf71f713d8c08b8693e 100644 (file)
--- a/modules/cache/mod_socache_shmcb.c
+++ b/modules/cache/mod_socache_shmcb.c
@@ -285,7 +285,7 @@ static const char *socache_shmcb_create(ap_socache_instance_t **context,
         return NULL;
     }
 
-    ctx->data_file = path = ap_server_root_relative(p, arg);
+    ctx->data_file = path = ap_runtime_dir_relative(p, arg);
 
     cp = strrchr(path, '(');
     cp2 = path + strlen(path) - 1;