The new h2h gives now on Windows 32 :
syntax error: identifier 'conn_rec' mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2_ws.h 31
syntax error: missing ';' before '*' mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 173
missing type specifier - int assumed. Note: C++ does not support
default-int mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 173
C2238 unexpected token(s) preceding ';' mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 173
C3646 'request_time': unknown override specifier mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 175
C4430 missing type specifier - int assumed. Note: C++ does not support
default-int mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 175
C4430 missing type specifier - int assumed. Note: C++ does not support
default-int mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 190
C2146 syntax error: missing ';' before identifier 'h2_io_data_cb'
mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 190
C2062 type 'void' unexpected mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 190
Steffen
On Monday 16/10/2023 at 13:11, icing@apache.org wrote:
> Author: icing
> Date: Mon Oct 16 11:11:45 2023
> New Revision: 1913006
>
> URL: http://svn.apache.org/viewvc?rev=1913006&view=rev
> Log:
> Merge of /httpd/httpd/trunk:r1913005
>
> *) mod_http2: enable WebSockets only when compiling against a
> recent enought nghttp2 version.
>
>
> Modified:
> httpd/httpd/branches/2.4.x/ (props changed)
> httpd/httpd/branches/2.4.x/modules/http2/h2.h
>
> Propchange: httpd/httpd/branches/2.4.x/
> ------------------------------------------------------------------------------
> Merged /httpd/httpd/trunk:r1913005
>
> Modified: httpd/httpd/branches/2.4.x/modules/http2/h2.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2.h?rev=1913006&r1=1913005&r2=1913006&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/http2/h2.h (original)
> +++ httpd/httpd/branches/2.4.x/modules/http2/h2.h Mon Oct 16 11:11:45
> 2023
> @@ -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
>
>
syntax error: identifier 'conn_rec' mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2_ws.h 31
syntax error: missing ';' before '*' mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 173
missing type specifier - int assumed. Note: C++ does not support
default-int mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 173
C2238 unexpected token(s) preceding ';' mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 173
C3646 'request_time': unknown override specifier mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 175
C4430 missing type specifier - int assumed. Note: C++ does not support
default-int mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 175
C4430 missing type specifier - int assumed. Note: C++ does not support
default-int mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 190
C2146 syntax error: missing ';' before identifier 'h2_io_data_cb'
mod_http2 C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 190
C2062 type 'void' unexpected mod_http2
C:\VS17\Win32\httpd-2.4\modules\http2\h2.h 190
Steffen
On Monday 16/10/2023 at 13:11, icing@apache.org wrote:
> Author: icing
> Date: Mon Oct 16 11:11:45 2023
> New Revision: 1913006
>
> URL: http://svn.apache.org/viewvc?rev=1913006&view=rev
> Log:
> Merge of /httpd/httpd/trunk:r1913005
>
> *) mod_http2: enable WebSockets only when compiling against a
> recent enought nghttp2 version.
>
>
> Modified:
> httpd/httpd/branches/2.4.x/ (props changed)
> httpd/httpd/branches/2.4.x/modules/http2/h2.h
>
> Propchange: httpd/httpd/branches/2.4.x/
> ------------------------------------------------------------------------------
> Merged /httpd/httpd/trunk:r1913005
>
> Modified: httpd/httpd/branches/2.4.x/modules/http2/h2.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2.h?rev=1913006&r1=1913005&r2=1913006&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/http2/h2.h (original)
> +++ httpd/httpd/branches/2.4.x/modules/http2/h2.h Mon Oct 16 11:11:45
> 2023
> @@ -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
>
>