From: Alex Rousskov Date: Sat, 5 Apr 2008 05:16:03 +0000 (-0600) Subject: Polished for trunk merge X-Git-Tag: SQUID_3_1_0_1~49^2~302^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68854a4187486aa76447da8a8ff7768034fa6de3;p=thirdparty%2Fsquid.git Polished for trunk merge --- diff --git a/.bzrignore b/.bzrignore index 4bad7a94e2..73d0265407 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,49 +1,55 @@ -autom4te.cache -config.log -config.status -autom4te* -stamp-h1 -libtool -configure.lineno -cfgaux -*.patch -icons/*.gif -tags -tmp -.deps -.libs -.dirstamp *.la *.lo *.loT +*.patch +*/*/*/Makefile +*/Makefile */globals.cc +.deps +.dirstamp +.libs +Makefile Makefile.in aclocal.m4 -install-sh -missing +autoconf.h.in +autom4te* +autom4te.cache +cfgaux +config.h.in +config.log +config.status configure +configure.lineno depcomp -lib/libLtdl -lib/**/config.h -Makefile -*/Makefile -*/*/*/Makefile -scr/**/Makefile -lib/**/Makefile +doc/*.8 +doc/Programming-Guide/html +helpers/**/*_auth +helpers/*/*/Makefile +helpers/*/Makefile helpers/basic_auth/**/Makefile helpers/digest_auth/**/Makefile helpers/external_acl/**/Makefile -helpers/ntlm_auth/**/Makefile -helpers/negotiate_auth/Makefile -doc/*.8 -helpers/**/*_auth helpers/external_acl/ip_user/ip_user_check helpers/external_acl/session/squid_session helpers/external_acl/unix_group/squid_unix_group +helpers/negotiate_auth/Makefile +helpers/ntlm_auth/**/Makefile +icons/*.gif include/autoconf.h include/stamp-h1 +install-sh +lib/**/Makefile +lib/**/config.h +lib/libLtdl +libtool +missing +scr/**/Makefile +scripts/Makefile scripts/RunAccel scripts/RunCache +snmplib/Makefile +src/*/Makefile +src/DiskIO/DiskDaemon/diskd src/cf.data src/cf_gen src/cf_gen_defines.h @@ -55,18 +61,12 @@ src/squid.conf.default src/string_arrays.c src/ufsdump src/unlinkd -src/DiskIO/DiskDaemon/diskd -tools/cachemgr.cgi -tools/squidclient -config.h.in stamp-h.in -autoconf.h.in -testHeaders -doc/Programming-Guide/html -helpers/*/Makefile -helpers/*/*/Makefile -scripts/Makefile -snmplib/Makefile -src/*/Makefile +stamp-h1 +tags test-suite/Makefile +testHeaders +tmp tools/Makefile +tools/cachemgr.cgi +tools/squidclient diff --git a/Makefile.am b/Makefile.am index 4b58783d29..b3290881a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,11 +4,9 @@ # AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign - DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers test-suite tools SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers test-suite tools - DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` diff --git a/SPONSORS b/SPONSORS index 4f5376ec72..b99f5a0348 100644 --- a/SPONSORS +++ b/SPONSORS @@ -58,10 +58,6 @@ iiNet Ltd - http://www.iinet.net.au/ recently supplied equipment to help develop and test the WCCPv2 implementation in Squid-2.6 and Squid-3. -Barefruit - http://www.barefruit.com/ - - Barefruit has funded Squid3 development and maintenance, - with a focus on content adaptation (ICAP and eCAP) support. Kaspersky Lab - http://www.kaspersky.com/ Kaspersky Lab funded initial development of ICAP support in @@ -70,7 +66,7 @@ Kaspersky Lab - http://www.kaspersky.com/ Barefruit - http://www.barefruit.com/ Barefruit has funded Squid3 development and maintenance, - with a focus on the ICAP client support. + with a focus on content adaptation (ICAP and eCAP) support. Palisade Systems - http://www.palisadesys.com/ diff --git a/src/ICAP/ICAPElements.cc b/src/ICAP/ICAPElements.cc index 7aa5968c25..8dad155cbf 100644 --- a/src/ICAP/ICAPElements.cc +++ b/src/ICAP/ICAPElements.cc @@ -1,55 +1,4 @@ #include "squid.h" #include "ICAPElements.h" -#if 0 /* XXX: remove this file */ - -const char *ICAP::crlf = "\r\n"; - - -const char * -ICAP::methodStr(ICAP::Method method) -{ - switch(method) { - - case ICAP::methodReqmod: - return "REQMOD"; - break; - - case ICAP::methodRespmod: - return "RESPMOD"; - break; - - case ICAP::methodOptions: - return "OPTIONS"; - break; - - default: - break; - } - - return "NONE"; -} - - -const char * -ICAP::vectPointStr(ICAP::VectPoint point) -{ - switch(point) { - - case ICAP::pointPreCache: - return "PRECACHE"; - break; - - case ICAP::pointPostCache: - return "POSTCACHE"; - break; - - default: - break; - } - - return "NONE"; -} - - -#endif /* if 0 -- remove this file */ +// TODO: remove this file? diff --git a/src/ICAP/ICAPServiceRep.cc b/src/ICAP/ICAPServiceRep.cc index c8de132f43..e63c81a5ea 100644 --- a/src/ICAP/ICAPServiceRep.cc +++ b/src/ICAP/ICAPServiceRep.cc @@ -358,7 +358,7 @@ void ICAPServiceRep::startGettingOptions() Must(!theOptionsFetcher); debugs(93,6, "ICAPService will get new options " << status()); - // XXX: check whether it is safe to use self as "this" + // XXX: second "this" is "self"; this works but may stop if API changes theOptionsFetcher = initiateAdaptation(new ICAPOptXactLauncher(this, this)); Must(theOptionsFetcher); // TODO: timeout in case ICAPOptXact never calls us back? diff --git a/src/adaptation/Initiate.cc b/src/adaptation/Initiate.cc index d9652aff50..57a4ca9ed2 100644 --- a/src/adaptation/Initiate.cc +++ b/src/adaptation/Initiate.cc @@ -1,5 +1,5 @@ /* - * DEBUG: section 93 ADAPT (RFC 3507) Client + * DEBUG: section 93 ICAP (RFC 3507) Client */ #include "squid.h"