From: Daniel Ruggeri <druggeri@apache.org>
Date: Thu, 26 Mar 2020 14:37:03 +0000 (+0000)
Subject:   *) mod_proxy_hcheck: Use is_ssl for wss and https.
X-Git-Tag: 2.4.43~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e624b4a0c17934c2a935b851102e36d9e75cecc7;p=thirdparty%2Fapache%2Fhttpd.git

  *) mod_proxy_hcheck: Use is_ssl for wss and https.
     trunk patch: http://svn.apache.org/r1875579
     2.4.x patch: svn merge -c 1875579 ^/httpd/httpd/trunk .
     +1: jfclere, gbechis, druggeri


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1875712 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 7e7f438a24d..41b27b7a12b 100644
--- a/STATUS
+++ b/STATUS
@@ -133,10 +133,6 @@ RELEASE SHOWSTOPPERS:
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
-  *) mod_proxy_hcheck: Use is_ssl for wss and https.
-     trunk patch: http://svn.apache.org/r1875579
-     2.4.x patch: svn merge -c 1875579 ^/httpd/httpd/trunk .
-     +1: jfclere, gbechis, druggeri
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 9854e348a53..832bee657e4 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -598,7 +598,7 @@ static int hc_get_backend(const char *proxy_function, proxy_conn_rec **backend,
     if (status == OK) {
         (*backend)->addr = hc->cp->addr;
         (*backend)->hostname = hc->s->hostname_ex;
-        if (strcmp(hc->s->scheme, "https") == 0) {
+        if (strcmp(hc->s->scheme, "https") == 0 || strcmp(hc->s->scheme, "wss") == 0 ) {
             if (!ap_proxy_ssl_enable(NULL)) {
                 ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ctx->s, APLOGNO(03252)
                               "mod_ssl not configured?");