summaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2012-11-29 02:36:06 +0100
committerEric Covener <covener@apache.org>2012-11-29 02:36:06 +0100
commit031ea03a79414e9409c4a21e774caef0d0daafd1 (patch)
tree35fc81ce161fec64e0538af87314f95154500343 /CHANGES
parentPR54223: 2.4 generates AH00554 when Include points to a directory with no wil... (diff)
downloadapache2-031ea03a79414e9409c4a21e774caef0d0daafd1.tar.xz
apache2-031ea03a79414e9409c4a21e774caef0d0daafd1.zip
add PR's in for recent commits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415024 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES6
1 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 0b4b7a95ff..0bff1a3334 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,10 @@
Changes with Apache 2.5.0
*) core: Don't fail at startup with AH00554 when Include points to
- a directory without any wildcard character. [Eric Covener]
+ a directory without any wildcard character. PR 54223 [Eric Covener]
- *) core: Fail startup if the argument to ServerTokens is unrecognized.
- [Jackie Zhang <jackie.qq.zhang gmail.com>]
+ *) core: Fail startup if the argument to ServerTokens is unrecognized.
+ PR 54222 [Jackie Zhang <jackie.qq.zhang gmail.com>]
*) mod_log_forensic: Don't log a spurious "-" if a request has been rejected
before mod_log_forensic could attach its id to it. [Stefan Fritsch]