Re: [VOTE] Release httpd-2.4.58-rc3 as httpd-2.4.58

2023-10-16 Thread Cory McIntire
+1

Built/tested on:
CentOS 6
CentOS 7
AlmaLinux 9
Ubuntu 20.04
Ubuntu 22.04


Regards,
Cory McIntire | Lead – cPanel Application Security Team | Release Manager – 
EasyApache
cory.mcint...@webpros.com | cPanel – a 
webpros company



From: Stefan Eissing via dev 
Date: Monday, October 16, 2023 at 10:08
To: dev@httpd.apache.org 
Cc: Stefan Eissing 
Subject: [VOTE] Release httpd-2.4.58-rc3 as httpd-2.4.58
Hi all,

after fixing my merge mistake in rc2 (sorry!), we go again:

Please find below the proposed release tarball and signatures:

https://nam10.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdist.apache.org%2Frepos%2Fdist%2Fdev%2Fhttpd%2F=05%7C01%7Ccory%40cpanel.net%7Ce5c41228d1ce4a24971208dbce59cb59%7Cf8497356a834406086b6d4b1d8059ee0%7C0%7C0%7C638330657304238920%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C=Hvd0FLQKHpx%2F4%2Flfj2iYh2mCcE4jNevfMZDL0piuolQ%3D=0

I would like to call a VOTE over the next few days to release
this candidate tarball httpd-2.4.58-rc3 as 2.4.58:
[ ] +1: It's not just good, it's good enough!
[ ] +0: Let's have a talk.
[ ] -1: There's trouble in paradise. Here's what's wrong.

The computed digests of the tarball up for vote are:
sha256: 503a7da4a4a27fd496037998b17078dc9fe004db32c657c96cce8356b8aa2eb6 
*httpd-2.4.58-rc3.tar.gz
sha512: 
5c11faf0572035ef67b27775d975999411c689cb774553175299a9e99b63d3d7138b0c7f15048ec28038494d8513689f916202c2289d557947d8b190d46ca9f3
 *httpd-2.4.58-rc3.tar.gz

The SVN candidate source is found at tags/2.4.58-rc3-candidate.

Cheers,
Stefan


Re: [VOTE] Release httpd-2.4.58-rc3 as httpd-2.4.58

2023-10-16 Thread Frank Gingras
+1 for me, Slackware64 15.0. Thanks for the RM, yes.

On Mon, Oct 16, 2023 at 11:43 AM Joe Orton  wrote:

> On Mon, Oct 16, 2023 at 05:08:11PM +0200, Stefan Eissing via dev wrote:
> > Hi all,
> >
> > after fixing my merge mistake in rc2 (sorry!), we go again:
> >
> > Please find below the proposed release tarball and signatures:
> >
> > https://dist.apache.org/repos/dist/dev/httpd/
> >
> > I would like to call a VOTE over the next few days to release
> > this candidate tarball httpd-2.4.58-rc3 as 2.4.58:
> > [X] +1: It's not just good, it's good enough!
> > [ ] +0: Let's have a talk.
> > [ ] -1: There's trouble in paradise. Here's what's wrong.
>
> +1 for release from me, sigs good; builds and passes tests on Fedora 39
> and RHEL 8 and 9, my old computers are happy again ;)
>
> Big thanks for fixes and RMing.
>
> Regards, Joe
>
>


Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x:./modules/http2/h2.h

2023-10-16 Thread SteffenAL


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





Re: [VOTE] Release httpd-2.4.58-rc3 as httpd-2.4.58

2023-10-16 Thread Joe Orton
On Mon, Oct 16, 2023 at 05:08:11PM +0200, Stefan Eissing via dev wrote:
> Hi all,
> 
> after fixing my merge mistake in rc2 (sorry!), we go again:
> 
> Please find below the proposed release tarball and signatures:
> 
> https://dist.apache.org/repos/dist/dev/httpd/
> 
> I would like to call a VOTE over the next few days to release
> this candidate tarball httpd-2.4.58-rc3 as 2.4.58:
> [X] +1: It's not just good, it's good enough!
> [ ] +0: Let's have a talk.
> [ ] -1: There's trouble in paradise. Here's what's wrong.

+1 for release from me, sigs good; builds and passes tests on Fedora 39 
and RHEL 8 and 9, my old computers are happy again ;)

Big thanks for fixes and RMing.

Regards, Joe



Re: svn commit: r1913028 - /httpd/httpd/tags/2.4.58-rc2-candidate/

2023-10-16 Thread Steffen
Yes

> Op 16 okt 2023 om 17:02 heeft Ruediger Pluem  het volgende 
> geschreven:
> 
> Windows 64 bit is fine?
> 
> Regards
> 
> Rüdiger
> 
>> On 10/16/23 3:52 PM, SteffenAL wrote:
>> No go. All other modules fine, only mod_http2 error.
>> 
>> Recap:
>> 
>> On windows 32:
>> 
>> 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
>> ...
>> ...
>>  
>>> On Monday 16/10/2023 at 15:45, ic...@apache.org wrote:
>>> Author: icing
>>> Date: Mon Oct 16 13:43:23 2023
>>> New Revision: 1913028
>>> 
>>> URL: http://svn.apache.org/viewvc?rev=1913028=rev
>>> Log:
>>> resetting candidate 2.4.58-rc2
>>> 
>>> Removed:
>>>  httpd/httpd/tags/2.4.58-rc2-candidate/
>>> 
>> 



