From: Stefan Eissing <icing@apache.org>
Date: Fri, 4 Sep 2015 10:25:31 +0000 (+0000)
Subject: mod_h2 version bump, more c89 goodiness
X-Git-Tag: 2.5.0-alpha~2869
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a8a05e32ae1a05291be7317c7ffa9c947e2ef76;p=thirdparty%2Fapache%2Fhttpd.git

mod_h2 version bump, more c89 goodiness

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

diff --git a/modules/http2/h2_h2.c b/modules/http2/h2_h2.c
index a253c01abb6..221f5118df9 100644
--- a/modules/http2/h2_h2.c
+++ b/modules/http2/h2_h2.c
@@ -123,19 +123,7 @@ int h2_h2_remove_timeout(conn_rec* c)
 {
     h2_ctx *ctx = h2_ctx_get(c);
     
-    if (h2_ctx_is_task(ctx)) {
-        /* cleanup on task connections */
-        /* we once removed the reqtimeout filter on task connections,
-         * but timeouts here might have been a side effect of other things.
-         * Ideally mod_reqtimeout would do its work on task connections
-         * as it basically is a HTTP/1.1 request/response and it's made
-         * for that.
-         * So, let the filter stay for now and see if we ever encounter
-         * unexpected timeouts on tasks again.
-         */
-        //ap_remove_input_filter_byhandle(c->input_filters, "reqtimeout");
-    }
-    else if (h2_ctx_is_active(ctx)) {
+    if (h2_ctx_is_active(ctx) && !h2_ctx_is_task(ctx)) {
         /* cleanup on master h2 connections */
         ap_remove_input_filter_byhandle(c->input_filters, "reqtimeout");
     }
diff --git a/modules/http2/h2_to_h1.c b/modules/http2/h2_to_h1.c
index 1e39aa6d80a..8dacfe801fc 100644
--- a/modules/http2/h2_to_h1.c
+++ b/modules/http2/h2_to_h1.c
@@ -114,7 +114,7 @@ apr_status_t h2_to_h1_add_header(h2_to_h1 *to_h1,
              || H2_HD_MATCH_LIT("proxy-connection", name, nlen)
              || H2_HD_MATCH_LIT("keep-alive", name, nlen)
              || H2_HD_MATCH_LIT("http2-settings", name, nlen)) {
-        // ignore these.
+        /* ignore these. */
         return APR_SUCCESS;
     }
     else if (H2_HD_MATCH_LIT("cookie", name, nlen)) {
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index abd90d80923..df4da02e744 100644
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -20,7 +20,7 @@
  * @macro
  * Version number of the h2 module as c string
  */
-#define MOD_H2_VERSION "0.9.6"
+#define MOD_H2_VERSION "0.9.7"
 
 /**
  * @macro
@@ -28,7 +28,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_H2_VERSION_NUM 0x000906
+#define MOD_H2_VERSION_NUM 0x000907
 
 
 #endif /* mod_h2_h2_version_h */