Mailing List Archive

Author: jfclere
Date: Wed Feb 14 11:18:17 2024
New Revision: 1915782

URL: http://svn.apache.org/viewvc?rev=1915782&view=rev
Log:
Merge r1915400 from trunk:

* mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.

Reviewed by: jfclere, jorton, covener


Added:
httpd/httpd/branches/2.4.x/changes-entries/mod_slotmem_shm.txt
Removed:
httpd/httpd/branches/2.4.x/build/PrintPath
httpd/httpd/branches/2.4.x/build/find_apr.m4
httpd/httpd/branches/2.4.x/build/find_apu.m4
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1915400

Added: httpd/httpd/branches/2.4.x/changes-entries/mod_slotmem_shm.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/changes-entries/mod_slotmem_shm.txt?rev=1915782&view=auto
==============================================================================
--- httpd/httpd/branches/2.4.x/changes-entries/mod_slotmem_shm.txt (added)
+++ httpd/httpd/branches/2.4.x/changes-entries/mod_slotmem_shm.txt Wed Feb 14 11:18:17 2024
@@ -0,0 +1,2 @@
+ *) mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.
+ [Jean-Frederic Clere]

Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c?rev=1915782&r1=1915781&r2=1915782&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c Wed Feb 14 11:18:17 2024
@@ -92,7 +92,7 @@ static int slotmem_filenames(apr_pool_t
const char *fname = NULL, *pname = NULL;

if (slotname && *slotname && strcasecmp(slotname, "none") != 0) {
- if (slotname[0] != '/') {
+ if (!ap_os_is_path_absolute(pool, slotname)) {
/* Each generation needs its own file name. */
int generation = 0;
ap_mpm_query(AP_MPMQ_GENERATION, &generation);
@@ -109,7 +109,7 @@ static int slotmem_filenames(apr_pool_t

if (persistname) {
/* Persisted file names are immutable... */
- if (slotname[0] != '/') {
+ if (!ap_os_is_path_absolute(pool, slotname)) {
pname = apr_pstrcat(pool, DEFAULT_SLOTMEM_PREFIX,
slotname, DEFAULT_SLOTMEM_SUFFIX,
DEFAULT_SLOTMEM_PERSIST_SUFFIX,