[VOTE] Release httpd-2.4.58-rc3 as httpd-2.4.58

2023-10-16 Thread Stefan Eissing via dev
Hi all,

after fixing my merge mistake in rc2 (sorry!), we go again:

Please find below the proposed release tarball and signatures:

https://dist.apache.org/repos/dist/dev/httpd/

I would like to call a VOTE over the next few days to release
this candidate tarball httpd-2.4.58-rc3 as 2.4.58:
[ ] +1: It's not just good, it's good enough!
[ ] +0: Let's have a talk.
[ ] -1: There's trouble in paradise. Here's what's wrong.

The computed digests of the tarball up for vote are:
sha256: 503a7da4a4a27fd496037998b17078dc9fe004db32c657c96cce8356b8aa2eb6 
*httpd-2.4.58-rc3.tar.gz
sha512: 
5c11faf0572035ef67b27775d975999411c689cb774553175299a9e99b63d3d7138b0c7f15048ec28038494d8513689f916202c2289d557947d8b190d46ca9f3
 *httpd-2.4.58-rc3.tar.gz

The SVN candidate source is found at tags/2.4.58-rc3-candidate.

Cheers,
Stefan

Re: svn commit: r1913028 - /httpd/httpd/tags/2.4.58-rc2-candidate/

2023-10-16 Thread Ruediger Pluem
Windows 64 bit is fine?

Regards

Rüdiger

On 10/16/23 3:52 PM, SteffenAL wrote:
> No go. All other modules fine, only mod_http2 error.
> 
> Recap:
> 
> On windows 32:
> 
> 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
> ...
> ...
>  
> On Monday 16/10/2023 at 15:45, ic...@apache.org wrote:
>> Author: icing
>> Date: Mon Oct 16 13:43:23 2023
>> New Revision: 1913028
>>
>> URL: http://svn.apache.org/viewvc?rev=1913028=rev
>> Log:
>> resetting candidate 2.4.58-rc2
>>
>> Removed:
>>  httpd/httpd/tags/2.4.58-rc2-candidate/
>>
> 


Re: windows block

2023-10-16 Thread Joe Orton
On Mon, Oct 16, 2023 at 04:45:29PM +0200, Stefan Eissing via dev wrote:
> Do I make an rc3 nevertheless? Do we know someone else using VC?
> 
> Advice appreciated.

+1 for rc3 at r1913027.

Someone using VC needs to work out how to fix that rather than just 
report it's broken, it shouldn't hold progress up for the rest of the 
world.

Regads, Joe



windows block

2023-10-16 Thread Stefan Eissing via dev
Do I make an rc3 nevertheless? Do we know someone else using VC?

Advice appreciated.

- Stefan


Re: svn commit: r1913028 - /httpd/httpd/tags/2.4.58-rc2-candidate/

2023-10-16 Thread Stefan Eissing via dev
Steffen,

> Am 16.10.2023 um 15:52 schrieb SteffenAL :
> 
> No go. All other modules fine, only mod_http2 error.
> 
> Recap:
> 
> On windows 32:
> 
> 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
> ...
> ...


How can we help you to fix this? Repeating the same error lines again will not 
help. Maybe you can provide more information:

- in which *.c file does the error happen?
- is a specific APR header file missing there?
- does it work if your remove the "#include "h2.h" in h2_ws.h?

- Stefan

>  On Monday 16/10/2023 at 15:45, ic...@apache.org wrote: 
>> 
>> Author: icing
>> Date: Mon Oct 16 13:43:23 2023
>> New Revision: 1913028
>> 
>> URL: http://svn.apache.org/viewvc?rev=1913028=rev
>> Log:
>> resetting candidate 2.4.58-rc2
>> 
>> Removed:
>>  httpd/httpd/tags/2.4.58-rc2-candidate/
>> 
> 
> 



Re: svn commit: r1913028 - /httpd/httpd/tags/2.4.58-rc2-candidate/

2023-10-16 Thread SteffenAL


No go. All other modules fine, only mod_http2 error.

Recap:

On windows 32:

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

...
...


On Monday 16/10/2023 at 15:45, ic...@apache.org wrote:

Author: icing
Date: Mon Oct 16 13:43:23 2023
New Revision: 1913028

URL: http://svn.apache.org/viewvc?rev=1913028=rev
Log:
resetting candidate 2.4.58-rc2

Removed:
   httpd/httpd/tags/2.4.58-rc2-candidate/





Re: [VOTE] Release httpd-2.4.58-rc2 as httpd-2.4.58

2023-10-16 Thread Stefan Eissing via dev



> Am 16.10.2023 um 15:40 schrieb Ruediger Pluem :
> 
> I am sorry, but #include "apr_encode.h" is still unconditional in h2_ws.c in 
> 2.4.x. Fixed in r1913027.

Thanks for catching this.

