From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 21 Mar 2012 15:18:28 +0000 (+0000)
Subject: * Fix changes in parameter names in function definitions done in r1303201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3811fc56ee2c09600705fd1f61fcb35b64bbca12;p=thirdparty%2Fapache%2Fhttpd.git

* Fix changes in parameter names in function definitions done in r1303201

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303435 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index 4a0de7b944a..e8eeb0713e8 100644
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -100,7 +100,7 @@ AP_DECLARE(int) ap_unregister_extra_mpm_process(pid_t pid, ap_generation_t *old_
         else {
             extras = cur->next;
         }
-        *gen = cur->gen;
+        *old_gen = cur->gen;
         free(cur);
         return 1; /* found */
     }
@@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal_setup(server_rec *s,
 
 #endif /* NO_USE_SIGACTION */
 
-    pconf = in_pconf;
+    pconf = pconf;
     parent_pid = my_pid = getpid();
 
     return APR_SUCCESS;