Mailing List Archive

Author: jfclere
Date: Wed Feb 14 11:25:01 2024
New Revision: 1915783

URL: http://svn.apache.org/viewvc?rev=1915783&view=rev
Log:
undo r1915782.

Added:
httpd/httpd/branches/2.4.x/build/PrintPath
- copied unchanged from r1915781, httpd/httpd/branches/2.4.x/build/PrintPath
httpd/httpd/branches/2.4.x/build/find_apr.m4
- copied unchanged from r1915781, httpd/httpd/branches/2.4.x/build/find_apr.m4
httpd/httpd/branches/2.4.x/build/find_apu.m4
- copied unchanged from r1915781, httpd/httpd/branches/2.4.x/build/find_apu.m4
Removed:
httpd/httpd/branches/2.4.x/changes-entries/mod_slotmem_shm.txt
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/
------------------------------------------------------------------------------
Reverse-merged /httpd/httpd/trunk:r1915400

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=1915783&r1=1915782&r2=1915783&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:25:01 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 (!ap_os_is_path_absolute(pool, slotname)) {
+ if (slotname[0] != '/') {
/* 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 (!ap_os_is_path_absolute(pool, slotname)) {
+ if (slotname[0] != '/') {
pname = apr_pstrcat(pool, DEFAULT_SLOTMEM_PREFIX,
slotname, DEFAULT_SLOTMEM_SUFFIX,
DEFAULT_SLOTMEM_PERSIST_SUFFIX,