3 files changed, 9 insertions, 5 deletions
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
@@ -92,26 +92,30 @@ std::pair<SafeByteArray, size_t> BOSHConnection::createHTTPRequest(const SafeByt
 	}
 	if (terminate) {
 		content << " type='terminate'";
 	}
 	content << " xmlns='http://jabber.org/protocol/httpbind'>";
 
 	SafeByteArray safeContent = createSafeByteArray(content.str());
 	safeContent.insert(safeContent.end(), data.begin(), data.end());
 	safeContent.insert(safeContent.end(), contentTail.begin(), contentTail.end());
 
 	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"
 			<< "Content-Length: " << size << "\r\n\r\n";
 
 	SafeByteArray safeHeader = createSafeByteArray(header.str());
 	safeHeader.insert(safeHeader.end(), safeContent.begin(), safeContent.end());
 
 	return std::pair<SafeByteArray, size_t>(safeHeader, size);
 }
 
 void BOSHConnection::write(const SafeByteArray& data, bool streamRestart, bool terminate) {
 	assert(connectionReady_);
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
@@ -38,25 +38,25 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 	CPPUNIT_TEST(testConnectionCount_OneWrite);
 	CPPUNIT_TEST(testConnectionCount_TwoWrites);
 	CPPUNIT_TEST(testConnectionCount_ThreeWrites);
 	CPPUNIT_TEST(testConnectionCount_ThreeWrites_ManualConnect);
 	CPPUNIT_TEST(testConnectionCount_ThreeWritesTwoReads);
 	CPPUNIT_TEST(testSession);
 	CPPUNIT_TEST(testWrite_Empty);
 	CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
 			to = "wonderland.lit";
-			path = "http-bind";
+			path = "/http-bind";
 			port = "5280";
 			sid = "MyShinySID";
 			initial = "<body wait='60' "
 					"inactivity='30' "
 					"polling='5' "
 					"requests='2' "
 					"hold='1' "
 					"maxpause='120' "
 					"sid='" + sid + "' "
 					"ver='1.6' "
 					"from='wonderland.lit' "
 					"xmlns='http://jabber.org/protocol/httpbind'/>";
@@ -227,25 +227,25 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 			rid++;
 			testling->write(createSafeByteArray("<bluh/>"));
 			CPPUNIT_ASSERT(c0->pending);
 			CPPUNIT_ASSERT(c1->pending);
 			CPPUNIT_ASSERT_EQUAL(st(6), boshDataWritten.size()); /* Don't send data, no room */
 			eventLoop->processEvents();
 			CPPUNIT_ASSERT_EQUAL(st(2), connectionFactory->connections.size());
 		}
 
 		void testSession() {
 			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);
 
 			PoolRef testling = createTestling();
 			CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 			eventLoop->processEvents();
 			CPPUNIT_ASSERT_EQUAL(st(1), boshDataWritten.size()); /* header*/
 			CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 
 			std::string response = "<body authid='743da605-4c2e-4de1-afac-ac040dd4a940' xmpp:version='1.0' xmlns:stream='http://etherx.jabber.org/streams' xmlns:xmpp='urn:xmpp:xbosh' inactivity='60' wait='60' polling='5' secure='true' hold='1' from='prosody.doomsong.co.uk' ver='1.6' sid='743da605-4c2e-4de1-afac-ac040dd4a940' requests='2' xmlns='http://jabber.org/protocol/httpbind'><stream:features><auth xmlns='http://jabber.org/features/iq-auth'/><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>SCRAM-SHA-1</mechanism><mechanism>DIGEST-MD5</mechanism></mechanisms></stream:features></body>";
 			readResponse(response, connectionFactory->connections[0]);
 			eventLoop->processEvents();
 			CPPUNIT_ASSERT_EQUAL(st(1), boshDataWritten.size());
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
@@ -184,25 +184,25 @@ class BOSHConnectionTest : public CppUnit::TestFixture {
 			std::pair<SafeByteArray, size_t> http = BOSHConnection::createHTTPRequest(createSafeByteArray(data), false, false, 42, sid, URL());
 			CPPUNIT_ASSERT_EQUAL(fullBody.size(), http.second);
 			std::string response = safeByteArrayToString(http.first);
 			size_t bodyPosition = response.find("\r\n\r\n");
 			CPPUNIT_ASSERT_EQUAL(fullBody, response.substr(bodyPosition+4));
 		}
 
 	private:
 
 		BOSHConnection::ref createTestling() {
 			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));
 			c->onXMPPDataRead.connect(boost::bind(&BOSHConnectionTest::handleDataRead, this, _1));
 			c->onSessionStarted.connect(boost::bind(&BOSHConnectionTest::handleSID, this, _1));
 			c->setRID(42);
 			return c;
 		}
 
 		void handleConnectFinished(bool error) {
 			connectFinished = true;
 			connectFinishedWithError = error;
 		}