Browse Source

testReuseSession: remove bad checks for session reuse

Günter Obiltschnig 4 years ago
parent
commit
746a69dc09

+ 3 - 3
NetSSL_OpenSSL/src/HTTPSClientSession.cpp

@@ -140,7 +140,7 @@ void HTTPSClientSession::connect(const SocketAddress& address)
 	if (getProxyHost().empty() || bypassProxy())
 	{
 		SecureStreamSocket sss(socket());
-		if (sss.getPeerHostName().empty()) 
+		if (sss.getPeerHostName().empty())
 		{
 			sss.setPeerHostName(getHost());
 		}
@@ -172,8 +172,8 @@ int HTTPSClientSession::read(char* buffer, std::streamsize length)
 	try
 	{
 		return HTTPSession::read(buffer, length);
-	} 
-	catch(SSLConnectionUnexpectedlyClosedException&)
+	}
+	catch (SSLConnectionUnexpectedlyClosedException&)
 	{
 		return 0;
 	}

+ 0 - 9
NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp

@@ -371,7 +371,6 @@ void HTTPSClientSessionTest::testCachedSession()
 	HTTPSClientSession s2("127.0.0.1", srv.port(), pClientContext, pSession1);
 	HTTPRequest request2(HTTPRequest::HTTP_GET, "/small");
 	s2.sendRequest(request2);
-	Session::Ptr pSession2 = s2.sslSession();
 	HTTPResponse response2;
 	std::istream& rs2 = s2.receiveResponse(response2);
 	assertTrue (response2.getContentLength() == HTTPSTestServer::SMALL_BODY.length());
@@ -380,11 +379,8 @@ void HTTPSClientSessionTest::testCachedSession()
 	StreamCopier::copyStream(rs2, ostr2);
 	assertTrue (ostr2.str() == HTTPSTestServer::SMALL_BODY);
 
-	assertTrue (pSession1 == pSession2);
-
 	HTTPRequest request3(HTTPRequest::HTTP_GET, "/small");
 	s2.sendRequest(request3);
-	Session::Ptr pSession3 = s2.sslSession();
 	HTTPResponse response3;
 	std::istream& rs3 = s2.receiveResponse(response3);
 	assertTrue (response3.getContentLength() == HTTPSTestServer::SMALL_BODY.length());
@@ -393,14 +389,11 @@ void HTTPSClientSessionTest::testCachedSession()
 	StreamCopier::copyStream(rs3, ostr3);
 	assertTrue (ostr3.str() == HTTPSTestServer::SMALL_BODY);
 
-	assertTrue (pSession1 == pSession3);
-
 	Thread::sleep(15000); // wait for session to expire
 	pServerContext->flushSessionCache();
 
 	HTTPRequest request4(HTTPRequest::HTTP_GET, "/small");
 	s2.sendRequest(request4);
-	Session::Ptr pSession4 = s2.sslSession();
 	HTTPResponse response4;
 	std::istream& rs4 = s2.receiveResponse(response4);
 	assertTrue (response4.getContentLength() == HTTPSTestServer::SMALL_BODY.length());
@@ -408,8 +401,6 @@ void HTTPSClientSessionTest::testCachedSession()
 	std::ostringstream ostr4;
 	StreamCopier::copyStream(rs4, ostr4);
 	assertTrue (ostr4.str() == HTTPSTestServer::SMALL_BODY);
-
-	assertTrue (pSession1 != pSession4);
 }