svn commit: r1712444 - /tomcat/native/trunk/native/src/sslnetwork.c

[markt]

Author: markt
Date: Tue Nov  3 23:43:10 2015
New Revision: 1712444

URL: http://svn.apache.org/viewvc?rev=1712444&view=rev
Log:
The changes in r1712437 made this code unnecessary

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=1712444&r1=1712443&r2=1712444&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Nov  3 23:43:10 2015
@@ -395,7 +395,6 @@ ssl_socket_recv(apr_socket_t *sock, char
     int s, i, rd = (int)(*len);
     apr_status_t rv;
     apr_interval_time_t timeout;
-    apr_int32_t nb;
 
     *len = 0;
     if (con->reneg_state == RENEG_ABORT) {
@@ -403,7 +402,6 @@ ssl_socket_recv(apr_socket_t *sock, char
         return APR_ECONNABORTED;
     }
     apr_socket_timeout_get(con->sock, &timeout);
-    apr_socket_opt_get(con->sock, APR_SO_NONBLOCK, &nb);
     for (;;) {
         ERR_clear_error();
         if ((s = SSL_read(con->ssl, buf, rd)) <= 0) {
@@ -419,15 +417,6 @@ ssl_socket_recv(apr_socket_t *sock, char
             switch (i) {
                 case SSL_ERROR_WANT_READ:
                 case SSL_ERROR_WANT_WRITE:
-                    if (nb) {
-                        if (i == SSL_ERROR_WANT_READ) {
-                            *len = 0;
-                            return APR_SUCCESS;
-                        } else {
-                            con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
-                            return rv;
-                        }
-                    }
                     if ((rv = wait_for_io_or_timeout(con, i, timeout)) != 
APR_SUCCESS) {
                         con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
                         return rv;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org