mod_http2: give timeout goaway reason when applicable

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757540 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e3d29430e1453c8afad943d5f9a818fe5171a6c0..3dd202d463a1f28a4f4097e30dcd51344e13b3ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 7874bfe2503aa1ce325c24986d2818b102f4b294..e6214088aa73a197af035f76ae2c6bc59b37efef 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -2291,6 +2291,7 @@ apr_status_t h2_session_pre_close(h2_session *session, int async)
 {
     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;
 }