Mailing List Archive

Hi Steffen,

> Am 16.10.2023 um 14:06 schrieb SteffenAL <info@apachelounge.com>:
>
> 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

The lines 173-175 and 190 are years old. What is going on?

The file h2_ws.h is new and included in 4 *.c files. Which one gives the problem?

//Stefan

> 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
>>
>>
>
>

Steffen,

just to be sure: did you test a 2.4.x checkout or did you apply the patch from Joe yourself?

if there is not other feedback, I'll make a new candidate soon.

> Am 16.10.2023 um 14:06 schrieb SteffenAL <info@apachelounge.com>:
>
> 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
>>
>>
>
>

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

Steffen


On Monday 16/10/2023 at 14:59, Stefan Eissing via dev wrote:
> Steffen,
>
> just to be sure: did you test a 2.4.x checkout or did you apply the
> patch from Joe yourself?
>
> if there is not other feedback, I'll make a new candidate soon.
>
>>
>> Am 16.10.2023 um 14:06 schrieb SteffenAL <info@apachelounge.com>:
>>
>> 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
>>>
>>>
>>
>>
>

> Am 16.10.2023 um 15:12 schrieb SteffenAL <info@apachelounge.com>:
>
> 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

Very strange indeed. I have no explanation.

>
> Steffen
> On Monday 16/10/2023 at 14:59, Stefan Eissing via dev wrote:
>>
>> Steffen,
>>
>> just to be sure: did you test a 2.4.x checkout or did you apply the patch from Joe yourself?
>>
>> if there is not other feedback, I'll make a new candidate soon.
>>
>>> Am 16.10.2023 um 14:06 schrieb SteffenAL <info@apachelounge.com>:
>>>
>>> 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\modu
>> les\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
>>>>
>>>>
>>>
>>>
>>
>
>

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

On 10/16/23 3:18 PM, Stefan Eissing via dev wrote:
>
>> Am 16.10.2023 um 15:12 schrieb SteffenAL <info@apachelounge.com>:
>>
>> 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
>
> Very strange indeed. I have no explanation.

Do we know which file includes h2_ws.h and causes the failure?

Regards

Rüdiger

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
>

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
>>
>