You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Ruediger Pluem <rp...@apache.org> on 2020/05/15 13:16:22 UTC

Re: svn commit: r1877783 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_conn.c modules/http2/h2_session.c modules/http2/h2_switch.c


On 5/15/20 1:59 PM, icing@apache.org wrote:
> Author: icing
> Date: Fri May 15 11:59:32 2020
> New Revision: 1877783
> 
> URL: http://svn.apache.org/viewvc?rev=1877783&view=rev
> Log:
>   *) mod_http2: Fixed regression that caused connections to close when mod_reqtimeout
>      was configured with a handshake timeout. Fixes gitub issue #196.
> 
> 
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/modules/http2/h2_conn.c
>     httpd/httpd/trunk/modules/http2/h2_session.c
>     httpd/httpd/trunk/modules/http2/h2_switch.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=1877783&r1=1877782&r2=1877783&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/http2/h2_session.c (original)
> +++ httpd/httpd/trunk/modules/http2/h2_session.c Fri May 15 11:59:32 2020
> @@ -1179,7 +1179,7 @@ struct h2_stream *h2_session_push(h2_ses
>      stream = h2_session_open_stream(session, nid, is->id);
>      if (!stream) {
>          ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, 
> -                      H2_STRM_LOG(APLOGNO(03077), stream, 
> +                      H2_STRM_LOG(APLOGNO(03077), is,

How does this relate to the change?

>                        "failed to create stream obj %d"), nid);
>          /* kill the push_promise */
>          nghttp2_submit_rst_stream(session->ngh2, NGHTTP2_FLAG_NONE, nid,
> 

Regards

RĂ¼diger


Re: svn commit: r1877783 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_conn.c modules/http2/h2_session.c modules/http2/h2_switch.c

Posted by Stefan Eissing <st...@greenbytes.de>.
> Am 15.05.2020 um 15:16 schrieb Ruediger Pluem <rp...@apache.org>:
> 
> 
> 
> On 5/15/20 1:59 PM, icing@apache.org wrote:
>> Author: icing
>> Date: Fri May 15 11:59:32 2020
>> New Revision: 1877783
>> 
>> URL: http://svn.apache.org/viewvc?rev=1877783&view=rev
>> Log:
>>  *) mod_http2: Fixed regression that caused connections to close when mod_reqtimeout
>>     was configured with a handshake timeout. Fixes gitub issue #196.
>> 
>> 
>> Modified:
>>    httpd/httpd/trunk/CHANGES
>>    httpd/httpd/trunk/modules/http2/h2_conn.c
>>    httpd/httpd/trunk/modules/http2/h2_session.c
>>    httpd/httpd/trunk/modules/http2/h2_switch.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=1877783&r1=1877782&r2=1877783&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/http2/h2_session.c (original)
>> +++ httpd/httpd/trunk/modules/http2/h2_session.c Fri May 15 11:59:32 2020
>> @@ -1179,7 +1179,7 @@ struct h2_stream *h2_session_push(h2_ses
>>     stream = h2_session_open_stream(session, nid, is->id);
>>     if (!stream) {
>>         ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, 
>> -                      H2_STRM_LOG(APLOGNO(03077), stream, 
>> +                      H2_STRM_LOG(APLOGNO(03077), is,
> 
> How does this relate to the change?

Sorry, was "offline" for a week. 

This change slipped in because of the synchronization between my github and apache subversion. I should have listed it in the description separately.


> 
>>                       "failed to create stream obj %d"), nid);
>>         /* kill the push_promise */
>>         nghttp2_submit_rst_stream(session->ngh2, NGHTTP2_FLAG_NONE, nid,
>> 
> 
> Regards
> 
> RĂ¼diger
>