From 9d62a720c01dc69339e87bec672d603061555493 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 26 Jun 2001 16:33:14 +0000 Subject: [PATCH] get rid of a duplicate assignment of ap_server_conf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89419 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/threaded/threaded.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c index 34d382cad7..a675b62a39 100644 --- a/server/mpm/threaded/threaded.c +++ b/server/mpm/threaded/threaded.c @@ -1067,6 +1067,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) pconf = _pconf; ap_server_conf = s; + rv = apr_file_pipe_create(&pipe_of_death_in, &pipe_of_death_out, pconf); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, @@ -1081,7 +1082,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "apr_file_pipe_timeout_set (pipe_of_death)"); exit(1); } - ap_server_conf = s; + if ((num_listensocks = ap_setup_listeners(ap_server_conf)) < 1) { /* XXX: hey, what's the right way for the mpm to indicate a fatal error? */ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, 0, s, -- 2.50.1