---------------------
PatchSet 1915 
Date: 2005/10/01 04:57:08
Author: dwsquid
Branch: squid3-icap
Tag: (none) 
Log:
We no longer need icapMethod()

Members: 
	src/ICAPXaction.cc:1.1.2.38->1.1.2.39 
	src/ICAPXaction.h:1.1.2.20->1.1.2.21 

Index: squid3/src/ICAPXaction.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPXaction.cc,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -r1.1.2.38 -r1.1.2.39
--- squid3/src/ICAPXaction.cc	1 Oct 2005 04:30:59 -0000	1.1.2.38
+++ squid3/src/ICAPXaction.cc	1 Oct 2005 04:57:08 -0000	1.1.2.39
@@ -665,26 +665,9 @@
     }
 }
 
-ICAPServiceRep::IcapMethod
-ICAPXaction::icapMethod() const
-{
-    const HttpMsg *head = virgin->data->header;
-    assert(head);
-
-    if (dynamic_cast<const HttpReply*>(head))
-        return ICAPServiceRep::respmod;
-
-    if (dynamic_cast<const HttpRequest*>(head))
-        return ICAPServiceRep::reqmod;
-
-    assert(false);
-
-    return ICAPServiceRep::no_icap_method;
-}
-
 void ICAPXaction::makeRequestHeaders(MemBuf *buf)
 {
-    ICAPServiceRep::IcapMethod m = icapMethod();
+    ICAPServiceRep::IcapMethod m = service->method;
     buf->Printf("%s %s ICAP/1.0\r\n", service->methodStr(), service->uri.buf());
     buf->Printf("Host: %s:%d\r\n", service->host.buf(), service->port);
     buf->Printf("Encapsulated:");
Index: squid3/src/ICAPXaction.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPXaction.h,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- squid3/src/ICAPXaction.h	1 Oct 2005 04:30:59 -0000	1.1.2.20
+++ squid3/src/ICAPXaction.h	1 Oct 2005 04:57:08 -0000	1.1.2.21
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPXaction.h,v 1.1.2.20 2005/10/01 04:30:59 dwsquid Exp $
+ * $Id: ICAPXaction.h,v 1.1.2.21 2005/10/01 04:57:08 dwsquid Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -116,10 +116,6 @@
     void callEnd(const char *method);
 
 private:
-    ICAPServiceRep::IcapMethod icapMethod() const;
-
-
-private:
     // returns a temporary string depicting transaction status, for debugging
     const char *status() const;