> 
> Regards
> 
> Rüdiger
> 
> 
> On 10/16/23 3:31 PM, Stefan Eissing via dev wrote:
>> Hi all,
>> 
>> after some hickups with getting the new WebSockets support to
>> compile on Joe's old computers, we try again!
>> 
>> Please find below the proposed release tarball and signatures:
>> 
>> https://dist.apache.org/repos/dist/dev/httpd/
>> 
>> I would like to call a VOTE over the next few days to release
>> this candidate tarball httpd-2.4.58-rc2 as 2.4.58:
>> [ ] +1: It's not just good, it's good enough!
>> [ ] +0: Let's have a talk.
>> [ ] -1: There's trouble in paradise. Here's what's wrong.
>> 
>> The computed digests of the tarball up for vote are:
>> sha256: e544ee225fbab4f4cdd60970dc0bbd0b74cbd331cd7a5635faca717d532d8ed6 
>> *httpd-2.4.58-rc2.tar.gz
>> sha512: 
>> d4d322300cee4899dc1671e58dd5f6b88632beae87192cde475285324b9ceda62a9200b80fdd96b928f9eade5f819fc9bc3b3563f1b7b1fb3e759fd6d5df935a
>>  *httpd-2.4.58-rc2.tar.gz
>> 
>> The SVN candidate source is found at tags/2.4.58-rc2-candidate.
>> 
>> Cheers,
>> Stefan
>> 



Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x: ./modules/http2/h2.h

2023-10-16 Thread Ruediger Pluem



On 10/16/23 3:18 PM, Stefan Eissing via dev wrote:
> 
>> Am 16.10.2023 um 15:12 schrieb SteffenAL :
>>
>> 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



Re: [VOTE] Release httpd-2.4.58-rc2 as httpd-2.4.58

2023-10-16 Thread Ruediger Pluem
I am sorry, but #include "apr_encode.h" is still unconditional in h2_ws.c in 
2.4.x. Fixed in r1913027.

Regards

Rüdiger


On 10/16/23 3:31 PM, Stefan Eissing via dev wrote:
> Hi all,
> 
> after some hickups with getting the new WebSockets support to
> compile on Joe's old computers, we try again!
> 
> Please find below the proposed release tarball and signatures:
> 
> https://dist.apache.org/repos/dist/dev/httpd/
> 
> I would like to call a VOTE over the next few days to release
> this candidate tarball httpd-2.4.58-rc2 as 2.4.58:
> [ ] +1: It's not just good, it's good enough!
> [ ] +0: Let's have a talk.
> [ ] -1: There's trouble in paradise. Here's what's wrong.
> 
> The computed digests of the tarball up for vote are:
> sha256: e544ee225fbab4f4cdd60970dc0bbd0b74cbd331cd7a5635faca717d532d8ed6 
> *httpd-2.4.58-rc2.tar.gz
> sha512: 
> d4d322300cee4899dc1671e58dd5f6b88632beae87192cde475285324b9ceda62a9200b80fdd96b928f9eade5f819fc9bc3b3563f1b7b1fb3e759fd6d5df935a
>  *httpd-2.4.58-rc2.tar.gz
> 
> The SVN candidate source is found at tags/2.4.58-rc2-candidate.
> 
> Cheers,
> Stefan
> 


Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x: ./modules/http2/h2.h

2023-10-16 Thread Joe Orton
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



[VOTE] Release httpd-2.4.58-rc2 as httpd-2.4.58

2023-10-16 Thread Stefan Eissing via dev
Hi all,

after some hickups with getting the new WebSockets support to
compile on Joe's old computers, we try again!

Please find below the proposed release tarball and signatures:

https://dist.apache.org/repos/dist/dev/httpd/

I would like to call a VOTE over the next few days to release
this candidate tarball httpd-2.4.58-rc2 as 2.4.58:
[ ] +1: It's not just good, it's good enough!
[ ] +0: Let's have a talk.
[ ] -1: There's trouble in paradise. Here's what's wrong.

The computed digests of the tarball up for vote are:
sha256: e544ee225fbab4f4cdd60970dc0bbd0b74cbd331cd7a5635faca717d532d8ed6 
*httpd-2.4.58-rc2.tar.gz
sha512: 
d4d322300cee4899dc1671e58dd5f6b88632beae87192cde475285324b9ceda62a9200b80fdd96b928f9eade5f819fc9bc3b3563f1b7b1fb3e759fd6d5df935a
 *httpd-2.4.58-rc2.tar.gz

The SVN candidate source is found at tags/2.4.58-rc2-candidate.

Cheers,
Stefan

Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x: ./modules/http2/h2.h

2023-10-16 Thread Stefan Eissing via dev


> Am 16.10.2023 um 15:12 schrieb SteffenAL :
> 
> 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 :
>>> 
>>> 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, ic...@apache.org wrote: 
 
 Author: icing
 Date: Mon Oct 16 11:11:45 2023
 New Revision: 1913006
 
 URL: http://svn.apache.org/viewvc?rev=1913006=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=1913005=1913006=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 
 #include 
 
 +#include 
 +
 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
 
 
>>> 
>>> 
>> 
> 
> 



Re: svn commit: r1913019 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_ws.c

2023-10-16 Thread Eric Covener
On Mon, Oct 16, 2023 at 9:13 AM Joe Orton  wrote:
>
> On Mon, Oct 16, 2023 at 02:54:58PM +0200, Ruediger Pluem wrote:
> > Fails for me as well. Not sure what fails for Joe such that he removed the 
> > include, but if it fails in case H2_USE_WEBSOCKETS is
> > not 1 I guess we could move the include (or even all) below the
> >
> > #if H2_USE_WEBSOCKETS
> >
> > line.
>
> Oh, sorry guys.
>
> I was building against APR 1.6.x here which doesn't have apr_encode.h, I
> didn't see the apr_pencode use. So how about:
>
> r1913019 + r1913023, +1 for 2.4.x for the pair
+1


Re: svn commit: r1913019 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_ws.c

2023-10-16 Thread Stefan Eissing via dev



