Re: svn commit: r1870454 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_config.c modules/http2/h2_h2.c modules/http2/h2_stream.c modules/slotmem/mod_slotmem_shm.c

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1870454 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_config.c modules/http2/h2_h2.c modules/http2/h2_stream.c modules/slotmem/mod_slotmem_shm.c

Ruediger Pluem


On 11/26/2019 10:36 AM, [hidden email] wrote:

> Author: icing
> Date: Tue Nov 26 09:36:28 2019
> New Revision: 1870454
>
> URL: http://svn.apache.org/viewvc?rev=1870454&view=rev
> Log:
>   *) 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. Found and reported by
>      <[hidden email]> and
>      <[hidden email]>. [Stefan Eissing]
>
>   *) mod_http2: Multiple field length violations in the same request no longer cause
>      several log entries to be written. [@mkauf]
>
>
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/modules/http2/h2_config.c
>     httpd/httpd/trunk/modules/http2/h2_h2.c
>     httpd/httpd/trunk/modules/http2/h2_stream.c
>     httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
>

> Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1870454&r1=1870453&r2=1870454&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
> +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Tue Nov 26 09:36:28 2019
> @@ -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 {
>

How is the above related to the change? Or was this an accidental commit?

Regards

Rüdiger
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1870454 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_config.c modules/http2/h2_h2.c modules/http2/h2_stream.c modules/slotmem/mod_slotmem_shm.c

Stefan Eissing
> Am 27.11.2019 um 08:16 schrieb Ruediger Pluem <[hidden email]>:
>
>
>
> On 11/26/2019 10:36 AM, [hidden email] wrote:
>> Author: icing
>> Date: Tue Nov 26 09:36:28 2019
>> New Revision: 1870454
>>
>> URL: http://svn.apache.org/viewvc?rev=1870454&view=rev
>> Log:
>>  *) 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. Found and reported by
>>     <[hidden email]> and
>>     <[hidden email]>. [Stefan Eissing]
>>
>>  *) mod_http2: Multiple field length violations in the same request no longer cause
>>     several log entries to be written. [@mkauf]
>>
>>
>> Modified:
>>    httpd/httpd/trunk/CHANGES
>>    httpd/httpd/trunk/modules/http2/h2_config.c
>>    httpd/httpd/trunk/modules/http2/h2_h2.c
>>    httpd/httpd/trunk/modules/http2/h2_stream.c
>>    httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
>>
>
>> Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1870454&r1=1870453&r2=1870454&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
>> +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Tue Nov 26 09:36:28 2019
>> @@ -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 {
>>
>
> How is the above related to the change? Or was this an accidental commit?

Oops. Was debugging MacOS Catalina's default 8 shared segmemts limit...


Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1870454 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_config.c modules/http2/h2_h2.c modules/http2/h2_stream.c modules/slotmem/mod_slotmem_shm.c

Stefan Eissing
Hope it is reverted properly with r1870499 - in meetings today, ;-(

Stefan Eissing

<green/>bytes GmbH
Hafenweg 16
48155 Münster
www.greenbytes.de

> Am 27.11.2019 um 09:24 schrieb Stefan Eissing <[hidden email]>:
>
>> Am 27.11.2019 um 08:16 schrieb Ruediger Pluem <[hidden email]>:
>>
>>
>>
>> On 11/26/2019 10:36 AM, [hidden email] wrote:
>>> Author: icing
>>> Date: Tue Nov 26 09:36:28 2019
>>> New Revision: 1870454
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1870454&view=rev
>>> Log:
>>> *) 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. Found and reported by
>>>    <[hidden email]> and
>>>    <[hidden email]>. [Stefan Eissing]
>>>
>>> *) mod_http2: Multiple field length violations in the same request no longer cause
>>>    several log entries to be written. [@mkauf]
>>>
>>>
>>> Modified:
>>>   httpd/httpd/trunk/CHANGES
>>>   httpd/httpd/trunk/modules/http2/h2_config.c
>>>   httpd/httpd/trunk/modules/http2/h2_h2.c
>>>   httpd/httpd/trunk/modules/http2/h2_stream.c
>>>   httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
>>>
>>
>>> Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1870454&r1=1870453&r2=1870454&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
>>> +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Tue Nov 26 09:36:28 2019
>>> @@ -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 {
>>>
>>
>> How is the above related to the change? Or was this an accidental commit?
>
> Oops. Was debugging MacOS Catalina's default 8 shared segmemts limit...
>
>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1870454 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_config.c modules/http2/h2_h2.c modules/http2/h2_stream.c modules/slotmem/mod_slotmem_shm.c

Ruediger Pluem
Looks good.

Regards

Rüdiger

On 11/27/2019 12:23 PM, Stefan Eissing wrote:

> Hope it is reverted properly with r1870499 - in meetings today, ;-(
>
> Stefan Eissing
>
> <green/>bytes GmbH
> Hafenweg 16
> 48155 Münster
> www.greenbytes.de
>
>> Am 27.11.2019 um 09:24 schrieb Stefan Eissing <[hidden email]>:
>>
>>> Am 27.11.2019 um 08:16 schrieb Ruediger Pluem <[hidden email]>:
>>>
>>>
>>>
>>> On 11/26/2019 10:36 AM, [hidden email] wrote:
>>>> Author: icing
>>>> Date: Tue Nov 26 09:36:28 2019
>>>> New Revision: 1870454
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1870454&view=rev
>>>> Log:
>>>> *) 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. Found and reported by
>>>>    <[hidden email]> and
>>>>    <[hidden email]>. [Stefan Eissing]
>>>>
>>>> *) mod_http2: Multiple field length violations in the same request no longer cause
>>>>    several log entries to be written. [@mkauf]
>>>>
>>>>
>>>> Modified:
>>>>   httpd/httpd/trunk/CHANGES
>>>>   httpd/httpd/trunk/modules/http2/h2_config.c
>>>>   httpd/httpd/trunk/modules/http2/h2_h2.c
>>>>   httpd/httpd/trunk/modules/http2/h2_stream.c
>>>>   httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
>>>>
>>>
>>>> Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
>>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1870454&r1=1870453&r2=1870454&view=diff
>>>> ==============================================================================
>>>> --- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
>>>> +++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Tue Nov 26 09:36:28 2019
>>>> @@ -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 {
>>>>
>>>
>>> How is the above related to the change? Or was this an accidental commit?
>>
>> Oops. Was debugging MacOS Catalina's default 8 shared segmemts limit...
>>
>>
>
>