Received: (from majordom@localhost)
          by hyperreal.com (8.8.4/8.8.4)
	  id MAA02355; Wed, 16 Apr 1997 12:50:05 -0700 (PDT)
Received: (from dgaudet@localhost)
          by hyperreal.com (8.8.4/8.8.4)
	  id MAA02346 for apache-cvs; Wed, 16 Apr 1997 12:50:02 -0700 (PDT)
Date: Wed, 16 Apr 1997 12:50:02 -0700 (PDT)
From: Dean Gaudet <dgaudet@hyperreal.com>
Message-Id: <199704161950.MAA02346@hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src mod_cgi.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

dgaudet     97/04/16 12:50:02

  Modified:    src       mod_cgi.c
  Log:
  Close script_in before trying to eat up script_err to prevent a deadlock.
  
  Submitted by:	Ralf
  Reviewed by:	Roy, Dean
  
  Revision  Changes    Path
  1.38      +1 -2      apache/src/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -C3 -r1.37 -r1.38
  *** mod_cgi.c	1997/04/06 07:43:40	1.37
  --- mod_cgi.c	1997/04/16 19:49:59	1.38
  ***************
  *** 521,526 ****
  --- 521,527 ----
    	send_http_header(r);
    	if (!r->header_only)
    	    send_fd(script_in, r);
  + 	pfclose (r->main ? r->main->pool : r->pool, script_in);
    
    	/* Soak up stderr */
    	soft_timeout("soaking script stderr", r);
  ***************
  *** 528,535 ****
    	       !r->connection->aborted)
    	    continue;
    	kill_timeout(r);
  - 
  - 	pfclose (r->main ? r->main->pool : r->pool, script_in);
    	pfclose (r->main ? r->main->pool : r->pool, script_err);
        }
    
  --- 529,534 ----