---------------------
PatchSet 2975 
Date: 2001/09/08 15:43:01
Author: serassio
Branch: nt-2_3
Tag: (none) 
Log:
Applied patch for Bugzilla #162 & #195

Members: 
	src/cache_cf.c:1.1.1.3.4.4.2.4->1.1.1.3.4.4.2.5 
	src/http.c:1.1.1.3.4.3.2.2->1.1.1.3.4.3.2.3 

Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_cf.c,v
retrieving revision 1.1.1.3.4.4.2.4
retrieving revision 1.1.1.3.4.4.2.5
diff -u -r1.1.1.3.4.4.2.4 -r1.1.1.3.4.4.2.5
--- squid/src/cache_cf.c	8 Sep 2001 09:36:19 -0000	1.1.1.3.4.4.2.4
+++ squid/src/cache_cf.c	8 Sep 2001 15:43:01 -0000	1.1.1.3.4.4.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.c,v 1.1.1.3.4.4.2.4 2001/09/08 09:36:19 serassio Exp $
+ * $Id: cache_cf.c,v 1.1.1.3.4.4.2.5 2001/09/08 15:43:01 serassio Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -651,10 +651,12 @@
 	free_delay_pool_count(cfg);
     }
     parse_ushort(&cfg->pools);
-    delayInitDelayData(cfg->pools);
-    cfg->class = xcalloc(cfg->pools, sizeof(u_char));
-    cfg->rates = xcalloc(cfg->pools, sizeof(delaySpecSet *));
-    cfg->access = xcalloc(cfg->pools, sizeof(acl_access *));
+    if (cfg->pools) {
+	delayInitDelayData(cfg->pools);
+	cfg->class = xcalloc(cfg->pools, sizeof(u_char));
+	cfg->rates = xcalloc(cfg->pools, sizeof(delaySpecSet *));
+	cfg->access = xcalloc(cfg->pools, sizeof(acl_access *));
+    }
 }
 
 static void
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.1.1.3.4.3.2.2
retrieving revision 1.1.1.3.4.3.2.3
diff -u -r1.1.1.3.4.3.2.2 -r1.1.1.3.4.3.2.3
--- squid/src/http.c	29 Jul 2001 09:10:28 -0000	1.1.1.3.4.3.2.2
+++ squid/src/http.c	8 Sep 2001 15:43:02 -0000	1.1.1.3.4.3.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.c,v 1.1.1.3.4.3.2.2 2001/07/29 09:10:28 serassio Exp $
+ * $Id: http.c,v 1.1.1.3.4.3.2.3 2001/09/08 15:43:02 serassio Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -521,6 +521,7 @@
 	} else if (entry->mem_obj->inmem_hi == 0) {
 	    ErrorState *err;
 	    err = errorCon(ERR_READ_ERROR, HTTP_INTERNAL_SERVER_ERROR);
+	    err->request = requestLink((request_t *) request);
 	    err->xerrno = errno;
 	    fwdFail(httpState->fwd, err);
 	    comm_close(fd);
@@ -531,6 +532,7 @@
 	ErrorState *err;
 	err = errorCon(ERR_ZERO_SIZE_OBJECT, HTTP_SERVICE_UNAVAILABLE);
 	err->xerrno = errno;
+	err->request = requestLink((request_t *) request);
 	fwdFail(httpState->fwd, err);
 	httpState->eof = 1;
 	comm_close(fd);