aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Fabio Bas2009-10-24 12:25:51 +0000
committerGravatar Fabio Bas2009-10-24 12:25:51 +0000
commit0a3ce260e08a213fb04444b864226d93410b99c2 (patch)
tree66b9936ab36ccd21d34faa7d6ff698bd59745ec5 /src
parentquick fix (diff)
downloadKVIrc-0a3ce260e08a213fb04444b864226d93410b99c2.tar.gz
KVIrc-0a3ce260e08a213fb04444b864226d93410b99c2.tar.bz2
KVIrc-0a3ce260e08a213fb04444b864226d93410b99c2.zip
fix for #600
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3567 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kernel/kvi_ircsocket.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index 1144aecbb..08adbc477 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -1313,6 +1313,7 @@ void KviIrcSocket::doSSLHandshake(int)
return; // ops ?
}
+ // We avoid to reset() the socket while in a processData() call (see bug #600)
switch(m_pSSL->connect())
{
case KviSSL::Success:
@@ -1333,12 +1334,12 @@ void KviIrcSocket::doSSLHandshake(int)
break;
case KviSSL::RemoteEndClosedConnection:
raiseError(KviError_remoteEndClosedConnection);
- reset();
+// reset();
break;
case KviSSL::SSLError:
raiseSSLError();
raiseError(KviError_SSLError);
- reset();
+// reset();
break;
case KviSSL::SyscallError:
{
@@ -1355,12 +1356,12 @@ void KviIrcSocket::doSSLHandshake(int)
m_pWsn->setEnabled(true);
return;
}
- reset();
+// reset();
}
break;
default:
raiseError(KviError_SSLError);
- reset();
+// reset();
break;
}