VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-20 16:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

* server/mpm_common.c (dummy_connection): If possible, use a non-SSL

Browse Source 
listening port to use for the dummy connection, to avoid causing
  (confusing) error log spam by sending EOF down an SSL port.

PR: 39653


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726065 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2008-12-12 16:08:16 +00:00
parent d494d1c1f5
commit d5ea11eded
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/mpm_common.c
View File

@ -657,6 +657,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 *lp;
/* create a temporary pool for the socket. pconf stays around too long */
rv = apr_pool_create(&p, pod->p);
@ -664,8 +665,19 @@ 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);
/* If possible, find a listener which is configured for
* plain-HTTP, not SSL; using an SSL port would either be
* expensive to do correctly (performing a complete SSL handshake)
* or cause log spam by doing incorrectly (simply sending EOF). */
lp = ap_listeners;
while (lp && lp->protocol && strcasecmp(lp->protocol, "http") != 0) {
lp = lp->next;
}
if (!lp) {
lp = ap_listeners;
}
rv = apr_socket_create(&sock, lp->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");
@ -688,7 +700,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, lp->bind_addr);
if (rv != APR_SUCCESS) {
int log_level = APLOG_WARNING;
@ -701,7 +713,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", lp->bind_addr);
}
/* Create the request string. We include a User-Agent so that