From: Daniel Gruno <humbedooh@apache.org>
Date: Thu, 20 Feb 2014 12:34:13 +0000 (+0000)
Subject: this was backported too.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d11cb7f42a08b0bd6ca35167246d72b7adcbee6d;p=thirdparty%2Fapache%2Fhttpd.git

this was backported too.

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

diff --git a/CHANGES b/CHANGES
index d4d042954fb..b47204e99d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,14 +5,6 @@ Changes with Apache 2.5.0
      IDs 02445, 02446, and 02448 to TRACE1 from DEBUG. PR 56145.
      [Joffroy Christen <joffroy.christen solvaxis com>, Eric Covener]
 
-  *) mod_lua: Update r:setcookie() to accept a table of options and add domain,
-     path and httponly to the list of options available to set.
-     PR 56128 [Edward Lu <Chaosed0 gmail com>, Daniel Gruno]
-     
-  *) mod_lua: Fix r:setcookie() to add, rather than replace,
-     the Set-Cookie header. PR56105
-     [Kevin J Walters <kjw ms com>, Edward Lu <Chaosed0 gmail com>]
-
   *) mod_proxy_fcgi: Fix error message when an unexpected protocol version
      number is received from the application.  PR 56110.  [Jeff Trawick]
 
@@ -126,8 +118,6 @@ Changes with Apache 2.5.0
      save the socket for reuse by the next worker as if it were an 
      APR_SO_DISCONNECTED socket. Restores 2.2 behavior. [Eric Covener]
 
-  *) mod_lua: Add a logging hook for modifying/skipping logs. [Daniel Gruno]
-
   *) mod_status, mod_echo: Fix the display of client addresses.
      They were truncated to 31 characters which is not enough for IPv6 addresses.
      PR 54848 [Bernhard Schmidt <berni birkenwald de>]