From: Joe Orton <jorton@apache.org>
Date: Mon, 16 Oct 2023 12:28:13 +0000 (+0000)
Subject: Further h2 compile fixes:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=931c39c03b9fb181540871c78b5fd3bc71b387e7;p=thirdparty%2Fapache%2Fhttpd.git

Further h2 compile fixes:

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

* modules/http2/h2_ws.c: Don't include apr_encode.h (not used).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1913019 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, 
diff --git a/modules/http2/h2_ws.c b/modules/http2/h2_ws.c
index 51f80a8ee14..79d5388074d 100644
--- a/modules/http2/h2_ws.c
+++ b/modules/http2/h2_ws.c
@@ -19,7 +19,6 @@
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
-#include "apr_encode.h"
 #include "apr_sha1.h"
 #include "apr_strmatch.h"