]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_slotmem_shm: follow up to r1830800, preserve callee API.
authorYann Ylavic <ylavic@apache.org>
Fri, 11 May 2018 09:31:13 +0000 (09:31 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 11 May 2018 09:31:13 +0000 (09:31 +0000)
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

modules/slotmem/mod_slotmem_shm.c

index 92095d117282f97690c2ffcbd5da275089ad0c67..8d6bc48fe837bc6e46db4a4b7873add7116d6966 100644 (file)
@@ -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)) {