---------------------
PatchSet 6682 
Date: 2008/02/03 11:22:41
Author: amosjeffries
Branch: ayjwork
Tag: (none) 
Log:
Experiment: dropping extension_methods option

Members: 
	src/HttpRequestMethod.cc:1.2.4.4->1.2.4.5 
	src/HttpRequestMethod.h:1.2.4.4->1.2.4.5 
	src/cf.data.pre:1.116.2.12->1.116.2.13 

Index: squid3/src/HttpRequestMethod.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/HttpRequestMethod.cc,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -r1.2.4.4 -r1.2.4.5
--- squid3/src/HttpRequestMethod.cc	3 Feb 2008 04:38:59 -0000	1.2.4.4
+++ squid3/src/HttpRequestMethod.cc	3 Feb 2008 11:22:41 -0000	1.2.4.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpRequestMethod.cc,v 1.2.4.4 2008/02/03 04:38:59 amosjeffries Exp $
+ * $Id: HttpRequestMethod.cc,v 1.2.4.5 2008/02/03 11:22:41 amosjeffries Exp $
  *
  * DEBUG: section 73    HTTP Request
  * AUTHOR: Duane Wessels
@@ -70,26 +70,6 @@
         "MKACTIVITY",
         "CHECKOUT",
         "MERGE",
-        "%EXT00",
-        "%EXT01",
-        "%EXT02",
-        "%EXT03",
-        "%EXT04",
-        "%EXT05",
-        "%EXT06",
-        "%EXT07",
-        "%EXT08",
-        "%EXT09",
-        "%EXT10",
-        "%EXT11",
-        "%EXT12",
-        "%EXT13",
-        "%EXT14",
-        "%EXT15",
-        "%EXT16",
-        "%EXT17",
-        "%EXT18",
-        "%EXT19",
         "ERROR"
     };
 
@@ -148,6 +128,7 @@
 void
 HttpRequestMethod::AddExtension(const char *mstr)
 {
+#if 0 /* obsolete now that we have METHOD_OTHER always enabled */
     _method_t method = METHOD_NONE;
 
     for (++method; method < METHOD_ENUM_END; ++method) {
@@ -168,11 +149,13 @@
     }
 
     debugs(23, 1, "WARNING: Could not add new extension method '" << mstr << "' due to lack of array space");
+#endif
 }
 
 void
 HttpRequestMethod::Configure(SquidConfig &Config)
 {
+#if 0 /* extension methods obsolete now that we have METHOD_OTHER always enabled */
     wordlist *w = Config.ext_methods;
 
     while (w) {
@@ -185,6 +168,7 @@
 
         w = w->next;
     }
+#endif
 }
 
 char const* 
Index: squid3/src/HttpRequestMethod.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/HttpRequestMethod.h,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -r1.2.4.4 -r1.2.4.5
--- squid3/src/HttpRequestMethod.h	3 Feb 2008 04:38:59 -0000	1.2.4.4
+++ squid3/src/HttpRequestMethod.h	3 Feb 2008 11:22:41 -0000	1.2.4.5
@@ -1,5 +1,5 @@
 /*
- * $Id: HttpRequestMethod.h,v 1.2.4.4 2008/02/03 04:38:59 amosjeffries Exp $
+ * $Id: HttpRequestMethod.h,v 1.2.4.5 2008/02/03 11:22:41 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -67,26 +67,6 @@
     METHOD_MKACTIVITY,
     METHOD_CHECKOUT,
     METHOD_MERGE,
-    METHOD_EXT00,
-    METHOD_EXT01,
-    METHOD_EXT02,
-    METHOD_EXT03,
-    METHOD_EXT04,
-    METHOD_EXT05,
-    METHOD_EXT06,
-    METHOD_EXT07,
-    METHOD_EXT08,
-    METHOD_EXT09,
-    METHOD_EXT10,
-    METHOD_EXT11,
-    METHOD_EXT12,
-    METHOD_EXT13,
-    METHOD_EXT14,
-    METHOD_EXT15,
-    METHOD_EXT16,
-    METHOD_EXT17,
-    METHOD_EXT18,
-    METHOD_EXT19,
     METHOD_OTHER,
     METHOD_ENUM_END  // MUST be last, (yuck) this is used as an array-initialization index constant!
 };
Index: squid3/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cf.data.pre,v
retrieving revision 1.116.2.12
retrieving revision 1.116.2.13
diff -u -r1.116.2.12 -r1.116.2.13
--- squid3/src/cf.data.pre	22 Jan 2008 22:34:21 -0000	1.116.2.12
+++ squid3/src/cf.data.pre	3 Feb 2008 11:22:41 -0000	1.116.2.13
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.116.2.12 2008/01/22 22:34:21 amosjeffries Exp $
+# $Id: cf.data.pre,v 1.116.2.13 2008/02/03 11:22:41 amosjeffries Exp $
 #
 # SQUID Web Proxy Cache		http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -2914,15 +2914,6 @@
 	objects not intended for caching to get cached.
 DOC_END
 
-NAME: extension_methods
-TYPE: wordlist
-LOC: Config.ext_methods
-DEFAULT: none
-DOC_START
-	Squid only knows about standardized HTTP request methods.
-	You can add up to 20 additional "extension" methods here.
-DOC_END
-
 NAME: request_entities
 TYPE: onoff
 LOC: Config.onoff.request_entities