mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-11 17:46:57 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: mux_fcgi: remove dependency on ssl_sock

Browse Source 
It's not needed anymore (used to be needed for ssl_sock_is_ssl()).
This commit is contained in:
Willy Tarreau 2021-10-06 11:40:11 +02:00
parent 1057beecda
commit d2ae3858e9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mux_fcgi.c
View File

@ -30,7 +30,6 @@
#include <haproxy/proxy.h> #include <haproxy/proxy.h>
#include <haproxy/regex.h> #include <haproxy/regex.h>
#include <haproxy/session-t.h> #include <haproxy/session-t.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/stream.h> #include <haproxy/stream.h>
#include <haproxy/stream_interface.h> #include <haproxy/stream_interface.h>
#include <haproxy/trace.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->cont_len = ist2(b_tail(params->p), end - b_tail(params->p));
params->p->data += params->cont_len.len; params->p->data += params->cont_len.len;
} }
#ifdef USE_OPENSSL
if (!(params->mask & FCGI_SP_HTTPS)) { if (!(params->mask & FCGI_SP_HTTPS)) {
if (cli_conn) if (cli_conn)
params->https = conn_is_ssl(cli_conn); params->https = conn_is_ssl(cli_conn);
} }
#endif
if ((params->mask & FCGI_SP_URI_MASK) != FCGI_SP_URI_MASK) { if ((params->mask & FCGI_SP_URI_MASK) != FCGI_SP_URI_MASK) {
/* one of scriptname, pathinfo or query_string is no set */ /* one of scriptname, pathinfo or query_string is no set */
struct http_uri_parser parser = http_uri_parser_init(params->uri); struct http_uri_parser parser = http_uri_parser_init(params->uri);