If you revert r1913027, r1913024, r1913006, hence
--- modules/http2/h2.h (revision 1913024)
+++ modules/http2/h2.h (revision 1913006)
@@ -20,8 +20,6 @@
#include <apr_version.h>
#include <ap_mmn.h>
-#include <nghttp2/nghttp2ver.h>
-
struct h2_session;
struct h2_stream;
@@ -41,9 +39,7 @@
#define H2_USE_POLLFD_FROM_CONN 0
#endif
+#if H2_USE_PIPES
-/* 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
reverted:
--- modules/http2/h2_ws.c (revision 1913027)
+++ modules/http2/h2_ws.c (revision 1913024)
@@ -19,6 +19,7 @@
#include "apr.h"
#include "apr_strings.h"
#include "apr_lib.h"
+#include "apr_encode.h"
#include "apr_sha1.h"
#include "apr_strmatch.h"
@@ -44,8 +45,6 @@
#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 {
it works again on win32?
Regards
Rüdiger
On 10/16/23 6:04 PM, SteffenAL wrote:
> Thanks Joe.
>
> #include "apr_tables.h" does not help.
>
> Steffen
>
>
> On Monday 16/10/2023 at 15:41, Joe Orton wrote:
>> On Mon, Oct 16, 2023 at 03:12:24PM +0200, SteffenAL wrote:
>>>
>>> checkout.
>>>
>>>
>>> Looks like h2_ws.h :
>>>
>>>
>>> Generating Code...
>>> h2_ws.h
>>> C:\VS17\Win32\httpd-2.4\modules\http2\h2.h(173,17): error C2143: syntax
>>> error: missing ';' before '*'
>>> C:\VS17\Win32\httpd-2.4\modules\http2\h2.h(173,17): error C4430: missing
>>> type specifier - int assumed. Note: C++ does not support default-int
>>
>> Windows compiler errors are often specific to the Windows, you should
>> not assume anybody else here will understand (or care) about them. So
>> rather than reporting, can you work out what the problem is? Line 173
>> uses apr_table_t, does adding #include "apr_tables.h" somewhere help
>> here?
>>
>> Regards, Joe
>>
>