You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@apache.org on 2020/03/26 14:37:03 UTC
svn commit: r1875712 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/proxy/mod_proxy_hcheck.c
Author: druggeri
Date: Thu Mar 26 14:37:03 2020
New Revision: 1875712
URL: http://svn.apache.org/viewvc?rev=1875712&view=rev
Log:
*) 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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1875579
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1875712&r1=1875711&r2=1875712&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Mar 26 14:37:03 2020
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c?rev=1875712&r1=1875711&r2=1875712&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_hcheck.c Thu Mar 26 14:37:03 2020
@@ -598,7 +598,7 @@ static int hc_get_backend(const char *pr
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?");