From 57762a2cfcf7a57c1c856b693b37399bdbcb4cd3 Mon Sep 17 00:00:00 2001
From: Guenter Obiltschnig <guenter.obiltschnig@appinf.com>
Date: Tue, 16 Sep 2008 17:26:28 +0000
Subject: [PATCH] fixed various bugs (see SF tracker)

---
 Foundation/Foundation_vs71.vcproj         |  2 +
 Foundation/Foundation_vs80.vcproj         |  2 +
 Foundation/Foundation_vs90.vcproj         |  2 +
 Foundation/include/Poco/LinearHashTable.h |  2 +-
 Foundation/src/AsyncChannel.cpp           |  5 ++-
 Net/Net_vs71.vcproj                       |  2 +
 Net/Net_vs80.vcproj                       |  2 +
 Net/Net_vs90.vcproj                       |  2 +
 Net/include/Poco/Net/HTTPCookie.h         | 15 ++++++-
 Net/src/HTMLForm.cpp                      |  1 +
 Net/src/HTTPCookie.cpp                    | 52 +++++++++++++++++------
 Net/testsuite/src/HTTPCookieTest.cpp      |  8 +++-
 NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.vcproj |  2 +
 NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj |  2 +
 NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj |  2 +
 XML/include/Poco/XML/XMLString.h          |  6 ++-
 XML/src/AttributesImpl.cpp                |  6 +--
 XML/src/NamespaceStrategy.cpp             |  8 ++--
 XML/src/ParserEngine.cpp                  |  4 +-
 19 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/Foundation/Foundation_vs71.vcproj b/Foundation/Foundation_vs71.vcproj
index 25a9df1b7..029150248 100644
--- a/Foundation/Foundation_vs71.vcproj
+++ b/Foundation/Foundation_vs71.vcproj
@@ -164,6 +164,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mtd.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -217,6 +218,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mt.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
diff --git a/Foundation/Foundation_vs80.vcproj b/Foundation/Foundation_vs80.vcproj
index 2355fa208..fd3185479 100644
--- a/Foundation/Foundation_vs80.vcproj
+++ b/Foundation/Foundation_vs80.vcproj
@@ -256,6 +256,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mt.lib"
 			/>
 			<Tool
@@ -327,6 +328,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mtd.lib"
 			/>
 			<Tool
diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj
index 8dfa44349..6eaf46eca 100644
--- a/Foundation/Foundation_vs90.vcproj
+++ b/Foundation/Foundation_vs90.vcproj
@@ -249,6 +249,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mt.lib"
 			/>
 			<Tool
@@ -318,6 +319,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mtd.lib"
 			/>
 			<Tool
diff --git a/Foundation/include/Poco/LinearHashTable.h b/Foundation/include/Poco/LinearHashTable.h
index 859933401..1c21811a0 100644
--- a/Foundation/include/Poco/LinearHashTable.h
+++ b/Foundation/include/Poco/LinearHashTable.h
@@ -89,7 +89,7 @@ public:
 	typedef typename Bucket::iterator    BucketIterator;
 	typedef typename BucketVec::iterator BucketVecIterator;
 
-	class ConstIterator
+	class ConstIterator: public std::iterator<std::forward_iterator_tag, Value>
 	{
 	public:
 		ConstIterator()
diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp
index 6ef1ed388..7905f6fb5 100644
--- a/Foundation/src/AsyncChannel.cpp
+++ b/Foundation/src/AsyncChannel.cpp
@@ -115,7 +115,10 @@ void AsyncChannel::close()
 	{
 		while (!_queue.empty()) Thread::sleep(100);
 		
-		do { _queue.wakeUpAll(); }
+		do 
+		{
+			_queue.wakeUpAll(); 
+		}
 		while (!_thread.tryJoin(100));
 	}
 }
diff --git a/Net/Net_vs71.vcproj b/Net/Net_vs71.vcproj
index 25c0e5542..0386ffe45 100644
--- a/Net/Net_vs71.vcproj
+++ b/Net/Net_vs71.vcproj
@@ -166,6 +166,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mtd.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -219,6 +220,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mt.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
diff --git a/Net/Net_vs80.vcproj b/Net/Net_vs80.vcproj
index d8c03bb1a..63671c119 100644
--- a/Net/Net_vs80.vcproj
+++ b/Net/Net_vs80.vcproj
@@ -258,6 +258,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mt.lib"
 			/>
 			<Tool
@@ -329,6 +330,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mtd.lib"
 			/>
 			<Tool
