[jbossnative-commits] JBoss Native SVN: r2653 - trunk/build/patch.

Author: jfrederic.clere(a)jboss.com Date: 2010-03-29 04:32:54 -0400 (Mon, 29 Mar 2010) New Revision: 2653 Added: trunk/build/patch/tomcat-native-1.1.20.patch Log: Patch for SSL test problems. Added: trunk/build/patch/tomcat-native-1.1.20.patch =================================================================== --- trunk/build/patch/tomcat-native-1.1.20.patch (rev 0) +++ trunk/build/patch/tomcat-native-1.1.20.patch 2010-03-29 08:32:54 UTC (rev 2653) @@ -0,0 +1,30 @@ +--- native/src/sslnetwork.c (original) ++++ native/src/sslnetwork.c Fri Mar 26 09:05:43 2010 +@@ -448,12 +448,14 @@ ssl_socket_send(apr_socket_t *sock, cons + tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock; + int s, i, wr = (int)(*len); + apr_status_t rv = APR_SUCCESS; ++ apr_int32_t nb; + + if (con->reneg_state == RENEG_ABORT) { + *len = 0; + con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN; + return APR_ECONNABORTED; + } ++ apr_socket_opt_get(con->sock, APR_SO_NONBLOCK, &nb); + for (;;) { + if ((s = SSL_write(con->ssl, buf, wr)) <= 0) { + apr_status_t os = apr_get_netos_error(); +@@ -469,6 +471,10 @@ ssl_socket_send(apr_socket_t *sock, cons + break; + case SSL_ERROR_WANT_READ: + case SSL_ERROR_WANT_WRITE: ++ if (nb && i == SSL_ERROR_WANT_WRITE) { ++ *len = 0; ++ return APR_SUCCESS; ++ } + if ((rv = wait_for_io_or_timeout(con, i)) != APR_SUCCESS) { + con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN; + return rv; + +