56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From 32881a76e31f8bafa498999bae5237c3a6418317 Mon Sep 17 00:00:00 2001
|
|
From: Jean-Frederic Clere <jfclere@apache.org>
|
|
Date: Wed, 14 Feb 2024 14:27:03 +0000
|
|
Subject: [PATCH] * mod_slotmem_shm: Use ap_os_is_path_absolute() to make it
|
|
portable.
|
|
|
|
Reviewed by: jfclere, jorton, covener
|
|
|
|
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915791 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/apache/httpd/commit/32881a76e31f8bafa498999bae5237c3a6418317
|
|
|
|
---
|
|
changes-entries/mod_slotmem_shm.txt | 3 +++
|
|
modules/slotmem/mod_slotmem_shm.c | 4 ++--
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
create mode 100644 changes-entries/mod_slotmem_shm.txt
|
|
|
|
diff --git a/changes-entries/mod_slotmem_shm.txt b/changes-entries/mod_slotmem_shm.txt
|
|
new file mode 100644
|
|
index 0000000..767711f
|
|
--- /dev/null
|
|
+++ b/changes-entries/mod_slotmem_shm.txt
|
|
@@ -0,0 +1,3 @@
|
|
+ *) mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.
|
|
+ [Jean-Frederic Clere]
|
|
+
|
|
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
|
|
index f4eaa84..4d14faf 100644
|
|
--- a/modules/slotmem/mod_slotmem_shm.c
|
|
+++ b/modules/slotmem/mod_slotmem_shm.c
|
|
@@ -92,7 +92,7 @@ static int slotmem_filenames(apr_pool_t *pool,
|
|
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 *pool,
|
|
|
|
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,
|
|
--
|
|
2.33.0
|
|
|