From: Stefan Eissing <icing@apache.org>
Date: Fri, 31 Mar 2017 19:43:02 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~508
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=045142819a3835586f51e0164ef2c6c34d346606;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

update after backport to 2.4.x



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

diff --git a/CHANGES b/CHANGES
index 8150e09f38c..a6e81d99172 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,34 +1,15 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: better performance, eliminated need for nested locks and
-     thread privates. Moving request setups from the main connection to the
-     worker threads. Increase number of spare connections kept.
-     [Stefan Eissing]
-     
   *) core: Disallow multiple Listen on the same IP:port when listener buckets
      are configured (ListenCoresBucketsRatio > 0), consistently with the single
      bucket case (default), thus avoiding the leak of the corresponding socket
      descriptors on graceful restart.  [Yann Ylavic]
 
-  *) mod_http2: input buffering and dynamic flow windows for increased 
-     throughput. Requires nghttp2 >= v1.5.0 features. Announced at startup
-     in mod_http2 INFO log as feature 'DWINS'. [Stefan Eissing]
-
-  *) mod_http2: h2 workers with improved scalability for better scheduling
-     performance. There are H2MaxWorkers threads created at start and the
-     number is kept constant. [Stefan Eissing]
-     
-  *) mod_http2: obsoleted option H2SessionExtraFiles, will be ignored and
-     just log a warning. [Stefan Eissing]
-     
   *) mod_autoindex: Add IndexOptions UseOldDateFormat to allow the date
      format from 2.2 in the Last Modified column. PR60846.
      [Hank Ibell <hwibell gmail.com>]
 
-  *) mod_http2: fixed PR60869 by making h2 workers exit explicitly waking up
-     all threads to exit in a defined way. [Stefan Eissing]
-     
   *) Add <IfDirective> and <IfSection> directives.  [Joe Orton]
 
   *) mod_syslog: Support use of optional "tag" in syslog entries.
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index fc38d8c1c03..430b43f98f4 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.10.0-DEV"
+#define MOD_HTTP2_VERSION "1.10.1-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 0x010a00
+#define MOD_HTTP2_VERSION_NUM 0x010a01
 
 
 #endif /* mod_h2_h2_version_h */