From: Eric Covener <covener@apache.org>
Date: Tue, 11 Feb 2014 19:35:52 +0000 (+0000)
Subject: Merge r1567221 from trunk:
X-Git-Tag: 2.4.8~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09bd7be2ae73341a49ed02a03c9f35ee7814632b;p=apache

Merge r1567221 from trunk:

mod_lua: Fix r:setcookie() to add, rather than replace,
the Set-Cookie header. PR56105

Submitted By: Kevin J Walters <kjw ms com>, Edward Lu <Chaosed0 gmail com>
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1567328 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 8692db89d5..96f77a0ca2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.8
 
+  *) 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_rewrite: Add %{CONN_REMOTE_ADDR} as the non-useragent counterpart to
      %{REMOTE_ADDR}. PR 56094. [Edward Lu <Chaosed0 gmail com>]
 
diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index 252df42e84..9d2628eb52 100644
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -1983,7 +1983,7 @@ static int lua_set_cookie(lua_State *L)
         }
     }
     out = apr_psprintf(r->pool, "%s=%s; %s %s", key, value, secure ? "Secure;" : "", expires ? strexpires : "");
-    apr_table_set(r->headers_out, "Set-Cookie", out);
+    apr_table_add(r->headers_out, "Set-Cookie", out);
     return 0;
 }