1 files changed, 24 insertions, 7 deletions
diff --git a/Swiften/Network/HTTPConnectProxiedConnection.cpp b/Swiften/Network/HTTPConnectProxiedConnection.cpp
index 942361e..3ed2ac5 100644
--- a/Swiften/Network/HTTPConnectProxiedConnection.cpp
+++ b/Swiften/Network/HTTPConnectProxiedConnection.cpp
@@ -10,63 +10,80 @@
  * See the COPYING file for more information.
  */
 
 
 #include <Swiften/Network/HTTPConnectProxiedConnection.h>
 
 #include <iostream>
 #include <utility>
 
+#include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Base/Algorithm.h>
+#include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/String.h>
-#include <Swiften/Base/ByteArray.h>
-#include <Swiften/Network/HostAddressPort.h>
+#include <Swiften/Base/foreach.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/HTTPTrafficFilter.h>
+#include <Swiften/Network/HostAddressPort.h>
 #include <Swiften/StringCodecs/Base64.h>
 
 using namespace Swift;
 
 HTTPConnectProxiedConnection::HTTPConnectProxiedConnection(
 		DomainNameResolver* resolver, 
 		ConnectionFactory* connectionFactory, 
 		TimerFactory* timerFactory, 
 		const std::string& proxyHost, 
 		int proxyPort, 
 		const SafeString& authID, 
 		const SafeString& authPassword) : 
 			ProxiedConnection(resolver, connectionFactory, timerFactory, proxyHost, proxyPort),
 			authID_(authID), 
 			authPassword_(authPassword) {
 }
 
+HTTPConnectProxiedConnection::~HTTPConnectProxiedConnection() {
+
+}
+
 void HTTPConnectProxiedConnection::setHTTPTrafficFilter(boost::shared_ptr<HTTPTrafficFilter> trafficFilter) {
 	trafficFilter_ = trafficFilter;
 }
 
 void HTTPConnectProxiedConnection::initializeProxy() {
+	httpResponseBuffer_.clear();
+
 	std::stringstream connect;
 	connect << "CONNECT " << getServer().getAddress().toString() << ":" << getServer().getPort() << " HTTP/1.1\r\n";
 	SafeByteArray data = createSafeByteArray(connect.str());
 	if (!authID_.empty() && !authPassword_.empty()) {
 		append(data, createSafeByteArray("Proxy-Authorization: Basic "));
 		SafeByteArray credentials = authID_;
 		append(credentials, createSafeByteArray(":"));
 		append(credentials, authPassword_);
 		append(data, Base64::encode(credentials));
 		append(data, createSafeByteArray("\r\n"));
 	}
+	else if (!nextHTTPRequestHeaders_.empty()) {
+		typedef std::pair<std::string, std::string> StringPair;
+		foreach(const StringPair& headerField, nextHTTPRequestHeaders_) {
+			append(data, createSafeByteArray(headerField.first));
+			append(data, createSafeByteArray(": "));
+			append(data, createSafeByteArray(headerField.second));
+			append(data, createSafeByteArray("\r\n"));
+		}
+
+		nextHTTPRequestHeaders_.clear();
+	}
 	append(data, createSafeByteArray("\r\n"));
 	SWIFT_LOG(debug) << "HTTP Proxy send headers: " << byteArrayToString(ByteArray(data.begin(), data.end())) << std::endl;
 	write(data);
 }
 
 void HTTPConnectProxiedConnection::parseHTTPHeader(const std::string& data, std::string& statusLine, std::vector<std::pair<std::string, std::string> >& headerFields) {
 	std::istringstream dataStream(data);
 
 	// parse status line
@@ -108,23 +125,23 @@ void HTTPConnectProxiedConnection::handleProxyInitializeData(boost::shared_ptr<S
 		if ((httpResponseBuffer_.size() > 4) && (httpResponseBuffer_.substr(0, 4) != "HTTP")) {
 			setProxyInitializeFinished(false);
 		}
 		return;
 	}
 
 	parseHTTPHeader(httpResponseBuffer_.substr(0, headerEnd), statusLine, headerFields);
 
 	if (trafficFilter_) {
-		std::vector<std::pair<std::string, std::string> > newHeaderFields = trafficFilter_->filterHTTPResponseHeader(headerFields);
+		std::vector<std::pair<std::string, std::string> > newHeaderFields = trafficFilter_->filterHTTPResponseHeader(statusLine, headerFields);
 		if (!newHeaderFields.empty()) {
 			std::stringstream statusLine;
-			statusLine << "CONNECT " << getServer().getAddress().toString() << ":" << getServer().getPort();
-			sendHTTPRequest(statusLine.str(), newHeaderFields);
+			reconnect();
+			nextHTTPRequestHeaders_ = newHeaderFields;
 			return;
 		}
 	}
 
 	std::vector<std::string> tmp = String::split(statusLine, ' ');
 	if (tmp.size() > 1) {
 		try {
 			int status = boost::lexical_cast<int>(tmp[1]);
 			SWIFT_LOG(debug) << "Proxy Status: " << status << std::endl;