summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2015-05-23 08:28:36 +0200
committerAlexander Harkness <me@bearbin.net>2015-05-23 08:28:36 +0200
commite0fd3ce95ba0a28bb130975a17a544bfb611cdb3 (patch)
tree8d79e88ccd85af1d47c1038aec9b9f858c7ef897
parentMerge pull request #2104 from beeduck/Issue2053 (diff)
parentClose Ssl Socket on destroy (diff)
downloadcuberite-e0fd3ce95ba0a28bb130975a17a544bfb611cdb3.tar
cuberite-e0fd3ce95ba0a28bb130975a17a544bfb611cdb3.tar.gz
cuberite-e0fd3ce95ba0a28bb130975a17a544bfb611cdb3.tar.bz2
cuberite-e0fd3ce95ba0a28bb130975a17a544bfb611cdb3.tar.lz
cuberite-e0fd3ce95ba0a28bb130975a17a544bfb611cdb3.tar.xz
cuberite-e0fd3ce95ba0a28bb130975a17a544bfb611cdb3.tar.zst
cuberite-e0fd3ce95ba0a28bb130975a17a544bfb611cdb3.zip
-rw-r--r--src/PolarSSL++/BlockingSslClientSocket.h5
-rw-r--r--src/Protocol/MojangAPI.cpp1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/PolarSSL++/BlockingSslClientSocket.h b/src/PolarSSL++/BlockingSslClientSocket.h
index 319e82bf2..462ee95a7 100644
--- a/src/PolarSSL++/BlockingSslClientSocket.h
+++ b/src/PolarSSL++/BlockingSslClientSocket.h
@@ -21,6 +21,11 @@ class cBlockingSslClientSocket :
{
public:
cBlockingSslClientSocket(void);
+
+ ~cBlockingSslClientSocket(void)
+ {
+ Disconnect();
+ }
/** Connects to the specified server and performs SSL handshake.
Returns true if successful, false on failure. Sets internal error text on failure. */
diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp
index a12351286..110590359 100644
--- a/src/Protocol/MojangAPI.cpp
+++ b/src/Protocol/MojangAPI.cpp
@@ -459,7 +459,6 @@ bool cMojangAPI::SecureRequest(const AString & a_ServerName, const AString & a_R
a_Response.append((const char *)buf, (size_t)ret);
}
- Socket.Disconnect();
return true;
}