From: Eric Covener <covener@apache.org>
Date: Wed, 4 Mar 2015 19:22:37 +0000 (+0000)
Subject: backported
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67a576cc5064d6f597c07c1b6ba543be89c013bf;p=thirdparty%2Fapache%2Fhttpd.git

backported


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

diff --git a/CHANGES b/CHANGES
index 1d1acd51c2b..f817c05f838 100644
--- a/CHANGES
+++ b/CHANGES
@@ -44,10 +44,6 @@ Changes with Apache 2.5.0
      at the same time, don't lose errors occuring while forwarding on the first
      side when none occurs next on the other side, and abort.  [Yann Ylavic]
 
-  *) mod_lua: After a r:wsupgrade(), mod_lua was not properly
-     responding to a websockets PING but instead invoking the specified 
-     script. PR57524. [Edward Lu <Chaosed0 gmail.com>]
-
   *) mod_macro: Clear macros before initialization to avoid use-after-free
      on startup or restart when the module is linked statically. PR 57525
      [apache.org tech.futurequest.net, Yann Ylavic]