You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/03/24 23:20:35 UTC
svn commit: r758062 - in /httpd/httpd/trunk/server/mpm: prefork/prefork.c
winnt/mpm_winnt.c
Author: trawick
Date: Tue Mar 24 22:20:34 2009
New Revision: 758062
URL: http://svn.apache.org/viewvc?rev=758062&view=rev
Log:
main() now sets ap_server_conf()
Modified:
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=758062&r1=758061&r2=758062&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Tue Mar 24 22:20:34 2009
@@ -1257,7 +1257,6 @@
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) {
Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=758062&r1=758061&r2=758062&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Tue Mar 24 22:20:34 2009
@@ -1590,8 +1590,6 @@
{
/* Initialize shared static objects.
*/
- ap_server_conf = s;
-
if (parent_pid != my_pid) {
return OK;
}