Received: by taz.hyperreal.com (8.8.4/V2.0) id IAA29455;
 Fri, 7 Feb 1997 08:13:44 -0800 (PST)
Received: from sierra.zyzzyva.com by taz.hyperreal.com (8.8.4/V2.0) with ESMTP
 id IAA29446; Fri, 7 Feb 1997 08:13:34 -0800 (PST)
Received: from sierra (localhost [127.0.0.1]) by sierra.zyzzyva.com
 (8.8.4/8.8.2) with ESMTP id KAA00774 for <new-httpd@apache.org>;
 Fri, 7 Feb 1997 10:14:16 -0600 (CST)
Message-Id: <199702071614.KAA00774@sierra.zyzzyva.com>
To: new-httpd@apache.org
Subject: [PATCH] fd leaks
X-uri: http://www.zyzzyva.com/
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Fri, 07 Feb 1997 10:14:16 -0600
From: Randy Terbush <randy@zyzzyva.com>
Sender: new-httpd-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

I saw reference by Dean of a patch for this, but I must have missed
it. Confusion?



===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.64
diff -c -r1.64 http_core.c
*** http_core.c	1997/02/03 02:42:57	1.64
--- http_core.c	1997/02/07 16:09:29
***************
*** 1288,1296 ****
      
  #ifdef __EMX__
      /* Need binary mode for OS/2 */
!     f = fopen (r->filename, "rb");
  #else
!     f = fopen (r->filename, "r");
  #endif
  
      if (f == NULL) {
--- 1288,1296 ----
      
  #ifdef __EMX__
      /* Need binary mode for OS/2 */
!     f = pfopen (r->pool, r->filename, "rb");
  #else
!     f = pfopen (r->pool, r->filename, "r");
  #endif
  
      if (f == NULL) {
***************
*** 1319,1325 ****
  	}
      }
  
-     fclose(f);
      return OK;
  }
  
--- 1319,1324 ----
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_asis.c,v
retrieving revision 1.10
diff -c -r1.10 mod_asis.c
*** mod_asis.c	1997/01/01 18:10:26	1.10
--- mod_asis.c	1997/02/07 16:08:22
***************
*** 69,75 ****
  	return NOT_FOUND;
      }
  	
!     f = fopen (r->filename, "r");
  
      if (f == NULL) {
          log_reason("file permissions deny server access", r->filename, r);
--- 69,75 ----
  	return NOT_FOUND;
      }
  	
!     f = pfopen (r->pool, r->filename, "r");
  
      if (f == NULL) {
          log_reason("file permissions deny server access", r->filename, r);
***************
*** 98,104 ****
      soft_timeout ("send", r);
      send_http_header (r);
      if (!r->header_only) send_fd (f, r);
-     fclose (f);
      return OK;
  }
  
--- 98,103 ----