svn commit: r1705820 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

[yl...@apache.org]

Author: ylavic
Date: Tue Sep 29 09:17:52 2015
New Revision: 1705820

URL: http://svn.apache.org/viewvc?rev=1705820&view=rev
Log:
Revert r1705236, better solution to come.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=1705820&r1=1705819&r2=1705820&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Tue Sep 29 09:17:52 2015
@@ -472,12 +472,9 @@ static int bio_filter_in_read(BIO *bio,
      * 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;