You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/10/22 18:45:29 UTC
svn commit: r1400945 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/slotmem/mod_slotmem_plain.c
Author: jim
Date: Mon Oct 22 16:45:29 2012
New Revision: 1400945
URL: http://svn.apache.org/viewvc?rev=1400945&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1370763
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1400945&r1=1400944&r2=1400945&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 22 16:45:29 2012
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c?rev=1400945&r1=1400944&r2=1400945&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c (original)
+++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_plain.c Mon Oct 22 16:45:29 2012
@@ -75,7 +75,7 @@ static apr_status_t slotmem_create(ap_sl
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_sl
if (name[0] == ':')
fname = name;
else
- fname = ap_server_root_relative(pool, name);
+ fname = ap_runtime_dir_relative(pool, name);
}
else
return APR_ENOSHMAVAIL;