From: Stefan Eissing <icing@apache.org>
Date: Mon, 13 Mar 2017 15:54:59 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.5.0-alpha~558
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bea4fe875d852fa2258341f8dfc1851af97e367;p=thirdparty%2Fapache%2Fhttpd.git

update after backport

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

diff --git a/CHANGES b/CHANGES
index c415dc3f68e..bd768316e3e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,23 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: moving session cleanup to pre_close hook to avoid races with
-     modules already shut down and slave connections still operating.
-     [Stefan Eissing]
-
   *) Add <IfDirective> and <IfSection> directives.  [Joe Orton]
 
-  *) mod_http2: stream timeouts now change to vhost values once the request
-     is parsed and processing starts. Initial values are taken from base
-     server or SNI host as before. [Stefan Eissing]
-     
-  *) mod_proxy_http2: fixed retry behaviour when frontend connection uses 
-     http/1.1. [Stefan Eissing]
-     
-  *) mod_http2: separate mutex instances for each bucket beam, resulting in 
-     less lock contention. input beams only created when necessary.
-     [Stefan Eissing]
-     
   *) mod_syslog: Support use of optional "tag" in syslog entries.
      PR 60525. [Ben Rubson <ben.rubson gmail.com>, Jim Jagielski]
 
diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 8c74a68a9de..dd16820776d 100644
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -730,7 +730,7 @@ static apr_status_t session_pool_cleanup(void *data)
          * data which has, at this time, already been freed. An example
          * is mod_ssl that uses request hooks. */
         ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, c,
-                      H2_SSSN_LOG(APLOGNO(10020) session, 
+                      H2_SSSN_LOG(APLOGNO(10020), session, 
                       "session cleanup triggered by pool cleanup. "
                       "this should have happened earlier already."));
         return session_cleanup(session, "pool cleanup");
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 066487a798a..fddfbccbac8 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.9.3-DEV"
+#define MOD_HTTP2_VERSION "1.9.4-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 0x010903
+#define MOD_HTTP2_VERSION_NUM 0x010904
 
 
 #endif /* mod_h2_h2_version_h */