Fubar. remove r9617

diff --git a/squid3.dox b/squid3.dox
index 41f1753dad23c1022cbb7b9b7a9aecca066a80a5..7da906f020d61eaa013598a8da829552cae01ad3 100644 (file)
--- a/squid3.dox
+++ b/squid3.dox
@@ -470,7 +470,7 @@ SHOW_USED_FILES        = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES       = YES
+SHOW_DIRECTORIES       = NO
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
 # This will remove the Files entry from the Quick Index and from the 

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index ad6cf3c9034b6cb5b1dc8ef01a543c9f55e4ab54..b502f7be4872cf799ddf832e2adb36eabd25d97d 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -89,10 +89,6 @@ ACLMethodData::parse()
 
     for (Tail = &values; *Tail; Tail = &((*Tail)->next));
     while ((t = strtokFile())) {
-        if(strcmp(t, "PURGE") == 0) {
-            // we need to use PURGE, can't just blanket-deny it.
-            Config2.onoff.enable_purge = 1;
-        }
         CbDataList<HttpRequestMethod> *q = new CbDataList<HttpRequestMethod> (HttpRequestMethod(t, NULL));
         *(Tail) = q;
         Tail = &q->next;

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 4b7c78b732323641b74c2712dafd748b2afb5f0c..b2c60bb37cb68977d8b346a3d81ee053de80b867 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -611,10 +611,8 @@ configDoConfigure(void)
 
 #endif
 
-    // we have reconfigured and in the process disabled any need for PURGE.
-    // turn it off now.
-    if(Config2.onoff.enable_purge == 2)
-        Config2.onoff.enable_purge = 0;
+    if (aclPurgeMethodInUse(Config.accessList.http))
+        Config2.onoff.enable_purge = 1;
 
     Config2.onoff.mangle_request_headers = httpReqHdrManglersConfigured();
 

diff --git a/src/ip/IpIntercept.cc b/src/ip/IpIntercept.cc
index a7ff6fe40cd1e4527bdd7f7787142be888d7f654..1ff03d4e7f38e1e58b1e42f710f6192e6a8bc70f 100644 (file)
--- a/src/ip/IpIntercept.cc
+++ b/src/ip/IpIntercept.cc
@@ -378,11 +378,6 @@ IpIntercept::NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IpAdd
     debugs(89, 5, HERE << "address BEGIN: me= " << me << ", client= " << client <<
            ", dst= " << dst << ", peer= " << peer);
 
-    /* NP: try TPROXY first, its much quieter than NAT when non-matching */
-    if (transparent_active) {
-        if ( NetfilterTransparent(fd, me, dst, silent) == 0) return 0;
-    }
-
     if (intercept_active) {
         /* NAT methods that use sock-opts to return client address */
         if ( NetfilterInterception(fd, me, client, silent) == 0) return 0;
@@ -392,6 +387,9 @@ IpIntercept::NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IpAdd
         if ( PfInterception(fd, me, client, dst, silent) == 0) return 0;
         if ( IpfInterception(fd, me, client, dst, silent) == 0) return 0;
     }
+    if (transparent_active) {
+        if ( NetfilterTransparent(fd, me, dst, silent) == 0) return 0;
+    }
 
 #else /* none of the transparent options configured */
     debugs(89, DBG_IMPORTANT, "WARNING: transparent proxying not supported");

diff --git a/src/main.cc b/src/main.cc
index 22add79f94a3bc41de198fd8ea95ccb55decb44e..e9f1bfa1971536bd471feba48291e72d6405d58f 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -711,13 +711,7 @@ mainReconfigureFinish(void *)
 
     errorClean();
     enter_suid();              /* root to read config file */
-
-    // we may have disabled the need for PURGE
-    if(Config2.onoff.enable_purge)
-        Config2.onoff.enable_purge = 2;
-
     parseConfigFile(ConfigFile);
-
     setUmask(Config.umask);
     Mem::Report();
     setEffectiveUser();