From: Jeff Trawick <trawick@apache.org>
Date: Tue, 7 Aug 2012 12:44:30 +0000 (+0000)
Subject: mod_socache_shmcb and mod_socache_dbm: finish support of
X-Git-Tag: 2.5.0-alpha~6474
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9896837afb31aff13bdb6759b3167bd86365262;p=apache

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 72a75f5111..887dfd3387 100644
--- 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 c766bb2fa5..e7c6204ab7 100644
--- 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 d8aac6b99f..eaa0bc10e0 100644
--- 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 c3d839802e..fc82426400 100644
--- 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 0d7c302baf..984d2b7111 100644
--- 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 4c892d07ce..e86e7de576 100644
--- 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;