> Am 16.10.2023 um 15:12 schrieb Joe Orton :
> 
> On Mon, Oct 16, 2023 at 02:54:58PM +0200, Ruediger Pluem wrote:
>> Fails for me as well. Not sure what fails for Joe such that he removed the 
>> include, but if it fails in case H2_USE_WEBSOCKETS is
>> not 1 I guess we could move the include (or even all) below the
>> 
>> #if H2_USE_WEBSOCKETS
>> 
>> line.
> 
> Oh, sorry guys. 
> 
> I was building against APR 1.6.x here which doesn't have apr_encode.h, I 
> didn't see the apr_pencode use. So how about:
> 
> r1913019 + r1913023, +1 for 2.4.x for the pair
> 

+1

Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x: ./modules/http2/h2.h

2023-10-16 Thread SteffenAL


Re: svn commit: r1913019 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_ws.c

2023-10-16 Thread Joe Orton
On Mon, Oct 16, 2023 at 02:54:58PM +0200, Ruediger Pluem wrote:
> Fails for me as well. Not sure what fails for Joe such that he removed the 
> include, but if it fails in case H2_USE_WEBSOCKETS is
> not 1 I guess we could move the include (or even all) below the
> 
> #if H2_USE_WEBSOCKETS
> 
> line.

Oh, sorry guys. 

I was building against APR 1.6.x here which doesn't have apr_encode.h, I 
didn't see the apr_pencode use. So how about:

r1913019 + r1913023, +1 for 2.4.x for the pair



Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x: ./ modules/http2/h2.h

2023-10-16 Thread Stefan Eissing via dev
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 :
> 
> 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, ic...@apache.org wrote: 
>> 
>> Author: icing
>> Date: Mon Oct 16 11:11:45 2023
>> New Revision: 1913006
>> 
>> URL: http://svn.apache.org/viewvc?rev=1913006=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=1913005=1913006=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 
>> #include 
>> 
>> +#include 
>> +
>> 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
>> 
>> 
> 
> 



Re: svn commit: r1913019 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_ws.c

2023-10-16 Thread Stefan Eissing via dev



