This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".

The branch, master has been updated
       via  0fdef7f087038df4cf0395efd00494c984b2bcf0 (commit)
       via  f417f4eb8ad3f6a914867fdb15278299309767f2 (commit)
      from  1efd1adf160e64e34202288cc1dd153c75ea8949 (commit)


Summary of changes:
 src/Snap/Internal/Http/Server.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0fdef7f087038df4cf0395efd00494c984b2bcf0
Merge: 1efd1ad f417f4e
Author: Gregory Collins <[email protected]>
Date:   Sat Feb 26 15:38:26 2011 +0100

    Merge branch 'master' of https://github.com/lpsmith/snap-server

commit f417f4eb8ad3f6a914867fdb15278299309767f2
Author: Leon P Smith <[email protected]>
Date:   Sun Jan 30 20:53:24 2011 -0500

    Include cookies in rspHeaders,  in addition to rspCookies
    
    (flip (++)) was chosen under the assumption that there will usually
    be more cookies in rspCookies than in rspHeaders

diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
index 086733f..a100f61 100644
--- a/src/Snap/Internal/Http/Server.hs
+++ b/src/Snap/Internal/Http/Server.hs
@@ -776,7 +776,7 @@ sendResponse req rsp' buffer writeEnd' onSendFile = do
       where
         f h = if null cookies
                 then h
-                else Map.insert "Set-Cookie" cookies h
+                else Map.insertWith (flip (++)) "Set-Cookie" cookies h
         cookies = fmap cookieToBS . Map.elems $ rspCookies r
 
 
-----------------------------------------------------------------------


hooks/post-receive
-- 
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap

Reply via email to