Author: markt
Date: Tue Nov 3 23:34:57 2015
New Revision: 1712443
URL: http://svn.apache.org/viewvc?rev=1712443&view=rev
Log:
Forward port of r1456353 (mturk) from 1.1.x
Prevent infinite loop for SSL_ERROR_SSL
Modified:
tomcat/native/trunk/native/src/sslnetwork.c
Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712443&r1=1712442&r2=1712443&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Nov 3 23:34:57 2015
@@ -524,6 +524,9 @@ ssl_socket_send(apr_socket_t *sock, cons
con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return rv;
break;
+ case SSL_ERROR_SSL:
+ /* Probably caused by buffer missmatch */
+ rv = APR_EINVAL;
case SSL_ERROR_ZERO_RETURN:
if (s == 0) {
con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
