Commit aeb51a9e authored by Brian Pane's avatar Brian Pane
Browse files

reverting vetoed commit r371227 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371415 13f79535-47bb-0310-9956-ffa450edef68
parent 833fe4ee

modules/ssl/ssl_engine_io.c

+0 −6
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ static int bio_filter_in_read(BIO *bio, char *in, int inlen) 
    apr_read_type_e block = inctx->block;

    SSLConnRec *sslconn = myConnConfig(inctx->f->c);



    fprintf(stderr, "block mode is %d\n", (block == APR_BLOCK_READ ? 1 : 0));

    inctx->rc = APR_SUCCESS;



    /* OpenSSL catches this case, so should we. */
@@ -1282,11 +1281,6 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f, 
        return APR_ENOTIMPL;

    }



    /* XXX: for now, do blocking reads even if running in

     * an asynchronous httpd.  mod_ssl will need some changes

     * to deal with EAGAIN properly.

     */

    block = APR_BLOCK_READ;

    inctx->mode = mode;

    inctx->block = block;