@@ -68,7 +68,7 @@ SecureSocketImpl::~SecureSocketImpl()
 	}
 }
 
-	
+
 SocketImpl* SecureSocketImpl::acceptConnection(SocketAddress& clientAddr)
 {
 	poco_assert (!_pSSL);
@@ -104,7 +104,7 @@ void SecureSocketImpl::acceptSSL()
 void SecureSocketImpl::connect(const SocketAddress& address, bool performHandshake)
 {
 	if (_pSSL) reset();
-	
+
 	poco_assert (!_pSSL);
 
 	_pSocket->connect(address);
@@ -115,7 +115,7 @@ void SecureSocketImpl::connect(const SocketAddress& address, bool performHandsha
 void SecureSocketImpl::connect(const SocketAddress& address, const Poco::Timespan& timeout, bool performHandshake)
 {
 	if (_pSSL) reset();
-	
+
 	poco_assert (!_pSSL);
 
 	_pSocket->connect(address, timeout);
@@ -125,14 +125,14 @@ void SecureSocketImpl::connect(const SocketAddress& address, const Poco::Timespa
 	_pSocket->setSendTimeout(timeout);
 	connectSSL(performHandshake);
 	_pSocket->setReceiveTimeout(receiveTimeout);
-	_pSocket->setSendTimeout(sendTimeout);	
+	_pSocket->setSendTimeout(sendTimeout);
 }
 
 
 void SecureSocketImpl::connectNB(const SocketAddress& address)
 {
 	if (_pSSL) reset();
-	
+
 	poco_assert (!_pSSL);
 
 	_pSocket->connectNB(address);
@@ -144,7 +144,7 @@ void SecureSocketImpl::connectSSL(bool performHandshake)
 {
 	poco_assert (!_pSSL);
 	poco_assert (_pSocket->initialized());
-	
+
 	BIO* pBIO = BIO_new(BIO_s_socket());
 	if (!pBIO) throw SSLException("Cannot create SSL BIO object");
 	BIO_set_fd(pBIO, static_cast<int>(_pSocket->sockfd()), BIO_NOCLOSE);
@@ -156,7 +156,7 @@ void SecureSocketImpl::connectSSL(bool performHandshake)
 		throw SSLException("Cannot create SSL object");
 	}
 	SSL_set_bio(_pSSL, pBIO, pBIO);
-	
+
 #if OPENSSL_VERSION_NUMBER >= 0x0908060L && !defined(OPENSSL_NO_TLSEXT)
 	if (!_peerHostName.empty())
 	{
@@ -168,7 +168,7 @@ void SecureSocketImpl::connectSSL(bool performHandshake)
 	{
 		SSL_set_session(_pSSL, _pSession->sslSession());
 	}
-	
+
 	try
 	{
 		if (performHandshake && _pSocket->getBlocking())
@@ -199,7 +199,7 @@ void SecureSocketImpl::bind(const SocketAddress& address, bool reuseAddress)
 	_pSocket->bind(address, reuseAddress);
 }
 
-	
+
 void SecureSocketImpl::listen(int backlog)
 {
 	poco_check_ptr (_pSocket);
@@ -347,9 +347,9 @@ int SecureSocketImpl::completeHandshake()
 void SecureSocketImpl::verifyPeerCertificate()
 {
 	if (_peerHostName.empty())
-		_peerHostName = _pSocket->peerAddress().host().toString();
-		
-	verifyPeerCertificate(_peerHostName);
+		verifyPeerCertificate(_pSocket->peerAddress().host().toString());
+	else
+		verifyPeerCertificate(_peerHostName);
 }
 
 
@@ -546,7 +546,7 @@ Session::Ptr SecureSocketImpl::currentSession()
 	return 0;
 }
 
-	
+
 void SecureSocketImpl::useSession(Session::Ptr pSession)
 {
 	_pSession = pSession;
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ SecureSocketImpl::~SecureSocketImpl()`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`-`
	`71`	`+`
`72`	`72`	`SocketImpl* SecureSocketImpl::acceptConnection(SocketAddress& clientAddr)`
`73`	`73`	`{`
`74`	`74`	`poco_assert (!_pSSL);`
`@@ -104,7 +104,7 @@ void SecureSocketImpl::acceptSSL()`
`104`	`104`	`void SecureSocketImpl::connect(const SocketAddress& address, bool performHandshake)`
`105`	`105`	`{`
`106`	`106`	`if (_pSSL) reset();`
`107`		`-`
	`107`	`+`
`108`	`108`	`poco_assert (!_pSSL);`
`109`	`109`
`110`	`110`	`_pSocket->connect(address);`
`@@ -115,7 +115,7 @@ void SecureSocketImpl::connect(const SocketAddress& address, bool performHandsha`
`115`	`115`	`void SecureSocketImpl::connect(const SocketAddress& address, const Poco::Timespan& timeout, bool performHandshake)`
`116`	`116`	`{`
`117`	`117`	`if (_pSSL) reset();`
`118`		`-`
	`118`	`+`
`119`	`119`	`poco_assert (!_pSSL);`
`120`	`120`
`121`	`121`	`_pSocket->connect(address, timeout);`
`@@ -125,14 +125,14 @@ void SecureSocketImpl::connect(const SocketAddress& address, const Poco::Timespa`
`125`	`125`	`_pSocket->setSendTimeout(timeout);`
`126`	`126`	`connectSSL(performHandshake);`
`127`	`127`	`_pSocket->setReceiveTimeout(receiveTimeout);`
`128`		`- _pSocket->setSendTimeout(sendTimeout);`
	`128`	`+ _pSocket->setSendTimeout(sendTimeout);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`
`132`	`132`	`void SecureSocketImpl::connectNB(const SocketAddress& address)`
`133`	`133`	`{`
`134`	`134`	`if (_pSSL) reset();`
`135`		`-`
	`135`	`+`
`136`	`136`	`poco_assert (!_pSSL);`
`137`	`137`
`138`	`138`	`_pSocket->connectNB(address);`
`@@ -144,7 +144,7 @@ void SecureSocketImpl::connectSSL(bool performHandshake)`
`144`	`144`	`{`
`145`	`145`	`poco_assert (!_pSSL);`
`146`	`146`	`poco_assert (_pSocket->initialized());`
`147`		`-`
	`147`	`+`
`148`	`148`	`BIO* pBIO = BIO_new(BIO_s_socket());`
`149`	`149`	`if (!pBIO) throw SSLException("Cannot create SSL BIO object");`
`150`	`150`	`BIO_set_fd(pBIO, static_cast<int>(_pSocket->sockfd()), BIO_NOCLOSE);`
`@@ -156,7 +156,7 @@ void SecureSocketImpl::connectSSL(bool performHandshake)`
`156`	`156`	`throw SSLException("Cannot create SSL object");`
`157`	`157`	`}`
`158`	`158`	`SSL_set_bio(_pSSL, pBIO, pBIO);`
`159`		`-`
	`159`	`+`
`160`	`160`	`#if OPENSSL_VERSION_NUMBER >= 0x0908060L && !defined(OPENSSL_NO_TLSEXT)`
`161`	`161`	`if (!_peerHostName.empty())`
`162`	`162`	`{`
`@@ -168,7 +168,7 @@ void SecureSocketImpl::connectSSL(bool performHandshake)`
`168`	`168`	`{`
`169`	`169`	`SSL_set_session(_pSSL, _pSession->sslSession());`
`170`	`170`	`}`
`171`		`-`
	`171`	`+`
`172`	`172`	`try`
`173`	`173`	`{`
`174`	`174`	`if (performHandshake && _pSocket->getBlocking())`
`@@ -199,7 +199,7 @@ void SecureSocketImpl::bind(const SocketAddress& address, bool reuseAddress)`
`199`	`199`	`_pSocket->bind(address, reuseAddress);`
`200`	`200`	`}`
`201`	`201`
`202`		`-`
	`202`	`+`
`203`	`203`	`void SecureSocketImpl::listen(int backlog)`
`204`	`204`	`{`
`205`	`205`	`poco_check_ptr (_pSocket);`
`@@ -347,9 +347,9 @@ int SecureSocketImpl::completeHandshake()`
`347`	`347`	`void SecureSocketImpl::verifyPeerCertificate()`
`348`	`348`	`{`
`349`	`349`	`if (_peerHostName.empty())`
`350`		`- _peerHostName = _pSocket->peerAddress().host().toString();`
`351`		`-`
`352`		`- verifyPeerCertificate(_peerHostName);`
	`350`	`+ verifyPeerCertificate(_pSocket->peerAddress().host().toString());`
	`351`	`+ else`
	`352`	`+ verifyPeerCertificate(_peerHostName);`
`353`	`353`	`}`
`354`	`354`
`355`	`355`
`@@ -546,7 +546,7 @@ Session::Ptr SecureSocketImpl::currentSession()`
`546`	`546`	`return 0;`
`547`	`547`	`}`
`548`	`548`
`549`		`-`
	`549`	`+`
`550`	`550`	`void SecureSocketImpl::useSession(Session::Ptr pSession)`
`551`	`551`	`{`
`552`	`552`	`_pSession = pSession;`