diff --git a/Net/Net_vs90.vcproj b/Net/Net_vs90.vcproj
index f30809a0c..6c1e63209 100644
--- a/Net/Net_vs90.vcproj
+++ b/Net/Net_vs90.vcproj
@@ -249,6 +249,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mt.lib"
 			/>
 			<Tool
@@ -318,6 +319,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\Poco$(ProjectName)mtd.lib"
 			/>
 			<Tool
diff --git a/Net/include/Poco/Net/HTTPCookie.h b/Net/include/Poco/Net/HTTPCookie.h
index 93650aa0e..3e35b1113 100644
--- a/Net/include/Poco/Net/HTTPCookie.h
+++ b/Net/include/Poco/Net/HTTPCookie.h
@@ -1,7 +1,7 @@
 //
 // HTTPCookie.h
 //
-// $Id: //poco/svn/Net/include/Poco/Net/HTTPCookie.h#2 $
+// $Id: //poco/1.3/Net/include/Poco/Net/HTTPCookie.h#1 $
 //
 // Library: Net
 // Package: HTTP
@@ -157,6 +157,12 @@ public:
 		/// Returns the maximum age in seconds for
 		/// the cookie.
 		
+	void setHttpOnly(bool flag = true);
+		/// Sets the HttpOnly flag for the cookie.
+		
+	bool getHttpOnly() const;
+		/// Returns true iff the cookie's HttpOnly flag is set.
+		
 	std::string toString() const;
 		/// Returns a string representation of the cookie,
 		/// suitable for use in a Set-Cookie header.
@@ -170,6 +176,7 @@ private:
 	std::string _path;
 	bool        _secure;
 	int         _maxAge;
+	bool        _httpOnly;
 };
 
 
@@ -224,6 +231,12 @@ inline int HTTPCookie::getMaxAge() const
 }
 
 
+inline bool HTTPCookie::getHttpOnly() const
+{
+	return _httpOnly;
+}
+
+
 } } // namespace Poco::Net
 
 
