Author: billbarker
Date: Sun Nov 29 00:12:12 2015
New Revision: 1717015
URL: http://svn.apache.org/viewvc?rev=1717015&view=rev
Log:
Doing a read after renegotiate appears to be unnecessary in OpenSSL 1.0.2 and
higher
Modified:
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=1717015&r1=1717014&r2=1717015&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Sun Nov 29 00:12:12
2015
@@ -645,7 +645,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
#endif
return APR_EGENERAL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10002000L
#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
SSL_set_state(con->ssl, SSL_ST_ACCEPT);
#else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
