7b7366b1d9
- Update haproxy download URL and hash - Switched over to using USE_LIBATOMIC in favor of -latomic - Added a patch which fixes nossl builds Signed-off-by: Christian Lachner <gladiac@gmail.com>
87 lines
2.6 KiB
Diff
87 lines
2.6 KiB
Diff
commit ea489aa18caacf057880c67b933689c363307a23
|
|
Author: Amaury Denoyelle <adenoyelle@haproxy.com>
|
|
Date: Thu Nov 25 10:20:19 2021 +0100
|
|
|
|
BUILD/MINOR: server: fix compilation without SSL
|
|
|
|
The build without SSL was broken by the following backported commit:
|
|
8e99b84dba7755e73563093a8fcedb25e70e7b94
|
|
MEDIUM: server/backend: implement websocket protocol selection
|
|
|
|
Fix this by checking the ALPN only if USE_OPENSSL and
|
|
TLSEXT_TYPE_application_layer_protocol_negotiation are defined. Else
|
|
always use the server mux-proto.
|
|
|
|
No need to backport.
|
|
|
|
--- a/src/server.c
|
|
+++ b/src/server.c
|
|
@@ -204,7 +204,33 @@ void srv_set_dyncookie(struct server *s)
|
|
*/
|
|
int srv_check_reuse_ws(struct server *srv)
|
|
{
|
|
- if (srv->mux_proto || srv->use_ssl != 1 || !srv->ssl_ctx.alpn_str) {
|
|
+#if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
|
|
+ if (!srv->mux_proto && srv->use_ssl && srv->ssl_ctx.alpn_str) {
|
|
+ /* ALPN selection.
|
|
+ * Based on the assumption that only "h2" and "http/1.1" token
|
|
+ * are used on server ALPN.
|
|
+ */
|
|
+ const struct ist alpn = ist2(srv->ssl_ctx.alpn_str,
|
|
+ srv->ssl_ctx.alpn_len);
|
|
+
|
|
+ switch (srv->ws) {
|
|
+ case SRV_WS_AUTO:
|
|
+ /* for auto mode, consider reuse as possible if the
|
|
+ * server uses a single protocol ALPN
|
|
+ */
|
|
+ if (!istchr(alpn, ','))
|
|
+ return 1;
|
|
+ break;
|
|
+
|
|
+ case SRV_WS_H2:
|
|
+ return isteq(alpn, ist("\x02h2"));
|
|
+
|
|
+ case SRV_WS_H1:
|
|
+ return isteq(alpn, ist("\x08http/1.1"));
|
|
+ }
|
|
+ }
|
|
+ else {
|
|
+#endif /* defined(OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation) */
|
|
/* explicit srv.mux_proto or no ALPN : srv.mux_proto is used
|
|
* for mux selection.
|
|
*/
|
|
@@ -232,31 +258,9 @@ int srv_check_reuse_ws(struct server *sr
|
|
return 1;
|
|
break;
|
|
}
|
|
+#if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
|
|
}
|
|
- else {
|
|
- /* ALPN selection.
|
|
- * Based on the assumption that only "h2" and "http/1.1" token
|
|
- * are used on server ALPN.
|
|
- */
|
|
- const struct ist alpn = ist2(srv->ssl_ctx.alpn_str,
|
|
- srv->ssl_ctx.alpn_len);
|
|
-
|
|
- switch (srv->ws) {
|
|
- case SRV_WS_AUTO:
|
|
- /* for auto mode, consider reuse as possible if the
|
|
- * server uses a single protocol ALPN
|
|
- */
|
|
- if (!istchr(alpn, ','))
|
|
- return 1;
|
|
- break;
|
|
-
|
|
- case SRV_WS_H2:
|
|
- return isteq(alpn, ist("\x02h2"));
|
|
-
|
|
- case SRV_WS_H1:
|
|
- return isteq(alpn, ist("\x08http/1.1"));
|
|
- }
|
|
- }
|
|
+#endif /* defined(OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation) */
|
|
|
|
return 0;
|
|
}
|