From 012add21ac64feeb40a81a6f0ac17b00b0e14443 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Sat, 1 Mar 2014 21:36:27 +0000 Subject: [PATCH] mod_proxy: Add comment and avoid ternary operator as condition (no functional change). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1573229 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_util.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 7fafbfdcf35..23dfba334b4 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -2367,10 +2367,14 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, else { ssl_hostname = conn->hostname; } - if (conn->ssl_hostname != NULL - ? (ssl_hostname == NULL || strcasecmp(conn->ssl_hostname, - ssl_hostname) != 0) - : (ssl_hostname != NULL && conn->sock)) { + /* + * Close if a SNI is in use but this request requires no or + * a different one, or no SNI is in use but one is required. + */ + if ((conn->ssl_hostname && (!ssl_hostname || + strcasecmp(conn->ssl_hostname, + ssl_hostname) != 0)) || + (!conn->ssl_hostname && ssl_hostname && conn->sock)) { socket_cleanup(conn); } if (conn->ssl_hostname == NULL) { -- 2.47.3