Return-Path: 
 <cvs-return-49082-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0179410CEF
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Fri, 29 Nov 2013 12:17:01 +0000 (UTC)
Received: (qmail 86638 invoked by uid 500); 29 Nov 2013 12:16:57 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 86592 invoked by uid 500); 29 Nov 2013 12:16:51 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 86571 invoked by uid 99); 29 Nov 2013 12:16:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Nov 2013 12:16:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Nov 2013 12:16:48 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D17EA238889B;
	Fri, 29 Nov 2013 12:16:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1546547 - /httpd/httpd/branches/2.4.x/CHANGES
Date: Fri, 29 Nov 2013 12:16:28 -0000
To: cvs@httpd.apache.org
From: humbedooh@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131129121628.D17EA238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: humbedooh
Date: Fri Nov 29 12:16:28 2013
New Revision: 1546547

URL: http://svn.apache.org/r1546547
Log:
Adding missing changelog entries for mod_lua.

Modified:
    httpd/httpd/branches/2.4.x/CHANGES

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1546547&r1=1546546&r2=1546547&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Nov 29 12:16:28 2013
@@ -192,6 +192,12 @@ Changes with Apache 2.4.7
      introduced in 2.4.4
      PR 55264 [Jo Rhett <jrhett netconsonance com>]
 
+  *) mod_lua: add websocket support via r:wsupgrade, r:wswrite, r:wsread 
+     and r:wsping. [Daniel Gruno]
+
+  *) mod_lua: add support for writing/reading cookies via r:getcookie and 
+     r:setcookie. [Daniel Gruno]
+
 Changes with Apache 2.4.6
 
   *) Revert a broken fix for PR54948 that was applied to 2.4.5 (which was