Author: jfclere Date: Wed Dec 19 07:13:12 2007 New Revision: 605571 URL: http://svn.apache.org/viewvc?rev=605571&view=rev Log: Prevent returning APR_SUCCESS when there is something wrong in ssl layer. Fix for PR: 44087
Modified: tomcat/connectors/trunk/jni/native/src/sslnetwork.c Modified: tomcat/connectors/trunk/jni/native/src/sslnetwork.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/sslnetwork.c?rev=605571&r1=605570&r2=605571&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/native/src/sslnetwork.c (original) +++ tomcat/connectors/trunk/jni/native/src/sslnetwork.c Wed Dec 19 07:13:12 2007 @@ -333,7 +333,7 @@ if (!APR_STATUS_IS_EAGAIN(os) && !APR_STATUS_IS_EINTR(os)) { con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN; - return os; + return os == APR_SUCCESS ? APR_EGENERAL : os; } break; default: @@ -407,7 +407,7 @@ if (!APR_STATUS_IS_EAGAIN(os) && !APR_STATUS_IS_EINTR(os)) { con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN; - return os; + return os == APR_SUCCESS ? APR_EGENERAL : os; } break; default: @@ -458,7 +458,7 @@ if (!APR_STATUS_IS_EAGAIN(os) && !APR_STATUS_IS_EINTR(os)) { con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN; - return os; + return os == APR_SUCCESS ? APR_EGENERAL : os; } break; default: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]