> Am 16.10.2023 um 14:54 schrieb Ruediger Pluem :
> 
> 
> 
> On 10/16/23 2:38 PM, Stefan Eissing via dev wrote:
>> 
>> 
>>> Am 16.10.2023 um 14:28 schrieb jor...@apache.org:
>>> 
>>> Author: jorton
>>> Date: Mon Oct 16 12:28:13 2023
>>> New Revision: 1913019
>>> 
>>> URL: http://svn.apache.org/viewvc?rev=1913019=rev
>>> Log:
>>> Further h2 compile fixes:
>>> 
>>> * modules/http2/h2_session.c (h2_session_start):
>>> Restrict WebSockets options handling to with-WS builds.
>>> 
>>> * modules/http2/h2_ws.c: Don't include apr_encode.h (not used).
>>> 
>>> Modified:
>>>   httpd/httpd/trunk/modules/http2/h2_session.c
>>>   httpd/httpd/trunk/modules/http2/h2_ws.c
>>> 
>>> Modified: httpd/httpd/trunk/modules/http2/h2_session.c
>>> URL: 
>>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1913019=1913018=1913019=diff
>>> ==
>>> --- httpd/httpd/trunk/modules/http2/h2_session.c (original)
>>> +++ httpd/httpd/trunk/modules/http2/h2_session.c Mon Oct 16 12:28:13 2023
>>> @@ -1085,11 +1085,13 @@ static apr_status_t h2_session_start(h2_
>>>settings[slen].value = win_size;
>>>++slen;
>>>}
>>> +#if H2_USE_WEBSOCKETS
>>>if (h2_config_sgeti(session->s, H2_CONF_WEBSOCKETS)) {
>>>  settings[slen].settings_id = NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL;
>>>  settings[slen].value = 1;
>>>  ++slen;
>>>}
>>> +#endif
>>> 
>>>ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c1,
>>>  H2_SSSN_LOG(APLOGNO(03201), session, 
>>> 
>> 
>> Fine.
>> 
>>> Modified: httpd/httpd/trunk/modules/http2/h2_ws.c
>>> URL: 
>>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_ws.c?rev=1913019=1913018=1913019=diff
>>> ==
>>> --- httpd/httpd/trunk/modules/http2/h2_ws.c (original)
>>> +++ httpd/httpd/trunk/modules/http2/h2_ws.c Mon Oct 16 12:28:13 2023
>>> @@ -19,7 +19,6 @@
>>> #include "apr.h"
>>> #include "apr_strings.h"
>>> #include "apr_lib.h"
>>> -#include "apr_encode.h"
>>> #include "apr_sha1.h"
>>> #include "apr_strmatch.h"
>> 
>> Not working here:
>> h2_ws.c:70:12: error: call to undeclared function 
>> 'apr_pencode_base64_binary'; ISO C99 and later do not support implicit 
>> function declarations [-Wimplicit-function-declaration]
>>return apr_pencode_base64_binary(c->pool, dgst, sizeof(dgst),
>>   ^
>> h2_ws.c:71:38: error: use of undeclared identifier 'APR_ENCODE_NONE'
>> APR_ENCODE_NONE, NULL);
>> ^
>> h2_ws.c:123:18: error: call to undeclared function 
>> 'apr_pencode_base64_binary'; ISO C99 and later do not support implicit 
>> function declarations [-Wimplicit-function-declaration]
>>key_base64 = apr_pencode_base64_binary(c2->pool, key_raw, sizeof(key_raw),
>> ^
>> h2_ws.c:124:44: error: use of undeclared identifier 'APR_ENCODE_NONE'
>>   APR_ENCODE_NONE, NULL);
> 
> Fails for me as well. Not sure what fails for Joe such that he removed the 
> include, but if it fails in case H2_USE_WEBSOCKETS is
> not 1 I guess we could move the include (or even all) below the
> 
> #if H2_USE_WEBSOCKETS

It may be unnecessary without websockets, but how could it hurt?

> 
> line.
> 
> Regards
> 
> Rüdiger



Re: svn commit: r1913019 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_ws.c

2023-10-16 Thread Ruediger Pluem



On 10/16/23 2:38 PM, Stefan Eissing via dev wrote:
> 
> 
>> Am 16.10.2023 um 14:28 schrieb jor...@apache.org:
>>
>> Author: jorton
>> Date: Mon Oct 16 12:28:13 2023
>> New Revision: 1913019
>>
>> URL: http://svn.apache.org/viewvc?rev=1913019=rev
>> Log:
>> Further h2 compile fixes:
>>
>> * modules/http2/h2_session.c (h2_session_start):
>>  Restrict WebSockets options handling to with-WS builds.
>>
>> * modules/http2/h2_ws.c: Don't include apr_encode.h (not used).
>>
>> Modified:
>>httpd/httpd/trunk/modules/http2/h2_session.c
>>httpd/httpd/trunk/modules/http2/h2_ws.c
>>
>> Modified: httpd/httpd/trunk/modules/http2/h2_session.c
>> URL: 
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1913019=1913018=1913019=diff
>> ==
>> --- httpd/httpd/trunk/modules/http2/h2_session.c (original)
>> +++ httpd/httpd/trunk/modules/http2/h2_session.c Mon Oct 16 12:28:13 2023
>> @@ -1085,11 +1085,13 @@ static apr_status_t h2_session_start(h2_
>> settings[slen].value = win_size;
>> ++slen;
>> }
>> +#if H2_USE_WEBSOCKETS
>> if (h2_config_sgeti(session->s, H2_CONF_WEBSOCKETS)) {
>>   settings[slen].settings_id = NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL;
>>   settings[slen].value = 1;
>>   ++slen;
>> }
>> +#endif
>>
>> ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c1,
>>   H2_SSSN_LOG(APLOGNO(03201), session, 
>>
> 
> Fine.
> 
>> Modified: httpd/httpd/trunk/modules/http2/h2_ws.c
>> URL: 
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_ws.c?rev=1913019=1913018=1913019=diff
>> ==
>> --- httpd/httpd/trunk/modules/http2/h2_ws.c (original)
>> +++ httpd/httpd/trunk/modules/http2/h2_ws.c Mon Oct 16 12:28:13 2023
>> @@ -19,7 +19,6 @@
>> #include "apr.h"
>> #include "apr_strings.h"
>> #include "apr_lib.h"
>> -#include "apr_encode.h"
>> #include "apr_sha1.h"
>> #include "apr_strmatch.h"
> 
> Not working here:
> h2_ws.c:70:12: error: call to undeclared function 
> 'apr_pencode_base64_binary'; ISO C99 and later do not support implicit 
> function declarations [-Wimplicit-function-declaration]
> return apr_pencode_base64_binary(c->pool, dgst, sizeof(dgst),
>^
> h2_ws.c:71:38: error: use of undeclared identifier 'APR_ENCODE_NONE'
>  APR_ENCODE_NONE, NULL);
>  ^
> h2_ws.c:123:18: error: call to undeclared function 
> 'apr_pencode_base64_binary'; ISO C99 and later do not support implicit 
> function declarations [-Wimplicit-function-declaration]
> key_base64 = apr_pencode_base64_binary(c2->pool, key_raw, sizeof(key_raw),
>  ^
> h2_ws.c:124:44: error: use of undeclared identifier 'APR_ENCODE_NONE'
>APR_ENCODE_NONE, NULL);

Fails for me as well. Not sure what fails for Joe such that he removed the 
include, but if it fails in case H2_USE_WEBSOCKETS is
not 1 I guess we could move the include (or even all) below the

#if H2_USE_WEBSOCKETS

line.

Regards

Rüdiger


Re: [VOTE] Release httpd-2.4.58-rc1 as httpd-2.4.58

2023-10-16 Thread Stefan Eissing via dev
rc1 vote is cancelled. There will be a rc2 soon. Thanks for testing.

> Am 16.10.2023 um 12:07 schrieb Stefan Eissing via dev :
> 
> Hi all,
> 
> Please find below the proposed release tarball and signatures:
> 
> https://dist.apache.org/repos/dist/dev/httpd/
> 
> I would like to call a VOTE over the next few days to release
> this candidate tarball httpd-2.4.58-rc1 as 2.4.58:
> [ ] +1: It's not just good, it's good enough!
> [ ] +0: Let's have a talk.
> [ ] -1: There's trouble in paradise. Here's what's wrong.
> 
> The computed digests of the tarball up for vote are:
> sha256: 1e381c8aa2d02d323837db042109b2286370fbf20e75d3b292e31f2519599e5b 
> *httpd-2.4.58-rc1.tar.gz
> sha512: 
> dd867519c9c9317365f823c4b532fc5491536df5b4ea1ec5870571106efea89a3b81d385578c7d007f935f91b52c55c0830e2d49edcaa32478601b1c2ae6c557
>  *httpd-2.4.58-rc1.tar.gz
> 
> The SVN candidate source is found at tags/2.4.58-rc1-candidate.
> 
> Cheers,
> Stefan
> 
> *) the -deps.* archives are added only for convenience and not part of the 
> release




Re: [PATCH] fix mod_h2 with older nghttp2

2023-10-16 Thread Ruediger Pluem



On 10/16/23 2:38 PM, Joe Orton wrote:
> BTW is modules/http2 really CTR for 2.4.x? STATUS says only 
> mod_proxy_http2 is.
> 
> Anyway: I am +1 for r1913005 and r1913019 for 2.4.x, latter was 
> sufficient to get 2.4 building on RHEL8 again (if only we had a CI to do 
> this, oh...).

I am also +1 on 1913020.

Regards

Rüdiger


Re: [PATCH] fix mod_h2 with older nghttp2

2023-10-16 Thread Stefan Eissing via dev



> Am 16.10.2023 um 14:38 schrieb Joe Orton :
> 
> BTW is modules/http2 really CTR for 2.4.x? STATUS says only 
> mod_proxy_http2 is.


I have made peace with myself to spend afterlife in hell.

> Anyway: I am +1 for r1913005 and r1913019 for 2.4.x, latter was 
> sufficient to get 2.4 building on RHEL8 again (if only we had a CI to do 
> this, oh...).
> 

The apr_encode.h is needed on my machine. Leaving it in.

> Regards, Joe
> 



Re: [PATCH] fix mod_h2 with older nghttp2

2023-10-16 Thread Joe Orton
BTW is modules/http2 really CTR for 2.4.x? STATUS says only 
mod_proxy_http2 is.

Anyway: I am +1 for r1913005 and r1913019 for 2.4.x, latter was 
sufficient to get 2.4 building on RHEL8 again (if only we had a CI to do 
this, oh...).

Regards, Joe



Re: svn commit: r1913019 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_ws.c

2023-10-16 Thread Stefan Eissing via dev



> Am 16.10.2023 um 14:28 schrieb jor...@apache.org:
> 
> Author: jorton
> Date: Mon Oct 16 12:28:13 2023
> New Revision: 1913019
> 
> URL: http://svn.apache.org/viewvc?rev=1913019=rev
> Log:
> Further h2 compile fixes:
> 
> * modules/http2/h2_session.c (h2_session_start):
>  Restrict WebSockets options handling to with-WS builds.
> 
> * modules/http2/h2_ws.c: Don't include apr_encode.h (not used).
> 
> Modified:
>httpd/httpd/trunk/modules/http2/h2_session.c
>httpd/httpd/trunk/modules/http2/h2_ws.c
> 
> Modified: httpd/httpd/trunk/modules/http2/h2_session.c
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1913019=1913018=1913019=diff
> ==
> --- httpd/httpd/trunk/modules/http2/h2_session.c (original)
> +++ httpd/httpd/trunk/modules/http2/h2_session.c Mon Oct 16 12:28:13 2023
> @@ -1085,11 +1085,13 @@ static apr_status_t h2_session_start(h2_
> settings[slen].value = win_size;
> ++slen;
> }
> +#if H2_USE_WEBSOCKETS
> if (h2_config_sgeti(session->s, H2_CONF_WEBSOCKETS)) {
>   settings[slen].settings_id = NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL;
>   settings[slen].value = 1;
>   ++slen;
> }
> +#endif
> 
> ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c1,
>   H2_SSSN_LOG(APLOGNO(03201), session, 
> 

Fine.

> Modified: httpd/httpd/trunk/modules/http2/h2_ws.c
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_ws.c?rev=1913019=1913018=1913019=diff
> ==
> --- httpd/httpd/trunk/modules/http2/h2_ws.c (original)
> +++ httpd/httpd/trunk/modules/http2/h2_ws.c Mon Oct 16 12:28:13 2023
> @@ -19,7 +19,6 @@
> #include "apr.h"
> #include "apr_strings.h"
> #include "apr_lib.h"
> -#include "apr_encode.h"
> #include "apr_sha1.h"
> #include "apr_strmatch.h"

Not working here:
h2_ws.c:70:12: error: call to undeclared function 'apr_pencode_base64_binary'; 
ISO C99 and later do not support implicit function declarations 
[-Wimplicit-function-declaration]
return apr_pencode_base64_binary(c->pool, dgst, sizeof(dgst),
   ^
h2_ws.c:71:38: error: use of undeclared identifier 'APR_ENCODE_NONE'
 APR_ENCODE_NONE, NULL);
 ^
h2_ws.c:123:18: error: call to undeclared function 'apr_pencode_base64_binary'; 
ISO C99 and later do not support implicit function declarations 
[-Wimplicit-function-declaration]
key_base64 = apr_pencode_base64_binary(c2->pool, key_raw, sizeof(key_raw),
 ^
h2_ws.c:124:44: error: use of undeclared identifier 'APR_ENCODE_NONE'
   APR_ENCODE_NONE, NULL);



Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x: ./ modules/http2/h2.h

2023-10-16 Thread Stefan Eissing via dev
Hi Steffen,

> Am 16.10.2023 um 14:06 schrieb SteffenAL :
> 
> 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, ic...@apache.org wrote: 
>> 
>> Author: icing
>> Date: Mon Oct 16 11:11:45 2023
>> New Revision: 1913006
>> 
>> URL: http://svn.apache.org/viewvc?rev=1913006=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=1913005=1913006=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 
>> #include 
>> 
>> +#include 
>> +
>> 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
>> 
>> 
> 
> 



Re: svn commit: r1913006 - in /httpd/httpd/branches/2.4.x: ./ modules/http2/h2.h

2023-10-16 Thread SteffenAL


Re: svn commit: r1913010 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS

2023-10-16 Thread Rainer Jung
Thanks for merging. I am fine with this one not making in into the final 
2.4.58 release (but of course also if it goes in in case we need a 
seconds rc).


Am 16.10.23 um 13:45 schrieb rpl...@apache.org:

Author: rpluem
Date: Mon Oct 16 11:45:19 2023
New Revision: 1913010

URL: http://svn.apache.org/viewvc?rev=1913010=rev
Log:
Merge r1912015 from trunk:

mod_ssl: Silence info log message "SSL Library Error: error:0A000126:
  SSL routines::unexpected eof while reading" when using
  OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
  available. [Rainer Jung]

Reviewed by: rjung, gbechis, rpluem

Modified:
 httpd/httpd/branches/2.4.x/   (props changed)
 httpd/httpd/branches/2.4.x/CHANGES
 httpd/httpd/branches/2.4.x/STATUS

Propchange: httpd/httpd/branches/2.4.x/
--
   Merged /httpd/httpd/trunk:r1912015

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1913010=1913009=1913010=diff
==
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Oct 16 11:45:19 2023
@@ -1,6 +1,11 @@
   -*- coding: utf-8 -*-
  Changes with Apache 2.4.58
  
+  *) mod_ssl: Silence info log message "SSL Library Error: error:0A000126:

+ SSL routines::unexpected eof while reading" when using
+ OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
+ available. [Rainer Jung]
+
*) mod_http2: improved early cleanup of streams.
   [Stefan Eissing]
  


