From: Stefan Eissing <icing@apache.org>
Date: Mon, 16 Oct 2023 11:11:45 +0000 (+0000)
Subject: Merge of /httpd/httpd/trunk:r1913005
X-Git-Tag: 2.4.58-rc2-candidate~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b763f5f4e8255b63a1f57b57620376d4adf2c391;p=thirdparty%2Fapache%2Fhttpd.git

Merge of /httpd/httpd/trunk:r1913005

  *) mod_http2: enable WebSockets only when compiling against a
     recent enought nghttp2 version.



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

diff --git a/modules/http2/h2.h b/modules/http2/h2.h
index 4127a734872..3d1cae0f066 100644
--- a/modules/http2/h2.h
+++ b/modules/http2/h2.h
@@ -20,6 +20,8 @@
 #include <apr_version.h>
 #include <ap_mmn.h>
 
+#include <nghttp2/nghttp2ver.h>
+
 struct h2_session;
 struct h2_stream;
 
@@ -39,7 +41,7 @@ struct h2_stream;
 #define H2_USE_POLLFD_FROM_CONN 0
 #endif
 
-#if H2_USE_PIPES
+#if H2_USE_PIPES && defined(NGHTTP2_VERSION_NUM) && NGHTTP2_VERSION_NUM >= 0x012200
 #define H2_USE_WEBSOCKETS       1
 #else
 #define H2_USE_WEBSOCKETS       0