summaryrefslogtreecommitdiffstats
path: root/modules/ssl/mod_ssl.c
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2022-08-01 14:56:11 +0200
committerStefan Eissing <icing@apache.org>2022-08-01 14:56:11 +0200
commit3e835f22affadfcfa3908277611a0e9961ece1c1 (patch)
treeb5046b1b232bc87128861b2c190aa8db80cc1a3d /modules/ssl/mod_ssl.c
parentcore: Follow up to r1902728 and r1902906: simplify for APR-1.8+. (diff)
downloadapache2-3e835f22affadfcfa3908277611a0e9961ece1c1.tar.xz
apache2-3e835f22affadfcfa3908277611a0e9961ece1c1.zip
*) mod_ssl: when a proxy connection had handled a request using SSL, an
error was logged when "SSLProxyEngine" was only configured in the location/proxy section and not the overall server. The connection continued to work, the error log was in error. Fixed PR66190. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1903167 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/mod_ssl.c')
-rw-r--r--modules/ssl/mod_ssl.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index d1f6fbbc1f..93745fe3ed 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -556,6 +556,13 @@ static int ssl_hook_ssl_bind_outgoing(conn_rec *c,
int status;
sslconn = ssl_init_connection_ctx(c, per_dir_config, 1);
+ if (sslconn->ssl) {
+ /* we are already bound to this connection. We have rebound
+ * or removed the reference to a previous per_dir_config,
+ * there is nothing more to do. */
+ return OK;
+ }
+
status = ssl_engine_status(c, sslconn);
if (enable_ssl) {
if (status != OK) {