Modified: httpd/httpd/branches/2.4.x/STATUS
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1913010=1913009=1913010=diff
==
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 16 11:45:19 2023
@@ -152,15 +152,6 @@ RELEASE SHOWSTOPPERS:
  PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
  
-  *) mod_ssl: Silence info log message "SSL Library Error: error:0A000126:

- SSL routines::unexpected eof while reading" when using
- OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
- available. [Rainer Jung]
- Trunk version of patch:
-https://svn.apache.org/r1912015
- Backport version for 2.4.x of patch:
-svn merge -c 1912015 ^/httpd/httpd/trunk .
- +1: rjung, gbechis, rpluem
  
  PATCHES PROPOSED TO BACKPORT FROM TRUNK:

[ New proposals should be added at the end of the list ]





Re: [PATCH] fix mod_h2 with older nghttp2

2023-10-16 Thread Ruediger Pluem
I will do.

Regards

Rüdiger

On 10/16/23 1:13 PM, Stefan Eissing via dev wrote:
> I added that patch to trunk and merged it into 2.4.x.
> 
> I'll make another release candidate soonish. Someone wants to merge the back 
> ports idling in STATUS?
> 
> Cheers,
> Stefan
> 
>> Am 16.10.2023 um 12:55 schrieb Joe Orton :
>>
>> Looks like this broke with the websockets backport. mod_h2 is failing to 
>> compile on versions of nghttp2 without 
>> NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL - looks like this was added in 
>> nghttp2 v1.34.0 [1] so how about something like this, or is there a 
>> better way?
>>
>> (configure check for a declaration is messier)
>>
>> diff --git a/modules/http2/h2.h b/modules/http2/h2.h
>> index cfecb3d9a3..06e7087c04 100644
>> --- a/modules/http2/h2.h
>> +++ b/modules/http2/h2.h
>> @@ -20,6 +20,8 @@
>> #include 
>> #include 
>>
>> +#include 
>> +
>> 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
>>
>>
>>
>> [1] https://github.com/nghttp2/nghttp2/milestone/30?closed=1 
>>
> 
> 


