* include/mpm_common.h (ap_pod_t): Remove 'sa' field.

* server/mpm_common.c (ap_mpm_pod_open, dummy_connection): Use
ap_listeners->bind_addr for the dummy connection rather than doing a
name lookup on the first listener's hostname and using one of the
addresses returned.

PR: 27313

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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index 13d7afd9bb8b79ab094bf33201ffef9d3dcb1129..8afb154ed6580785f938ba2814da7f25c866f233 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -139,7 +139,6 @@ struct ap_pod_t {
     apr_file_t *pod_in;
     apr_file_t *pod_out;
     apr_pool_t *p;
-    apr_sockaddr_t *sa;
 };
 
 /**

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 48c177fa6711ca1cb3d35322679df1bc26819641..afb663f29625933e7712a9cb74727194cc65f880 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -366,9 +366,6 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_open(apr_pool_t *p, ap_pod_t **pod)
     apr_file_pipe_timeout_set((*pod)->pod_in, 0);
     (*pod)->p = p;
 
-    apr_sockaddr_info_get(&(*pod)->sa, ap_listeners->bind_addr->hostname,
-                          APR_UNSPEC, ap_listeners->bind_addr->port, 0, p);
-
     /* close these before exec. */
     apr_file_inherit_unset((*pod)->pod_in);
     apr_file_inherit_unset((*pod)->pod_out);
@@ -444,7 +441,8 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
         return rv;
     }
 
-    rv = apr_socket_create(&sock, pod->sa->family, SOCK_STREAM, 0, p);
+    rv = apr_socket_create(&sock, ap_listeners->bind_addr->family,
+                           SOCK_STREAM, 0, p);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                      "get socket to connect to listener");
@@ -467,7 +465,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
         return rv;
     }
 
-    rv = apr_socket_connect(sock, pod->sa);
+    rv = apr_socket_connect(sock, ap_listeners->bind_addr);
     if (rv != APR_SUCCESS) {
         int log_level = APLOG_WARNING;