]> granicus.if.org Git - apache/commitdiff
Revert r1705236, better solution to come.
authorYann Ylavic <ylavic@apache.org>
Tue, 29 Sep 2015 09:17:52 +0000 (09:17 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 29 Sep 2015 09:17:52 +0000 (09:17 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705820 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_io.c

index c23d9abab4e217fbb61b0db91ef6510560b3a8bb..6631bf1b190ba0cd046446c571692800c5baa96f 100644 (file)
@@ -472,12 +472,9 @@ static int bio_filter_in_read(BIO *bio, char *in, int inlen)
      * connection or for a proxy connection.  Calling _out_flush
      * should be very cheap in cases where it is unnecessary (and no
      * output is buffered) so the performance impact of doing it
-     * unconditionally should be minimal, but in non blocking mode
-     * where the caller may not expect the flush round trip (e.g.
-     * check_pipeline()'s speculative and non-blocking read).
+     * unconditionally should be minimal.
      */
-    if (block != APR_NONBLOCK_READ &&
-            bio_filter_out_flush(inctx->bio_out) < 0) {
+    if (bio_filter_out_flush(inctx->bio_out) < 0) {
         bio_filter_out_ctx_t *outctx = inctx->bio_out->ptr;
         inctx->rc = outctx->rc;
         return -1;