Re: [PATCH] fix mod_h2 with older nghttp2

2023-10-16 Thread Stefan Eissing via dev
I added that patch to trunk and merged it into 2.4.x.

I'll make another release candidate soonish. Someone wants to merge the back 
ports idling in STATUS?

Cheers,
Stefan

> Am 16.10.2023 um 12:55 schrieb Joe Orton :
> 
> Looks like this broke with the websockets backport. mod_h2 is failing to 
> compile on versions of nghttp2 without 
> NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL - looks like this was added in 
> nghttp2 v1.34.0 [1] so how about something like this, or is there a 
> better way?
> 
> (configure check for a declaration is messier)
> 
> diff --git a/modules/http2/h2.h b/modules/http2/h2.h
> index cfecb3d9a3..06e7087c04 100644
> --- a/modules/http2/h2.h
> +++ b/modules/http2/h2.h
> @@ -20,6 +20,8 @@
> #include 
> #include 
> 
> +#include 
> +
> 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
> 
> 
> 
> [1] https://github.com/nghttp2/nghttp2/milestone/30?closed=1 
> 



Re: [VOTE] Release httpd-2.4.58-rc1 as httpd-2.4.58

2023-10-16 Thread Stefan Eissing via dev



> Am 16.10.2023 um 12:28 schrieb Ruediger Pluem :
> 
> First of all thanks for RM.
> It looks to me that we have 2 accepted backports in the STATUS that have not 
> been merged.
> This seems unfortunate.

