]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
reverting vetoed commit r371227
authorBrian Pane <brianp@apache.org>
Sun, 22 Jan 2006 23:06:24 +0000 (23:06 +0000)
committerBrian Pane <brianp@apache.org>
Sun, 22 Jan 2006 23:06:24 +0000 (23:06 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371415 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_io.c

index 2733c70c272a8525dd016ffe5bd488a81fbd1cbb..0093e3b95eac65bb2f1227df6b781467219f1933 100644 (file)
@@ -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;