From 4e43292f1d4429747d2fed9d94412981ebec9858 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Tue, 22 Apr 2014 22:50:17 +0200
Subject: [PATCH] Don't overwrite SSLSocket settings

SoTimeout defaults to 0 anyways, and keep alive should be
enabled/disabled on the underlying socket.
---
 tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java b/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java
index e8cd2e7da..4f836d863 100644
--- a/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java
+++ b/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java
@@ -711,8 +711,6 @@ public class XMPPTCPConnection extends XMPPConnection {
         // Secure the plain connection
         socket = context.getSocketFactory().createSocket(plain,
                 plain.getInetAddress().getHostAddress(), plain.getPort(), true);
-        socket.setSoTimeout(0);
-        socket.setKeepAlive(true);
         // Initialize the reader and writer with the new secured version
         initReaderAndWriter();
         // Proceed to do the handshake