Commit 1d180b28 authored by Joe Orton's avatar Joe Orton
Browse files

Fix handling of non-blocking reads in mod_ssl (triggered by recent 

change to mod_proxy_http):

* modules/ssl/ssl_engine_io.c (bio_filter_in_read): Return an error if
the read would block so that the SSL_read() caller checks for
SSL_ERROR_WANT_READ, rather than 0, which is treated like EOF.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@105768 13f79535-47bb-0310-9956-ffa450edef68
parent 2f409024

ssl_engine_io.c

+5 −3
Original line number Diff line number Diff line
@@ -488,12 +488,14 @@ static int bio_filter_in_read(BIO *bio, char *in, int inlen) 
                                   AP_MODE_READBYTES, block, 

                                   inl);



        /* Not a problem, there was simply no data ready yet.

         */

        /* If the read returns EAGAIN or success with an empty

         * brigade, return an error after setting the retry flag;

         * SSL_read() will then return -1, and SSL_get_error() will

         * indicate SSL_ERROR_WANT_READ. */

        if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc)

               || (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) {

            BIO_set_retry_read(bio);

            return 0;

            return -1;

        }



        if (inctx->rc != APR_SUCCESS) {