revert r581660 , fixed instead in APR trunk/r583421 1.2.x/r583860

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@583947 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index daa74d1ef7aa89391636285dc63a6969a51865fd..9060a512e0bd84af9a49fd4973652f84a02e39ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,10 +13,6 @@ Changes with Apache 2.3.0
      configurable in case something breaks on it.
      PR 16518 [Nick Kew]
 
-  *) mod_ext_filter: Prevent a hang on Windows when the filter
-     input data is pipelined. 
-     PR 29901 [Eric Covener]
-
   *) mod_deflate: Don't leave a strong ETag in place while transforming
      the entity.
      PR 39727 [Nick Kew]

diff --git a/modules/filters/mod_ext_filter.c b/modules/filters/mod_ext_filter.c
index e328ee478006a919a2cdc20ea7d1ab5ce521445c..78c9f90d5efd2a284ad93457f927b0b7b437c128 100644 (file)
--- a/modules/filters/mod_ext_filter.c
+++ b/modules/filters/mod_ext_filter.c
@@ -485,14 +485,6 @@ static apr_status_t init_ext_filter_process(ap_filter_t *f)
         return rc;
     }
 
-    rc = apr_file_pipe_timeout_set(ctx->proc->out, 0);
-    if (rc != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, f->r,
-                      "couldn't set child stdin pipe timeout to 0 for filter %s ",
-                      ctx->filter->name);
-        return rc;
-    }
-
     apr_pool_note_subprocess(ctx->p, ctx->proc, APR_KILL_AFTER_TIMEOUT);
 
     /* We don't want the handle to the child's stdin inherited by any