From: Eric Covener <covener@apache.org>
Date: Thu, 29 Nov 2012 01:36:06 +0000 (+0000)
Subject: add PR's in for recent commits
X-Git-Tag: 2.5.0-alpha~6082
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=031ea03a79414e9409c4a21e774caef0d0daafd1;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/CHANGES b/CHANGES
index 0b4b7a95ff0..0bff1a33345 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]