From: Willy Tarreau <w@1wt.eu>
Date: Wed, 6 Oct 2021 09:40:11 +0000 (+0200)
Subject: CLEANUP: mux_fcgi: remove dependency on ssl_sock
X-Git-Tag: v2.5-dev9~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2ae3858e94e5970bfef26a8e576825fcca2d300;p=thirdparty%2Fhaproxy.git

CLEANUP: mux_fcgi: remove dependency on ssl_sock

It's not needed anymore (used to be needed for ssl_sock_is_ssl()).
---

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 5ddcd4c366..3c03021022 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -30,7 +30,6 @@
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
 #include <haproxy/session-t.h>
-#include <haproxy/ssl_sock.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/trace.h>
@@ -1321,12 +1320,12 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
 		params->cont_len = ist2(b_tail(params->p), end - b_tail(params->p));
 		params->p->data += params->cont_len.len;
 	}
-#ifdef USE_OPENSSL
+
 	if (!(params->mask & FCGI_SP_HTTPS)) {
 		if (cli_conn)
 			params->https = conn_is_ssl(cli_conn);
 	}
-#endif
+
 	if ((params->mask & FCGI_SP_URI_MASK) != FCGI_SP_URI_MASK) {
 		/* one of scriptname, pathinfo or query_string is no set */
 		struct http_uri_parser parser = http_uri_parser_init(params->uri);