Merge r1370763 from trunk:

mod_slotmem_plain: make the "filename" key relative to
DefaultRuntimeDir if not absolute

mod_slotmem_plain does not externalize or check the full path
in any way, so this change is just for consistency with other
modules which build paths to run-time artifacts.

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1400945 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index f33c2c2818dee2b874bc1b4431e3729c67d88915..d9532063a090dccdbecb8e2d78f79408da162b6b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,12 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_slotmem_plain: honor DefaultRuntimeDir (below doesn't apply since
-     there is no config directive to speak of)
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1370763
-     2.4.x patch: trunk patch works
-     +1: jim, rjung, trawick
-
    * ab: add TLS1.1/TLS1.2 options to -f switch, and adapt output
      to more accurately report the negotiated protocol. PR 53916.
      trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1395225

diff --git a/modules/slotmem/mod_slotmem_plain.c b/modules/slotmem/mod_slotmem_plain.c
index 47da15b49a0b3ca2fcd3a4531c85b6d040ce0862..dc62f46f85b83d68d572672bf383152f5bb55efb 100644 (file)
--- a/modules/slotmem/mod_slotmem_plain.c
+++ b/modules/slotmem/mod_slotmem_plain.c
@@ -75,7 +75,7 @@ static apr_status_t slotmem_create(ap_slotmem_instance_t **new, const char *name
         if (name[0] == ':')
             fname = name;
         else
-            fname = ap_server_root_relative(pool, name);
+            fname = ap_runtime_dir_relative(pool, name);
 
         /* first try to attach to existing slotmem */
         if (next) {
@@ -126,7 +126,7 @@ static apr_status_t slotmem_attach(ap_slotmem_instance_t **new, const char *name
         if (name[0] == ':')
             fname = name;
         else
-            fname = ap_server_root_relative(pool, name);
+            fname = ap_runtime_dir_relative(pool, name);
     }
     else
         return APR_ENOSHMAVAIL;