From: Stefan Eissing <icing@apache.org>
Date: Sun, 10 Jul 2016 14:50:38 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.5.0-alpha~1419
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91b7139dba05562838a843853eeb5e0e9839e1a6;p=apache

update after backport

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

diff --git a/CHANGES b/CHANGES
index efe53237e4..6c0f632803 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: fixes connection flush when answering SETTINGS without any
-     stream open. [Moto Ishizawa <@summerwind>, Stefan Eissing]
-     
   *) ab: Add option -I to use the Server Name Indication (SNI) extension on
      outgoing TLS connections, according to the Host header (if any) or the
      requested URL's hostname otherwise.  [Yann Ylavic]
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 1bc975d3a5..7fa2ee0441 100644
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.5.12-DEV"
+#define MOD_HTTP2_VERSION "1.5.13-DEV"
 
 /**
  * @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 0x01050c
+#define MOD_HTTP2_VERSION_NUM 0x01050d
 
 
 #endif /* mod_h2_h2_version_h */