generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-17 03:03:23 +02:00
Code Issues Projects Releases Wiki Activity

- SF #3552774: Don't hide default target in subordinate makefile

Browse Source 
- SF #3534307: Building IPv6 for Linux by default
- SF #3516844: poco missing symbols with external >=lipcre-8.13 
- fix of rev. 1952 fix (porting rev.1913 from 1.4.4 (fixed SF# 3550553))
This commit is contained in:
Aleksandar Fabijanic
2012-08-20 00:57:17 +00:00
parent 06204c4865
commit 90a8e859bf
13 changed files with 123 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
NetSSL_OpenSSL/src/SecureSocketImpl.cpp
View File

@@ -140,7 +140,13 @@ void SecureSocketImpl::connect(const SocketAddress& address, const Poco::Timespa
poco_assert (!_pSSL);
_pSocket->connect(address, timeout);
Poco::Timespan receiveTimeout = _pSocket->getReceiveTimeout();
Poco::Timespan sendTimeout = _pSocket->getSendTimeout();
_pSocket->setReceiveTimeout(timeout);
_pSocket->setSendTimeout(timeout);
connectSSL(performHandshake);
_pSocket->setReceiveTimeout(receiveTimeout);
_pSocket->setSendTimeout(sendTimeout);
}
@@ -149,15 +155,8 @@ void SecureSocketImpl::connectNB(const SocketAddress& address)
if (_pSSL) reset();
poco_assert (!_pSSL);
_pSocket->connectNB(address);
Poco::Timespan receiveTimeout = _pSocket->getReceiveTimeout();
Poco::Timespan sendTimeout = _pSocket->getSendTimeout();
_pSocket->setReceiveTimeout(timeout);
_pSocket->setSendTimeout(timeout);
connectSSL(false);
_pSocket->setReceiveTimeout(receiveTimeout);
_pSocket->setSendTimeout(sendTimeout);
}