From: Daniel Ruggeri <druggeri@apache.org>
Date: Wed, 30 Mar 2016 13:40:15 +0000 (+0000)
Subject: Missed changes for r1737114
X-Git-Tag: 2.5.0-alpha~1811
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=819eaf1b0fbd1e08838c5fd6ba86adba580f97cb;p=thirdparty%2Fapache%2Fhttpd.git

Missed changes for r1737114

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

diff --git a/CHANGES b/CHANGES
index b33a29ca701..ea15bb1899d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) core: Do not read .htaccess if AllowOverride and AllowOverrideList 
+     are "None". PR 58528.
+     [Michael Schlenker <msc contact.de, Rudiger Plum, Daniel Ruggeri]
+
   *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.
      [Petr <pgajdos suse.cz>]