svn commit: r1370225 - in /httpd/httpd/trunk: CHANGES docs/conf/extra/httpd-ssl.conf.in docs/manual/mod/mod_socache_dbm.xml docs/manual/mod/mod_socache_shmcb.xml modules/cache/mod_socache_dbm.c modules/cache/mod_socache_shmcb.c

[tr...@apache.org]

Author: trawick
Date: Tue Aug  7 12:44:30 2012
New Revision: 1370225

URL: http://svn.apache.org/viewvc?rev=1370225&view=rev
Log:
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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in
    httpd/httpd/trunk/docs/manual/mod/mod_socache_dbm.xml
    httpd/httpd/trunk/docs/manual/mod/mod_socache_shmcb.xml
    httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
    httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1370225&r1=1370224&r2=1370225&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Aug  7 12:44:30 2012
@@ -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]

Modified: httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in?rev=1370225&r1=1370224&r2=1370225&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/extra/httpd-ssl.conf.in Tue Aug  7 12:44:30 2012
@@ -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
 
 ##

Modified: httpd/httpd/trunk/docs/manual/mod/mod_socache_dbm.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_socache_dbm.xml?rev=1370225&r1=1370224&r2=1370225&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_socache_dbm.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_socache_dbm.xml Tue Aug  7 12:44:30 2012
@@ -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>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_socache_shmcb.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_socache_shmcb.xml?rev=1370225&r1=1370224&r2=1370225&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_socache_shmcb.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_socache_shmcb.xml Tue Aug  7 12:44:30 2012
@@ -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>

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dbm.c?rev=1370225&r1=1370224&r2=1370225&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dbm.c Tue Aug  7 12:44:30 2012
@@ -84,7 +84,7 @@ static const char *socache_dbm_create(ap
     *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);
         }

Modified: httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c?rev=1370225&r1=1370224&r2=1370225&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c Tue Aug  7 12:44:30 2012
@@ -285,7 +285,7 @@ static const char *socache_shmcb_create(
         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;