From: Stefan Eissing <icing@apache.org>
Date: Fri, 18 Sep 2015 13:19:33 +0000 (+0000)
Subject: merged latest branches/2.4.x changes
X-Git-Tag: 2.4.17~79^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42e59934526e21ca193e9ce25bca34c93dbaab8b;p=thirdparty%2Fapache%2Fhttpd.git

merged latest branches/2.4.x changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703838 13f79535-47bb-0310-9956-ffa450edef68
---

42e59934526e21ca193e9ce25bca34c93dbaab8b
diff --cc CHANGES
index ff28410f54e,89fade278ed..daf96b42515
--- a/CHANGES
+++ b/CHANGES
@@@ -1,9 -1,10 +1,12 @@@
                                                           -*- coding: utf-8 -*-
  
  Changes with Apache 2.4.17
 +  *) mod_h2: added donated http/2 implementation to build system. Similar
 +     configuration options to mod_ssl. [Stefan Eissing]
  
+   *) mod_autoindex: Allow autoindexes when neither mod_dir nor mod_mime are
+      loaded. [Eric Covener]
+ 
    *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting
       ';' as an alternate separator.  PR47241. 
       [<bugzilla schermesser com>, Eric Covener]