diff options
| author | Joe Orton <jorton@apache.org> | 2023-10-16 15:10:16 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2023-10-16 15:10:16 +0200 |
| commit | b2ef1b58868191a779c86b0e8956af7752f21c18 (patch) | |
| tree | 59f3469291b693d949e0fedd6eb9677332dc2cf8 /modules/http2 | |
| parent | Further h2 compile fixes: (diff) | |
| download | apache2-b2ef1b58868191a779c86b0e8956af7752f21c18.tar.xz apache2-b2ef1b58868191a779c86b0e8956af7752f21c18.zip | |
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
Diffstat (limited to 'modules/http2')
| -rw-r--r-- | modules/http2/h2.h | 4 | ||||
| -rw-r--r-- | modules/http2/h2_ws.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/http2/h2.h b/modules/http2/h2.h index 06e7087c04..30ad990443 100644 --- 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 79d5388074..5f257ec166 100644 --- 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 { |