fixed bug in error handling when passing DATA frames

icing · Jun 15, 2016 · 72a79a9 · 72a79a9
1 parent a049609
commit 72a79a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+v1.5.10
+--------------------------------------------------------------------------------
+ * fixed bug in error handling when passing DATA frames.
+
 v1.5.9
 --------------------------------------------------------------------------------
  * more strict error handling and logging in DATA frame assembly.

diff --git a/configure.ac b/configure.ac
@@ -14,7 +14,7 @@
 #
 
 AC_PREREQ([2.69])
-AC_INIT([mod_http2], [1.5.9], [[email protected]])
+AC_INIT([mod_http2], [1.5.10], [[email protected]])
 
 LT_PREREQ([2.2.6])
 LT_INIT()

diff --git a/mod_http2/h2_conn_io.c b/mod_http2/h2_conn_io.c
@@ -394,7 +394,7 @@ apr_status_t h2_conn_io_pass(h2_conn_io *io, apr_bucket_brigade *bb)
             }
             else {
                 /* bucket fits in remain, copy to scratch */
-                read_to_scratch(io, b);
+                status = read_to_scratch(io, b);
                 apr_bucket_delete(b);
                 continue;
             }

diff --git a/mod_http2/h2_version.h b/mod_http2/h2_version.h
@@ -26,15 +26,15 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.5.9"
+#define MOD_HTTP2_VERSION "1.5.10"
 
 /**
  * @macro
  * Numerical representation of the version number of the http2 module
  * 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_HTTP2_VERSION_NUM 0x010509
+#define MOD_HTTP2_VERSION_NUM 0x01050a
 
 
 #endif /* mod_h2_h2_version_h */