Blob Blame History Raw

Hack to send the dummy HTTP request only to the first listener 
configured, to avoid spamming the SSL vhost in the default install.

In 2.2 lr->protocol could be used instead to do this properly, if
that was actually initialized properly by mod_ssl.

Upstream-Status: not submitted, ugly hack which only makes a difference
		to the default configuration used in Fedora.  Need to find
		a way to do this properly.

diff --git a/server/mpm_common.c b/server/mpm_common.c
index eb59407..36e318e 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -648,6 +648,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
     apr_socket_t *sock;
     apr_pool_t *p;
     apr_size_t len;
+    ap_listen_rec *lr;
 
     /* create a temporary pool for the socket.  pconf stays around too long */
     rv = apr_pool_create(&p, pod->p);
@@ -655,8 +656,11 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
         return rv;
     }
 
-    rv = apr_socket_create(&sock, ap_listeners->bind_addr->family,
-                           SOCK_STREAM, 0, p);
+    /* Find an HTTP listener specified first in the configuration. */
+    for (lr = ap_listeners; lr->next != NULL; lr = lr->next)
+        /* noop */;
+
+    rv = apr_socket_create(&sock, lr->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");
@@ -679,7 +683,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
         return rv;
     }
 
-    rv = apr_socket_connect(sock, ap_listeners->bind_addr);
+    rv = apr_socket_connect(sock, lr->bind_addr);
     if (rv != APR_SUCCESS) {
         int log_level = APLOG_WARNING;
 
@@ -692,7 +696,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
         }
 
         ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf,
-                     "connect to listener on %pI", ap_listeners->bind_addr);
+                     "connect to listener on %pI", lr->bind_addr);
         apr_pool_destroy(p);
         return rv;
     }