httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1757540 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_session.c
Date Wed, 24 Aug 2016 15:13:12 GMT
Author: icing
Date: Wed Aug 24 15:13:12 2016
New Revision: 1757540

URL: http://svn.apache.org/viewvc?rev=1757540&view=rev
Log:
mod_http2: give timeout goaway reason when applicable

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/http2/h2_session.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1757540&r1=1757539&r2=1757540&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Aug 24 15:13:12 2016
@@ -1,13 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: h2 status resource follows latest draft, see
-     http://www.ietf.org/id/draft-benfield-http2-debug-state-01.txt
-     [Stefan Eissing]
-     
-  *) mod_http2: handling graceful shutdown gracefully, e.g. handling existing
-     streams to the end. [Stefan Eissing]
-  
   *) mod_cache: Use the actual URI path and query-string for identifying the
      cached entity (key), such that rewrites are taken into account when
      running afterwards (CacheQuickHandler off).  PR 21935.  [Yann Ylavic]
@@ -15,9 +8,6 @@ Changes with Apache 2.5.0
   *) mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
      in the client certificate chain.  PR 55786.  [Yann Ylavic]
 
-  *) mod_http2: adding support for intermediate responses.
-     [Stefan Eissing]
-
   *) mod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
      triggering mod_proxy_connect's AH01018 once the tunnel is established.
      [Yann Ylavic]

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1757540&r1=1757539&r2=1757540&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Wed Aug 24 15:13:12 2016
@@ -2291,6 +2291,7 @@ apr_status_t h2_session_pre_close(h2_ses
 {
     ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, session->c, 
                   "h2_session(%ld): pre_close", session->id);
-    dispatch_event(session, H2_SESSION_EV_PRE_CLOSE, 0, NULL);
+    dispatch_event(session, H2_SESSION_EV_PRE_CLOSE, 0, 
+        (session->state == H2_SESSION_ST_IDLE)? "timeout" : NULL);
     return APR_SUCCESS;
 }



Mime
View raw message