From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 20 Feb 2018 12:43:16 +0000 (+0000)
Subject: Follow up to r1821624: sync with latest 2.4.x.
X-Git-Tag: 2.4.31~38^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829144ed4638a23f0d40576c71cd988df8eef61f;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1821624: sync with latest 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@1824864 13f79535-47bb-0310-9956-ffa450edef68
---

829144ed4638a23f0d40576c71cd988df8eef61f
diff --cc CHANGES
index 52abf87f276,bae78b3f120..c551cd4d507
--- a/CHANGES
+++ b/CHANGES
@@@ -1,9 -1,11 +1,11 @@@
                                                           -*- coding: utf-8 -*-
- Changes with Apache 2.4.30
+ Changes with Apache 2.4.31
  
 -Changes with Apache 2.4.30
 +  *) mpm_queue: Put fdqueue code in common for MPMs event and worker.
 +     [Yann Ylavic]
  
 -  *) mod_proxy: Provide an RFC1035 compliant version of the hostname in the
 -     proxy_worker_shared structure. PR62085 [Graham Leggett]
++Changes with Apache 2.4.30
+ 
    *) mod_session: Strip Session header when SessionEnv is on.  [Yann Ylavic]
  
    *) mod_cache_socache: Fix caching of empty headers up to carriage return.