6 files changed, 27 insertions, 12 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 1b0b595..28d890d 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -474,5 +474,6 @@ void MainController::handleLoginRequest(const std::string &username, const std::
 			profileSettings_->storeString("certificate", certificatePath);
 			profileSettings_->storeString("pass", (remember || loginAutomatically) ? password : "");
-			profileSettings_->storeString("options", serializeClientOptions(options));
+			std::string optionString = serializeClientOptions(options);
+			profileSettings_->storeString("options", optionString);
 			settings_->storeSetting(SettingConstants::LAST_LOGIN_JID, username);
 			settings_->storeSetting(SettingConstants::LOGIN_AUTOMATICALLY, loginAutomatically);
diff --git a/Swiften/Base/URL.cpp b/Swiften/Base/URL.cpp
index 320e2ad..866cd45 100644
--- a/Swiften/Base/URL.cpp
+++ b/Swiften/Base/URL.cpp
@@ -46,5 +46,5 @@ URL URL::fromString(const std::string& urlString) {
 		else {
 			authority = urlString.substr(authorityIndex, slashIndex - authorityIndex);
-			path = unescape(urlString.substr(slashIndex + 1));
+			path = unescape(urlString.substr(slashIndex));
 		}
 
diff --git a/Swiften/Base/UnitTest/URLTest.cpp b/Swiften/Base/UnitTest/URLTest.cpp
index 09912ed..e82321f 100644
--- a/Swiften/Base/UnitTest/URLTest.cpp
+++ b/Swiften/Base/UnitTest/URLTest.cpp
@@ -19,4 +19,5 @@ class URLTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testFromString_WithRootPath);
 		CPPUNIT_TEST(testFromString_WithPort);
+		CPPUNIT_TEST(testFromString_WithPortOnePartPath);
 		CPPUNIT_TEST(testFromString_WithPortWithoutPath);
 		CPPUNIT_TEST(testFromString_WithUserInfo);
@@ -34,5 +35,5 @@ class URLTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
 			CPPUNIT_ASSERT(!url.getPort());
-			CPPUNIT_ASSERT_EQUAL(std::string("baz/bam"), url.getPath());
+			CPPUNIT_ASSERT_EQUAL(std::string("/baz/bam"), url.getPath());
 		}
 
@@ -52,5 +53,5 @@ class URLTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
 			CPPUNIT_ASSERT(!url.getPort());
-			CPPUNIT_ASSERT_EQUAL(std::string(""), url.getPath());
+			CPPUNIT_ASSERT_EQUAL(std::string("/"), url.getPath());
 		}
 
@@ -61,5 +62,14 @@ class URLTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
 			CPPUNIT_ASSERT_EQUAL(1234, *url.getPort());
-			CPPUNIT_ASSERT_EQUAL(std::string("baz/bam"), url.getPath());
+			CPPUNIT_ASSERT_EQUAL(std::string("/baz/bam"), url.getPath());
+		}
+
+		void testFromString_WithPortOnePartPath() {
+			URL url = URL::fromString("http://foo.bar:11440/http-bind/");
+			
+			CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
+			CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
+			CPPUNIT_ASSERT_EQUAL(11440, *url.getPort());
+			CPPUNIT_ASSERT_EQUAL(std::string("/http-bind/"), url.getPath());
 		}
 
@@ -78,5 +88,5 @@ class URLTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT_EQUAL(std::string("http"), url.getScheme());
 			CPPUNIT_ASSERT_EQUAL(std::string("foo.bar"), url.getHost());
-			CPPUNIT_ASSERT_EQUAL(std::string("baz/bam"), url.getPath());
+			CPPUNIT_ASSERT_EQUAL(std::string("/baz/bam"), url.getPath());
 		}
 
@@ -90,5 +100,5 @@ class URLTest : public CppUnit::TestFixture {
 			URL url = URL::fromString("http://foo.bar/baz/tron%C3%A7on/bam");
 			
-			CPPUNIT_ASSERT_EQUAL(std::string("baz/tron\xc3\xa7on/bam"), url.getPath());
+			CPPUNIT_ASSERT_EQUAL(std::string("/baz/tron\xc3\xa7on/bam"), url.getPath());
 		}
 
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index 73f8ed6..4741549 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -102,6 +102,10 @@ std::pair<SafeByteArray, size_t> BOSHConnection::createHTTPRequest(const SafeByt
 	size = safeContent.size();
 
-	header	<< "POST /" << boshURL.getPath() << " HTTP/1.1\r\n"
-			<< "Host: " << boshURL.getHost() << ":" << boshURL.getPort() << "\r\n"
+	header	<< "POST " << boshURL.getPath() << " HTTP/1.1\r\n"
+			<< "Host: " << boshURL.getHost();
+	if (boshURL.getPort()) {
+			header << ":" << *boshURL.getPort();
+	}
+	header	<< "\r\n"
 		/*<< "Accept-Encoding: deflate\r\n"*/
 			<< "Content-Type: text/xml; charset=utf-8\r\n"
diff --git a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
index 82762c5..7a2f0e6 100644
--- a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
+++ b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
@@ -48,5 +48,5 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 		void setUp() {
 			to = "wonderland.lit";
-			path = "http-bind";
+			path = "/http-bind";
 			port = "5280";
 			sid = "MyShinySID";
@@ -237,5 +237,5 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 			to = "prosody.doomsong.co.uk";
 			resolver->addAddress("prosody.doomsong.co.uk", HostAddress("127.0.0.1"));
-			path = "http-bind/";
+			path = "/http-bind/";
 			boshURL = URL("http", to, 5280, path);
 
diff --git a/Swiften/Network/UnitTest/BOSHConnectionTest.cpp b/Swiften/Network/UnitTest/BOSHConnectionTest.cpp
index 31aed1b..7ef0249 100644
--- a/Swiften/Network/UnitTest/BOSHConnectionTest.cpp
+++ b/Swiften/Network/UnitTest/BOSHConnectionTest.cpp
@@ -194,5 +194,5 @@ class BOSHConnectionTest : public CppUnit::TestFixture {
 			resolver->addAddress("wonderland.lit", HostAddress("127.0.0.1"));
 			Connector::ref connector = Connector::create("wonderland.lit", 5280, false, resolver, connectionFactory, timerFactory);
-			BOSHConnection::ref c = BOSHConnection::create(URL("http", "wonderland.lit", 5280, "http-bind"), connector, &parserFactory);
+			BOSHConnection::ref c = BOSHConnection::create(URL("http", "wonderland.lit", 5280, "/http-bind"), connector, &parserFactory);
 			c->onConnectFinished.connect(boost::bind(&BOSHConnectionTest::handleConnectFinished, this, _1));
 			c->onDisconnected.connect(boost::bind(&BOSHConnectionTest::handleDisconnected, this, _1));