---------------------
PatchSet 5932 
Date: 2003/09/14 00:53:21
Author: dwsquid
Branch: icap-2_5
Tag: (none) 
Log:
*** empty log message ***

Members: 
	src/cache_cf.c:1.38.6.11.2.5->1.38.6.11.2.6 

Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_cf.c,v
retrieving revision 1.38.6.11.2.5
retrieving revision 1.38.6.11.2.6
diff -u -r1.38.6.11.2.5 -r1.38.6.11.2.6
--- squid/src/cache_cf.c	9 Jul 2003 19:24:45 -0000	1.38.6.11.2.5
+++ squid/src/cache_cf.c	14 Sep 2003 00:53:21 -0000	1.38.6.11.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.c,v 1.38.6.11.2.5 2003/07/09 19:24:45 hno Exp $
+ * $Id: cache_cf.c,v 1.38.6.11.2.6 2003/09/14 00:53:21 dwsquid Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -2135,7 +2135,6 @@
     while (cfg->service_head) {
 	icap_service *current_node = cfg->service_head;
 	cfg->service_head = current_node->next;
-	current_node = cfg->service_head;
 	icap_service_destroy(current_node);
 	cbdataFree(current_node);
     }
@@ -2157,11 +2156,16 @@
 	debug(3, 0) ("icap_service_process (line %d): wrong service type %s\n", config_lineno, s->type_name);
 	return 0;
     }
-    if (s->type == ICAP_SERVICE_REQMOD_PRECACHE || s->type == ICAP_SERVICE_REQMOD_POSTCACHE) {
+    if (s->type == ICAP_SERVICE_REQMOD_PRECACHE)
 	s->method = ICAP_METHOD_REQMOD;
-    } else if (s->type == ICAP_SERVICE_RESPMOD_PRECACHE || s->type == ICAP_SERVICE_RESPMOD_POSTCACHE) {
+    if (s->type == ICAP_SERVICE_REQMOD_PRECACHE)
+	s->method = ICAP_METHOD_REQMOD;
+    else if (s->type == ICAP_SERVICE_REQMOD_POSTCACHE)
+	s->method = ICAP_METHOD_REQMOD;
+    else if (s->type == ICAP_SERVICE_RESPMOD_PRECACHE)
+	s->method = ICAP_METHOD_RESPMOD;
+    else if (s->type == ICAP_SERVICE_RESPMOD_POSTCACHE)
 	s->method = ICAP_METHOD_RESPMOD;
-    }
     debug(3, 5) ("icap_service_process (line %d): type=%s\n", config_lineno, icapServiceToStr(s->type));
     if (strncmp(s->uri, "icap://", 7) != 0) {
 	debug(3, 0) ("icap_service_process (line %d): wrong uri: %s\n", config_lineno, s->uri);