summaryrefslogtreecommitdiff
path: root/modules/slotmem
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2018-05-11 09:31:13 +0000
committerYann Ylavic <ylavic@apache.org>2018-05-11 09:31:13 +0000
commiteb353ffa5de91e37877141a42e51e33178e32a34 (patch)
tree186e6b8e03690d41007d05ef1c2e77d01f5f65de /modules/slotmem
parent1ab85bf1db3da41ffa30c4f970aa7feba27f941f (diff)
downloadhttpd-eb353ffa5de91e37877141a42e51e33178e32a34.tar.gz
mod_slotmem_shm: follow up to r1830800, preserve callee API.
The caller might (and actually balancer_child_init() does) rely on slotmem_attach() to not mangle the passed in/out slotmem pointer on failure. [Reverted by r1831868] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831394 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/slotmem')
-rw-r--r--modules/slotmem/mod_slotmem_shm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 92095d1172..8d6bc48fe8 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -586,7 +586,6 @@ static apr_status_t slotmem_attach(ap_slotmem_instance_t **new,
apr_shm_t *shm;
apr_status_t rv;
- *new = NULL;
ap_mpm_query(AP_MPMQ_GENERATION, &generation);
if (!slotmem_filenames(pool, name, &fname, NULL)) {