You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2007/10/11 22:52:10 UTC

svn commit: r583947 - in /httpd/httpd/trunk: CHANGES modules/filters/mod_ext_filter.c

Author: covener
Date: Thu Oct 11 13:52:07 2007
New Revision: 583947

URL: http://svn.apache.org/viewvc?rev=583947&view=rev
Log:
revert r581660 , fixed instead in APR trunk/r583421 1.2.x/r583860


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/filters/mod_ext_filter.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=583947&r1=583946&r2=583947&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Oct 11 13:52:07 2007
@@ -13,10 +13,6 @@
      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]

Modified: httpd/httpd/trunk/modules/filters/mod_ext_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ext_filter.c?rev=583947&r1=583946&r2=583947&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ext_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_ext_filter.c Thu Oct 11 13:52:07 2007
@@ -485,14 +485,6 @@
         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