Mailing List Archive

Re: svn commit: r1872230 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/http2/h2_config.c modules/http2/h2_h2.c modules/http2/h2_stream.c modules/slotmem/mod_slotmem_shm.c
On 01/02/2020 12:26 AM, minfrin@apache.org wrote:
> Author: minfrin
> Date: Wed Jan 1 23:26:43 2020
> New Revision: 1872230
>
> URL: http://svn.apache.org/viewvc?rev=1872230&view=rev
> Log:
> Backport:
>
> mod_http2: Fixed interaction with mod_reqtimeout. A loaded mod_http2 was disabling the
> ssl handshake timeouts. Also, fixed a mistake of the last version that made `H2Direct`
> always `on`, irregardless of configuration.
>
> mod_http2: Multiple field length violations in the same request no longer cause
> several log entries to be written.
>
> Modified:
> httpd/httpd/branches/2.4.x/ (props changed)
> httpd/httpd/branches/2.4.x/CHANGES
> httpd/httpd/branches/2.4.x/STATUS
> httpd/httpd/branches/2.4.x/modules/http2/h2_config.c
> httpd/httpd/branches/2.4.x/modules/http2/h2_h2.c
> httpd/httpd/branches/2.4.x/modules/http2/h2_stream.c
> httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
>

> Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c?rev=1872230&r1=1872229&r2=1872230&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c (original)
> +++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c Wed Jan 1 23:26:43 2020
> @@ -21,6 +21,7 @@
> * otherwise.
> */
>
> +#include <assert.h>
> #include "ap_slotmem.h"
>
> #include "httpd.h"
> @@ -400,6 +401,7 @@ static apr_status_t slotmem_create(ap_sl
> else {
> apr_shm_remove(fname, pool);
> rv = apr_shm_create(&shm, size, fname, gpool);
> + assert(rv == APR_SUCCESS);
> }
> }
> else {
>
>
>

This backports unrelated stuff that was included by error in r1870454.
You only backported r1870454 and not r1870499 which fixed this issue on trunk and which was part of this backport proposal.

Regards

RĂ¼diger
Re: svn commit: r1872230 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/http2/h2_config.c modules/http2/h2_h2.c modules/http2/h2_stream.c modules/slotmem/mod_slotmem_shm.c [ In reply to ]
Merged the fix from trunk that reverted this. Thanks for catching (again!).

- Stefan

> Am 03.01.2020 um 11:38 schrieb Ruediger Pluem <rpluem@apache.org>:
>
>
>
> On 01/02/2020 12:26 AM, minfrin@apache.org wrote:
>> Author: minfrin
>> Date: Wed Jan 1 23:26:43 2020
>> New Revision: 1872230
>>
>> URL: http://svn.apache.org/viewvc?rev=1872230&view=rev
>> Log:
>> Backport:
>>
>> mod_http2: Fixed interaction with mod_reqtimeout. A loaded mod_http2 was disabling the
>> ssl handshake timeouts. Also, fixed a mistake of the last version that made `H2Direct`
>> always `on`, irregardless of configuration.
>>
>> mod_http2: Multiple field length violations in the same request no longer cause
>> several log entries to be written.
>>
>> Modified:
>> httpd/httpd/branches/2.4.x/ (props changed)
>> httpd/httpd/branches/2.4.x/CHANGES
>> httpd/httpd/branches/2.4.x/STATUS
>> httpd/httpd/branches/2.4.x/modules/http2/h2_config.c
>> httpd/httpd/branches/2.4.x/modules/http2/h2_h2.c
>> httpd/httpd/branches/2.4.x/modules/http2/h2_stream.c
>> httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
>>
>
>> Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c?rev=1872230&r1=1872229&r2=1872230&view=diff
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c (original)
>> +++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c Wed Jan 1 23:26:43 2020
>> @@ -21,6 +21,7 @@
>> * otherwise.
>> */
>>
>> +#include <assert.h>
>> #include "ap_slotmem.h"
>>
>> #include "httpd.h"
>> @@ -400,6 +401,7 @@ static apr_status_t slotmem_create(ap_sl
>> else {
>> apr_shm_remove(fname, pool);
>> rv = apr_shm_create(&shm, size, fname, gpool);
>> + assert(rv == APR_SUCCESS);
>> }
>> }
>> else {
>>
>>
>>
>
> This backports unrelated stuff that was included by error in r1870454.
> You only backported r1870454 and not r1870499 which fixed this issue on trunk and which was part of this backport proposal.
>
> Regards
>
> RĂ¼diger