1 files changed, 6 insertions, 2 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_);