Well, I asked people to bring in the changes they want. I am not a merge 
machine for everyone. ^^

If someone wants to add them, I'll make an rc2 with it.

Cheers,
Stefan


> 
> Regards
> 
> Rüdiger
> 
> On 10/16/23 12:07 PM, Stefan Eissing via dev wrote:
>> Hi all,
>> 
>> Please find below the proposed release tarball and signatures:
>> 
>> https://dist.apache.org/repos/dist/dev/httpd/
>> 
>> I would like to call a VOTE over the next few days to release
>> this candidate tarball httpd-2.4.58-rc1 as 2.4.58:
>> [ ] +1: It's not just good, it's good enough!
>> [ ] +0: Let's have a talk.
>> [ ] -1: There's trouble in paradise. Here's what's wrong.
>> 
>> The computed digests of the tarball up for vote are:
>> sha256: 1e381c8aa2d02d323837db042109b2286370fbf20e75d3b292e31f2519599e5b 
>> *httpd-2.4.58-rc1.tar.gz
>> sha512: 
>> dd867519c9c9317365f823c4b532fc5491536df5b4ea1ec5870571106efea89a3b81d385578c7d007f935f91b52c55c0830e2d49edcaa32478601b1c2ae6c557
>>  *httpd-2.4.58-rc1.tar.gz
>> 
>> The SVN candidate source is found at tags/2.4.58-rc1-candidate.
>> 
>> Cheers,
>> Stefan
>> 
>> *) the -deps.* archives are added only for convenience and not part of the 
>> release
>> 



[PATCH] fix mod_h2 with older nghttp2

2023-10-16 Thread Joe Orton
Looks like this broke with the websockets backport. mod_h2 is failing to 
compile on versions of nghttp2 without 
NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL - looks like this was added in 
nghttp2 v1.34.0 [1] so how about something like this, or is there a 
better way?

(configure check for a declaration is messier)

diff --git a/modules/http2/h2.h b/modules/http2/h2.h
index cfecb3d9a3..06e7087c04 100644
--- a/modules/http2/h2.h
+++ b/modules/http2/h2.h
@@ -20,6 +20,8 @@
 #include 
 #include 
 
+#include 
+
 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



[1] https://github.com/nghttp2/nghttp2/milestone/30?closed=1 



Re: [VOTE] Release httpd-2.4.58-rc1 as httpd-2.4.58

2023-10-16 Thread Ruediger Pluem
First of all thanks for RM.
It looks to me that we have 2 accepted backports in the STATUS that have not 
been merged.
This seems unfortunate.

Regards

Rüdiger

On 10/16/23 12:07 PM, Stefan Eissing via dev wrote:
> Hi all,
> 
> Please find below the proposed release tarball and signatures:
> 
> https://dist.apache.org/repos/dist/dev/httpd/
> 
> I would like to call a VOTE over the next few days to release
> this candidate tarball httpd-2.4.58-rc1 as 2.4.58:
> [ ] +1: It's not just good, it's good enough!
> [ ] +0: Let's have a talk.
> [ ] -1: There's trouble in paradise. Here's what's wrong.
> 
> The computed digests of the tarball up for vote are:
> sha256: 1e381c8aa2d02d323837db042109b2286370fbf20e75d3b292e31f2519599e5b 
> *httpd-2.4.58-rc1.tar.gz
> sha512: 
> dd867519c9c9317365f823c4b532fc5491536df5b4ea1ec5870571106efea89a3b81d385578c7d007f935f91b52c55c0830e2d49edcaa32478601b1c2ae6c557
>  *httpd-2.4.58-rc1.tar.gz
> 
> The SVN candidate source is found at tags/2.4.58-rc1-candidate.
> 
> Cheers,
> Stefan
> 
> *) the -deps.* archives are added only for convenience and not part of the 
> release
> 


Httpd PR to edit balancer member HC timeout

2023-10-16 Thread محمد رضا
Hello all, I hope this email finds you well.

I have recently opened a PR on apache httpd project (
https://github.com/apache/httpd/pull/385) . After upgrading to httpd
version 55, we have lost the capability to define a timeout for the health
check that is different from that of the request.

As this PR will be closed soon, I really appreciate any insights or
feedback you might have about it.

Regards,
Mohamad


[VOTE] Release httpd-2.4.58-rc1 as httpd-2.4.58

2023-10-16 Thread Stefan Eissing via dev
Hi all,

Please find below the proposed release tarball and signatures:

https://dist.apache.org/repos/dist/dev/httpd/

I would like to call a VOTE over the next few days to release
this candidate tarball httpd-2.4.58-rc1 as 2.4.58:
[ ] +1: It's not just good, it's good enough!
[ ] +0: Let's have a talk.
[ ] -1: There's trouble in paradise. Here's what's wrong.

The computed digests of the tarball up for vote are:
sha256: 1e381c8aa2d02d323837db042109b2286370fbf20e75d3b292e31f2519599e5b 
*httpd-2.4.58-rc1.tar.gz
sha512: 
dd867519c9c9317365f823c4b532fc5491536df5b4ea1ec5870571106efea89a3b81d385578c7d007f935f91b52c55c0830e2d49edcaa32478601b1c2ae6c557
 *httpd-2.4.58-rc1.tar.gz

The SVN candidate source is found at tags/2.4.58-rc1-candidate.

Cheers,
Stefan

*) the -deps.* archives are added only for convenience and not part of the 
release