Fix h2 build broken in r1913019:

* modules/http2: Make WebSockets support conditional also
  on APR 1.7.x since apr_encode.h is required. Restore
  #include "apr_encode.h" removed in previous commit.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1913023 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http2/h2.h b/modules/http2/h2.h
index 06e7087c0489999500525c5113449f36c8019b26..30ad9904436ee56cf4425a7c1a3b985054b1a164 100644 (file)
--- a/modules/http2/h2.h
+++ b/modules/http2/h2.h
@@ -41,7 +41,9 @@ struct h2_stream;
 #define H2_USE_POLLFD_FROM_CONN 0
 #endif
 
-#if H2_USE_PIPES && defined(NGHTTP2_VERSION_NUM) && NGHTTP2_VERSION_NUM >= 0x012200
+/* WebSockets support requires apr 1.7.0 for apr_encode.h, plus the
+ * WebSockets features of nghttp2 1.34.0 and later. */
+#if H2_USE_PIPES && defined(NGHTTP2_VERSION_NUM) && NGHTTP2_VERSION_NUM >= 0x012200 && APR_VERSION_AT_LEAST(1,7,0)
 #define H2_USE_WEBSOCKETS       1
 #else
 #define H2_USE_WEBSOCKETS       0

diff --git a/modules/http2/h2_ws.c b/modules/http2/h2_ws.c
index 79d5388074d2343af950e4f89de8315f2324ce86..5f257ec1669789e05eceb0382f0f66678e581399 100644 (file)
--- a/modules/http2/h2_ws.c
+++ b/modules/http2/h2_ws.c
@@ -44,6 +44,8 @@
 
 #if H2_USE_WEBSOCKETS
 
+#include "apr_encode.h" /* H2_USE_WEBSOCKETS is conditional on APR 1.6+ */
+
 static ap_filter_rec_t *c2_ws_out_filter_handle;
 
 struct ws_filter_ctx {