[ZNC-commits] SF.net SVN: znc:[2036] trunk/HTTPSock.cpp

[<cf...@us...>]

Revision: 2036
          http://znc.svn.sourceforge.net/znc/?rev=2036&view=rev
Author:   cflakes
Date:     2010-06-21 12:51:37 +0000 (Mon, 21 Jun 2010)

Log Message:
-----------
Revert unintended change from revision 2029 and added a comment so it won't happen again.

Revision Links:
--------------
    http://znc.svn.sourceforge.net/znc/?rev=2029&view=rev

Modified Paths:
--------------
    trunk/HTTPSock.cpp

Modified: trunk/HTTPSock.cpp
===================================================================
--- trunk/HTTPSock.cpp	2010-06-20 15:47:07 UTC (rev 2035)
+++ trunk/HTTPSock.cpp	2010-06-21 12:51:37 UTC (rev 2036)
@@ -43,7 +43,12 @@
 
 bool CHTTPSock::SendCookie(const CString& sKey, const CString& sValue) {
 	if (!sKey.empty() && !sValue.empty()) {
-		m_msResponseCookies[sKey] = sValue;
+		if (m_msRequestCookies.find(sKey) == m_msRequestCookies.end() ||
+			m_msRequestCookies[sKey].StrCmp(sValue) != 0)
+		{
+			// only queue a Set-Cookie to be sent if the client didn't send a Cookie header of the same name+value.
+			m_msResponseCookies[sKey] = sValue;
+		}
 		return true;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.