From ede3296d11d241b1a7dcad6dff72b42a1ef841c1 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 7 Apr 2009 01:22:42 +1200 Subject: [PATCH] Fubar. remove r9617 --- squid3.dox | 2 +- src/acl/MethodData.cc | 4 ---- src/cache_cf.cc | 6 ++---- src/ip/IpIntercept.cc | 8 +++----- src/main.cc | 6 ------ 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/squid3.dox b/squid3.dox index 41f1753dad..7da906f020 100644 --- 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 ad6cf3c903..b502f7be48 100644 --- 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 *q = new CbDataList (HttpRequestMethod(t, NULL)); *(Tail) = q; Tail = &q->next; diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 4b7c78b732..b2c60bb37c 100644 --- 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 a7ff6fe40c..1ff03d4e7f 100644 --- 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 22add79f94..e9f1bfa197 100644 --- 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(); -- 2.47.2