From: Jeff Trawick <trawick@apache.org>
Date: Tue, 24 Mar 2009 22:20:34 +0000 (+0000)
Subject: main() now sets ap_server_conf()
X-Git-Tag: 2.3.3~833
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e12944e64d4c804950a696d0a82e68a18fdb3c31;p=apache

main() now sets ap_server_conf()


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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 65417a4c42..00528d204a 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1257,7 +1257,6 @@ static int prefork_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
     apr_status_t rv;
 
     pconf = p;
-    ap_server_conf = s;
 
     /* the reverse of pre_config, we want this only the first time around */
     if (restart_num++ == 0) {
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 60309fb98a..3753c0fadb 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1590,8 +1590,6 @@ static int winnt_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, s
 {
     /* Initialize shared static objects.
      */
-    ap_server_conf = s;
-
     if (parent_pid != my_pid) {
         return OK;
     }