3 files changed, 11 insertions, 2 deletions
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index 83f12f7..bde689e 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -32,6 +32,7 @@ BOSHConnection::BOSHConnection(const URL& boshURL, Connector::ref connector, XML
 	  parserFactory_(parserFactory),
 	  sid_(),
 	  waitingForStartResponse_(false),
+		rid_(~0ULL),
 	  pending_(false),
 	  connectionReady_(false)
 {
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.cpp b/Swiften/Network/SOCKS5ProxiedConnection.cpp
index a9243d6..3fd8184 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.cpp
+++ b/Swiften/Network/SOCKS5ProxiedConnection.cpp
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #include <Swiften/Network/SOCKS5ProxiedConnection.h>
 
 #include <iostream>
@@ -24,7 +30,8 @@ SOCKS5ProxiedConnection::SOCKS5ProxiedConnection(
 		TimerFactory* timerFactory, 
 		const std::string& proxyHost, 
 		int proxyPort) :
-			ProxiedConnection(resolver, connectionFactory, timerFactory, proxyHost, proxyPort) {
+			ProxiedConnection(resolver, connectionFactory, timerFactory, proxyHost, proxyPort),
+			proxyState_(Initial) {
 			}
 
 void SOCKS5ProxiedConnection::initializeProxy() {
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.h b/Swiften/Network/SOCKS5ProxiedConnection.h
index 7906879..2c93468 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.h
+++ b/Swiften/Network/SOCKS5ProxiedConnection.h
@@ -29,7 +29,8 @@ namespace Swift {
 
 		private:
 			enum {
-				ProxyAuthenticating = 0,
+				Initial = 0,
+				ProxyAuthenticating,
 				ProxyConnecting
 			} proxyState_;
 	};