From: Stefan Eissing <icing@apache.org>
Date: Mon, 16 Oct 2023 12:43:44 +0000 (+0000)
Subject: * modules/http2/h2_session.c (h2_session_start):
X-Git-Tag: 2.4.58-rc2-candidate~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90c542986913285874cb24b6a4790dc724ae6f7;p=thirdparty%2Fapache%2Fhttpd.git

* modules/http2/h2_session.c (h2_session_start):
 Restrict WebSockets options handling to with-WS builds.



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

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 3e1d2b91646..1e560e47792 100644
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -1085,11 +1085,13 @@ static apr_status_t h2_session_start(h2_session *session, int *rv)
         settings[slen].value = win_size;
         ++slen;
     }
+#if H2_USE_WEBSOCKETS
     if (h2_config_sgeti(session->s, H2_CONF_WEBSOCKETS)) {
       settings[slen].settings_id = NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL;
       settings[slen].value = 1;
       ++slen;
     }
+#endif
 
     ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c1,
                   H2_SSSN_LOG(APLOGNO(03201), session,