From: Jeff Trawick <trawick@apache.org>
Date: Thu, 3 Oct 2002 18:15:34 +0000 (+0000)
Subject: Fix a problem with streaming script output and mod_cgid.  We have
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=156b9dd07005411dff57417dfb40a80bb16eda41;p=apache

Fix a problem with streaming script output and mod_cgid.  We have
to tell APR that the socket can be treated as a pipe so that the
apr_file_t is initialized properly.


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

diff --git a/CHANGES b/CHANGES
index 9902bca256..a447169537 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.44
 
+  *) Fix a problem with streaming script output and mod_cgid.
+     [Jeff Trawick]
+
   *) Add ap_register_provider/ap_lookup_provider API.
      [John K. Sterling <john@sterls.com>, Justin Erenkrantz]
 
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index fd43f5afb7..5f0ffdba0b 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1101,7 +1101,7 @@ static int cgid_handler(request_rec *r)
      * Note that this does not register a cleanup for the socket.  We did
      * that explicitly right after we created the socket.
      */
-    apr_os_file_put(&tempsock, &sd, 0, r->pool);
+    apr_os_pipe_put(&tempsock, &sd, r->pool);
 
     if ((argv0 = strrchr(r->filename, '/')) != NULL) 
         argv0++; 
@@ -1422,7 +1422,7 @@ static int include_cmd(include_ctx_t *ctx, apr_bucket_brigade **bb, char *comman
      * Note that this does not register a cleanup for the socket.  We did
      * that explicitly right after we created the socket.
      */
-    apr_os_file_put(&tempsock, &sd, 0, r->pool);
+    apr_os_pipe_put(&tempsock, &sd, r->pool);
 
     if ((retval = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR))) 
         return retval;