From 72a79a9dd7d6df516e229d86b197c8c9e6e186a8 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Wed, 15 Jun 2016 10:53:31 +0200 Subject: [PATCH] fixed bug in error handling when passing DATA frames --- ChangeLog | 4 ++++ configure.ac | 2 +- mod_http2/h2_conn_io.c | 2 +- mod_http2/h2_version.h | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 141bea2e..f3f250c8 100644 --- 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 index 4545d6bc..2d9fd9a8 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ # AC_PREREQ([2.69]) -AC_INIT([mod_http2], [1.5.9], [stefan.eissing@greenbytes.de]) +AC_INIT([mod_http2], [1.5.10], [stefan.eissing@greenbytes.de]) LT_PREREQ([2.2.6]) LT_INIT() diff --git a/mod_http2/h2_conn_io.c b/mod_http2/h2_conn_io.c index fb679ad3..f8615363 100644 --- 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 index 2b9ef754..1d181939 100644 --- a/mod_http2/h2_version.h +++ b/mod_http2/h2_version.h @@ -26,7 +26,7 @@ * @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 @@ -34,7 +34,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_HTTP2_VERSION_NUM 0x010509 +#define MOD_HTTP2_VERSION_NUM 0x01050a #endif /* mod_h2_h2_version_h */