diff --git a/Net/src/HTMLForm.cpp b/Net/src/HTMLForm.cpp
index 87c84c3a2..a10e0575d 100644
--- a/Net/src/HTMLForm.cpp
+++ b/Net/src/HTMLForm.cpp
@@ -124,6 +124,7 @@ void HTMLForm::addPart(const std::string& name, PartSource* pSource)
 
 void HTMLForm::load(const HTTPRequest& request, std::istream& requestBody, PartHandler& handler)
 {
+	clear();
 	if (request.getMethod() == HTTPRequest::HTTP_POST)
 	{
 		std::string mediaType;
diff --git a/Net/src/HTTPCookie.cpp b/Net/src/HTTPCookie.cpp
index 126e6f757..c6bcd41cf 100644
--- a/Net/src/HTTPCookie.cpp
+++ b/Net/src/HTTPCookie.cpp
@@ -1,7 +1,7 @@
 //
 // HTTPCookie.cpp
 //
-// $Id: //poco/svn/Net/src/HTTPCookie.cpp#2 $
+// $Id: //poco/1.3/Net/src/HTTPCookie.cpp#2 $
 //
 // Library: Net
 // Package: HTTP
@@ -63,7 +63,8 @@ namespace Net {
 HTTPCookie::HTTPCookie():
 	_version(0),
 	_secure(false),
-	_maxAge(-1)
+	_maxAge(-1),
+	_httpOnly(false)
 {
 }
 
@@ -72,7 +73,8 @@ HTTPCookie::HTTPCookie(const std::string& name):
 	_version(0),
 	_name(name),
 	_secure(false),
-	_maxAge(-1)
+	_maxAge(-1),
+	_httpOnly(false)
 {
 }
 
@@ -80,7 +82,8 @@ HTTPCookie::HTTPCookie(const std::string& name):
 HTTPCookie::HTTPCookie(const NameValueCollection& nvc):
 	_version(0),
 	_secure(false),
-	_maxAge(-1)
+	_maxAge(-1),
+	_httpOnly(false)
 {
 	for (NameValueCollection::ConstIterator it = nvc.begin(); it != nvc.end(); ++it)
 	{
@@ -117,6 +120,10 @@ HTTPCookie::HTTPCookie(const NameValueCollection& nvc):
 		{
 			setVersion(NumberParser::parse(value));
 		}
+		else if (icompare(name, "HttpOnly") == 0)
+		{
+			setHttpOnly(true);
+		}
 		else
 		{
 			setName(name);
@@ -131,7 +138,8 @@ HTTPCookie::HTTPCookie(const std::string& name, const std::string& value):
 	_name(name),
 	_value(value),
 	_secure(false),
-	_maxAge(-1)
+	_maxAge(-1),
+	_httpOnly(false)
 {
 }
 
@@ -144,7 +152,8 @@ HTTPCookie::HTTPCookie(const HTTPCookie& cookie):
 	_domain(cookie._domain),
 	_path(cookie._path),
 	_secure(cookie._secure),
-	_maxAge(cookie._maxAge)
+	_maxAge(cookie._maxAge),
+	_httpOnly(cookie._httpOnly)
 {
 }
 
@@ -158,14 +167,15 @@ HTTPCookie& HTTPCookie::operator = (const HTTPCookie& cookie)
 {
 	if (&cookie != this)
 	{
-		_version = cookie._version;
-		_name    = cookie._name;
-		_value   = cookie._value;
-		_comment = cookie._comment;
-		_domain  = cookie._domain;
-		_path    = cookie._path;
-		_secure  = cookie._secure;
-		_maxAge  = cookie._maxAge;
+		_version  = cookie._version;
+		_name     = cookie._name;
+		_value    = cookie._value;
+		_comment  = cookie._comment;
+		_domain   = cookie._domain;
+		_path     = cookie._path;
+		_secure   = cookie._secure;
+		_maxAge   = cookie._maxAge;
+		_httpOnly = cookie._httpOnly;
 	}
 	return *this;
 }
@@ -219,6 +229,12 @@ void HTTPCookie::setMaxAge(int maxAge)
 }
 
 
+void HTTPCookie::setHttpOnly(bool flag)
+{
+	_httpOnly = flag;
+}
+
+
 std::string HTTPCookie::toString() const
 {
 	std::string result(_name);
@@ -248,6 +264,10 @@ std::string HTTPCookie::toString() const
 		{
 			result.append("; secure");
 		}
+		if (_httpOnly)
+		{
+			result.append("; HttpOnly");
+		}
 	}
 	else
 	{
@@ -283,6 +303,10 @@ std::string HTTPCookie::toString() const
 		{
 			result.append("; secure");
 		}
+		if (_httpOnly)
+		{
+			result.append("; HttpOnly");
+		}
 		result.append("; Version=\"1\"");
 	}
 	return result;
diff --git a/Net/testsuite/src/HTTPCookieTest.cpp b/Net/testsuite/src/HTTPCookieTest.cpp
index 7da87b62c..7e12cc01a 100644
--- a/Net/testsuite/src/HTTPCookieTest.cpp
+++ b/Net/testsuite/src/HTTPCookieTest.cpp
@@ -1,7 +1,7 @@
 //
 // HTTPCookieTest.cpp
 //
-// $Id: //poco/svn/Net/testsuite/src/HTTPCookieTest.cpp#2 $
+// $Id: //poco/1.3/Net/testsuite/src/HTTPCookieTest.cpp#1 $
 //
 // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -63,6 +63,9 @@ void HTTPCookieTest::testCookie()
 	assert (cookie.toString() == "name=value; domain=appinf.com; path=/");
 	cookie.setSecure(true);
 	assert (cookie.toString() == "name=value; domain=appinf.com; path=/; secure");
+	cookie.setHttpOnly(true);
+	assert (cookie.toString() == "name=value; domain=appinf.com; path=/; secure; HttpOnly");
+	cookie.setHttpOnly(false);
 	
 	cookie.setVersion(1);
 	assert (cookie.toString() == "name=\"value\"; Comment=\"comment\"; Domain=\"appinf.com\"; Path=\"/\"; secure; Version=\"1\"");
@@ -70,6 +73,9 @@ void HTTPCookieTest::testCookie()
 	cookie.setSecure(false);
 	cookie.setMaxAge(100);
 	assert (cookie.toString() == "name=\"value\"; Comment=\"comment\"; Domain=\"appinf.com\"; Path=\"/\"; Max-Age=\"100\"; Version=\"1\"");
+	
+	cookie.setHttpOnly(true);
+	assert (cookie.toString() == "name=\"value\"; Comment=\"comment\"; Domain=\"appinf.com\"; Path=\"/\"; Max-Age=\"100\"; HttpOnly; Version=\"1\"");
 }
 
 
diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.vcproj
index 32500d943..28c861643 100644
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.vcproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.vcproj
@@ -166,6 +166,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoNetSSLmtd.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -219,6 +220,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoNetSSLmt.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj
index 7eec828f6..f9759fd4a 100644
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj
@@ -254,6 +254,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoNetSSLmtd.lib"
 			/>
 			<Tool
@@ -329,6 +330,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoNetSSLmt.lib"
 			/>
 			<Tool
diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj
index 6fed50025..acf524671 100644
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj
@@ -245,6 +245,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoNetSSLmtd.lib"
 			/>
 			<Tool
@@ -318,6 +319,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoNetSSLmt.lib"
 			/>
 			<Tool
diff --git a/XML/include/Poco/XML/XMLString.h b/XML/include/Poco/XML/XMLString.h
index 8a66dae05..af6e06e6b 100644
--- a/XML/include/Poco/XML/XMLString.h
+++ b/XML/include/Poco/XML/XMLString.h
@@ -1,7 +1,7 @@
 //
 // XMLString.h
 //
-// $Id: //poco/svn/XML/include/Poco/XML/XMLString.h#2 $
+// $Id: //poco/1.3/XML/include/Poco/XML/XMLString.h#1 $
 //
 // Library: XML
 // Package: XML
@@ -75,6 +75,8 @@ namespace XML {
 	XMLString toXMLString(const std::string& str);
 		/// Converts an UTF-8 encoded string into an
 		/// XMLString
+		
+	#define XML_LIT(lit) L##lit
 
 #elif defined(XML_UNICODE)
 
@@ -95,6 +97,8 @@ namespace XML {
 	{
 		return str;
 	}
+	
+	#define XML_LIT(lit) lit
 
 #endif
 
diff --git a/XML/src/AttributesImpl.cpp b/XML/src/AttributesImpl.cpp
index cf4e49326..742308bbb 100644
--- a/XML/src/AttributesImpl.cpp
+++ b/XML/src/AttributesImpl.cpp
@@ -1,7 +1,7 @@
 //
 // AttributesImpl.cpp
 //
-// $Id: //poco/svn/XML/src/AttributesImpl.cpp#3 $
+// $Id: //poco/1.3/XML/src/AttributesImpl.cpp#2 $
 //
 // Library: XML
 // Package: SAX
@@ -44,14 +44,14 @@ namespace XML {
 AttributesImpl::AttributesImpl()
 {
 	_empty.specified = false;
-	_empty.type = "CDATA";
+	_empty.type = XML_LIT("CDATA");
 }
 
 
 AttributesImpl::AttributesImpl(const Attributes& attributes)
 {
 	_empty.specified = false;
-	_empty.type = "CDATA";
+	_empty.type = XML_LIT("CDATA");
 	setAttributes(attributes);
 }
 
diff --git a/XML/src/NamespaceStrategy.cpp b/XML/src/NamespaceStrategy.cpp
index 6103a1c03..3b5c77c70 100644
--- a/XML/src/NamespaceStrategy.cpp
+++ b/XML/src/NamespaceStrategy.cpp
@@ -1,7 +1,7 @@
 //
 // NamespaceStrategy.cpp
 //
-// $Id: //poco/svn/XML/src/NamespaceStrategy.cpp#3 $
+// $Id: //poco/1.3/XML/src/NamespaceStrategy.cpp#2 $
 //
 // Library: XML
 // Package: XML
@@ -82,13 +82,13 @@ void NamespaceStrategy::splitName(const XMLChar* qname, XMLString& uri, XMLStrin
 		if (*p)
 			prefix.assign(++p);
 		else
-			prefix.assign("");
+			prefix.assign(XML_LIT(""));
 	}
 	else 
 	{
-		uri.assign("");
+		uri.assign(XML_LIT(""));
 		localName = qname;
-		prefix.assign("");
+		prefix.assign(XML_LIT(""));
 	}	
 }
 
diff --git a/XML/src/ParserEngine.cpp b/XML/src/ParserEngine.cpp
index 4f2e628d4..8a734d8b4 100644
--- a/XML/src/ParserEngine.cpp
+++ b/XML/src/ParserEngine.cpp
@@ -1,7 +1,7 @@
 //
 // ParserEngine.cpp
 //
-// $Id: //poco/svn/XML/src/ParserEngine.cpp#3 $
+// $Id: //poco/1.3/XML/src/ParserEngine.cpp#4 $
 //
 // Library: XML
 // Package: XML
@@ -720,7 +720,7 @@ int ParserEngine::handleUnknownEncoding(void* encodingHandlerData, const XML_Cha
 	if (it != pThis->_encodings.end())
 		knownEncoding = it->second;
 	else
-		knownEncoding = Poco::TextEncoding::find(encoding);
+		knownEncoding = Poco::TextEncoding::find(fromXMLString(encoding));
 
 	if (knownEncoding)
 	{