------------------------------------------------------------ revno: 12320 [merge] revision-id: kinkie@squid-cache.org-20120913113930-cyu8k2mwqhyfy55e parent: rousskov@measurement-factory.com-20120910230701-19qx7z06mbe9zw4c parent: kinkie@squid-cache.org-20120913065605-2thxe9qadhof8s3y committer: Francesco Chemolli branch nick: trunk timestamp: Thu 2012-09-13 13:39:30 +0200 message: Completed protos.h split and code refactoring Complete the task of splitting protos.h into more specific files Remove inclusion of protos.h from most files Clean CVS and arch file-tags up Rework some module initialization code so that it is the callee's task and not the callers' to do feature-enabling Added ssl-crtd option to the maximus build test Changed many functions' linkage type from C to C++ ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20120913113930-cyu8k2mwqhyfy55e # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 8bc7964e49338e3c445be1e0e71eb072ed61d853 # timestamp: 2012-09-13 11:53:24 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: rousskov@measurement-factory.com-20120910230701-\ # 19qx7z06mbe9zw4c # # Begin patch === modified file 'compat/assert.cc' --- compat/assert.cc 2012-01-20 18:55:04 +0000 +++ compat/assert.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Henrik Nordstrom * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'compat/assert.h' --- compat/assert.h 2010-11-21 04:40:05 +0000 +++ compat/assert.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Duane Wessels * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'compat/mswin.cc' --- compat/mswin.cc 2012-08-08 08:01:46 +0000 +++ compat/mswin.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * Windows support * AUTHOR: Guido Serassio * inspired by previous work by Romeo Anghelache & Eric Stern. === modified file 'compat/os/mswin.h' --- compat/os/mswin.h 2012-08-08 08:01:46 +0000 +++ compat/os/mswin.h 2012-09-01 14:24:50 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Andrey Shorin * AUTHOR: Guido Serassio * === modified file 'compat/os/windows.h' --- compat/os/windows.h 2011-01-28 07:58:53 +0000 +++ compat/os/windows.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Guido Serassio * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'compat/strerror.c' --- compat/strerror.c 2012-01-20 18:55:04 +0000 +++ compat/strerror.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Duane Wessels * === modified file 'helpers/basic_auth/PAM/basic_pam_auth.cc' --- helpers/basic_auth/PAM/basic_pam_auth.cc 2012-07-23 15:15:27 +0000 +++ helpers/basic_auth/PAM/basic_pam_auth.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * PAM authenticator module for Squid. * Copyright (C) 1999,2002,2003 Henrik Nordstrom * === modified file 'helpers/basic_auth/SASL/basic_sasl_auth.cc' --- helpers/basic_auth/SASL/basic_sasl_auth.cc 2012-07-23 15:15:27 +0000 +++ helpers/basic_auth/SASL/basic_sasl_auth.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SASL authenticator module for Squid. * Copyright (C) 2002 Ian Castle * === modified file 'helpers/external_acl/unix_group/check_group.cc' --- helpers/external_acl/unix_group/check_group.cc 2012-08-28 13:00:30 +0000 +++ helpers/external_acl/unix_group/check_group.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * This is a helper for the external ACL interface for Squid Cache * Copyright (C) 2002 Rodrigo Albani de Campos (rodrigo@geekbunker.org) * === modified file 'helpers/ntlm_auth/fake/ntlm_fake_auth.cc' --- helpers/ntlm_auth/fake/ntlm_fake_auth.cc 2012-01-20 18:55:04 +0000 +++ helpers/ntlm_auth/fake/ntlm_fake_auth.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Andrew Doran * AUTHOR: Robert Collins * AUTHOR: Guido Serassio: === modified file 'include/Array.h' --- include/Array.h 2011-09-06 21:27:17 +0000 +++ include/Array.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Alex Rousskov * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'include/Range.h' --- include/Range.h 2011-02-02 17:41:41 +0000 +++ include/Range.h 2012-09-03 08:58:40 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'include/RefCount.h' --- include/RefCount.h 2011-10-30 02:42:27 +0000 +++ include/RefCount.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section -- Refcount allocator * AUTHOR: Robert Collins * === modified file 'include/SquidNew.h' --- include/SquidNew.h 2012-08-28 13:00:30 +0000 +++ include/SquidNew.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Harvest Derived * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'include/Stack.h' --- include/Stack.h 2009-01-21 03:47:47 +0000 +++ include/Stack.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Alex Rousskov * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'include/asn1.h' --- include/asn1.h 2010-11-21 04:40:05 +0000 +++ include/asn1.h 2012-09-01 14:38:36 +0000 @@ -28,8 +28,6 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id$ - * **********************************************************************/ #ifndef EIGHTBIT_SUBIDS === modified file 'include/cache_snmp.h' --- include/cache_snmp.h 2012-08-28 13:00:30 +0000 +++ include/cache_snmp.h 2012-08-31 15:45:51 +0000 @@ -1,16 +1,9 @@ -/* - * $Id$ - */ #ifndef SQUID_CACHE_SNMP_H #define SQUID_CACHE_SNMP_H #if SQUID_SNMP -#if SIZEOF_LONG == 8 -#define snint int -#else -#define snint long -#endif +typedef int64_t snint; #ifndef MIN #define MIN(a,b) (a * - * $Id$ - * ***************************************************************************/ #include /* Need OID Definition */ === modified file 'include/snmp.h' --- include/snmp.h 2009-01-21 03:47:47 +0000 +++ include/snmp.h 2012-09-01 14:38:36 +0000 @@ -27,8 +27,6 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id$ - * **********************************************************************/ #if HAVE_SYS_TYPES_H === modified file 'include/snmp_api_error.h' --- include/snmp_api_error.h 2009-08-23 09:30:49 +0000 +++ include/snmp_api_error.h 2012-09-01 14:38:36 +0000 @@ -26,8 +26,6 @@ * * Author: Ryan Troll * - * $Id$ - * ***************************************************************************/ /* Error return values */ === modified file 'include/snmp_coexist.h' --- include/snmp_coexist.h 2009-08-23 09:30:49 +0000 +++ include/snmp_coexist.h 2012-09-01 14:38:36 +0000 @@ -26,8 +26,6 @@ * * Author: Ryan Troll * - * $Id$ - * **********************************************************************/ #ifdef __cplusplus === modified file 'include/snmp_error.h' --- include/snmp_error.h 2009-08-23 09:30:49 +0000 +++ include/snmp_error.h 2012-09-01 14:38:36 +0000 @@ -24,8 +24,6 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id$ - * **********************************************************************/ /* === modified file 'include/snmp_msg.h' --- include/snmp_msg.h 2012-08-24 09:57:00 +0000 +++ include/snmp_msg.h 2012-09-01 14:38:36 +0000 @@ -26,8 +26,6 @@ * * Author: Ryan Troll * - * $Id$ - * **********************************************************************/ #include "snmp_pdu.h" === modified file 'include/snmp_pdu.h' --- include/snmp_pdu.h 2010-11-21 04:40:05 +0000 +++ include/snmp_pdu.h 2012-09-01 14:38:36 +0000 @@ -33,8 +33,6 @@ * * Author: Ryan Troll * - * $Id$ - * **********************************************************************/ #ifdef __cplusplus === modified file 'include/snmp_session.h' --- include/snmp_session.h 2011-08-26 16:50:49 +0000 +++ include/snmp_session.h 2012-09-01 14:38:36 +0000 @@ -24,8 +24,6 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id$ - * **********************************************************************/ struct snmp_session { === modified file 'include/snmp_vars.h' --- include/snmp_vars.h 2012-08-28 13:00:30 +0000 +++ include/snmp_vars.h 2012-09-01 14:38:36 +0000 @@ -25,8 +25,6 @@ * * Author: Ryan Troll * - * $Id$ - * **********************************************************************/ #include "asn1.h" === modified file 'include/squid.h' --- include/squid.h 2012-08-09 10:38:38 +0000 +++ include/squid.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Duane Wessels * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'include/squid_endian.h' --- include/squid_endian.h 2011-11-26 12:12:26 +0000 +++ include/squid_endian.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Alan Barrett * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'include/squid_windows.h' --- include/squid_windows.h 2011-01-28 07:58:53 +0000 +++ include/squid_windows.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Guido Serassio * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'include/sspwin32.h' --- include/sspwin32.h 2011-01-28 07:58:53 +0000 +++ include/sspwin32.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Guido Serassio * Based on previous work of Francesco Chemolli, Robert Collins and Andrew Doran * === modified file 'include/util.h' --- include/util.h 2012-08-08 08:01:46 +0000 +++ include/util.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Harvest Derived * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'include/version.h' --- include/version.h 2009-01-21 03:47:47 +0000 +++ include/version.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID_VERSION - String for version id of this distribution */ === modified file 'lib/Array.cc' --- lib/Array.cc 2012-08-28 13:00:30 +0000 +++ lib/Array.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Alex Rousskov * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'lib/MemPool.cc' --- lib/MemPool.cc 2012-07-02 12:28:10 +0000 +++ lib/MemPool.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 63 Low Level Memory Pool Management * AUTHOR: Alex Rousskov, Andres Kroonmaa, Robert Collins * === modified file 'lib/MemPoolChunked.cc' --- lib/MemPoolChunked.cc 2012-07-10 15:44:23 +0000 +++ lib/MemPoolChunked.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 63 Low Level Memory Pool Management * AUTHOR: Alex Rousskov, Andres Kroonmaa, Robert Collins * === modified file 'lib/MemPoolMalloc.cc' --- lib/MemPoolMalloc.cc 2012-08-28 13:00:30 +0000 +++ lib/MemPoolMalloc.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 63 Low Level Memory Pool Management * AUTHOR: Alex Rousskov, Andres Kroonmaa, Robert Collins, Henrik Nordstrom * === modified file 'lib/Splay.cc' --- lib/Splay.cc 2012-01-20 18:55:04 +0000 +++ lib/Splay.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * based on ftp://ftp.cs.cmu.edu/user/sleator/splaying/top-down-splay.c * http://bobo.link.cs.cmu.edu/cgi-bin/splay/splay-cgi.pl */ === modified file 'lib/base64.c' --- lib/base64.c 2012-08-28 13:00:30 +0000 +++ lib/base64.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Markus Moeller * * Encoders adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c with adjustments. === modified file 'lib/charset.c' --- lib/charset.c 2012-01-20 18:55:04 +0000 +++ lib/charset.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Henrik Nordstrom * === modified file 'lib/dirent.c' --- lib/dirent.c 2012-08-28 13:00:30 +0000 +++ lib/dirent.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Implement dirent-style opendir(), readdir(), closedir(), rewinddir(), * seekdir() and telldir on Windows - Based on mingw-runtime package sources. * AUTHOR: Guido Serassio === modified file 'lib/getfullhostname.c' --- lib/getfullhostname.c 2012-08-28 13:00:30 +0000 +++ lib/getfullhostname.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Harvest Derived * === modified file 'lib/hash.cc' --- lib/hash.cc 2012-08-28 13:00:30 +0000 +++ lib/hash.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 00 Hash Tables * AUTHOR: Harvest Derived * === modified file 'lib/heap.c' --- lib/heap.c 2012-08-28 13:00:30 +0000 +++ lib/heap.c 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: John Dilley, Hewlett Packard * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'lib/html_quote.c' --- lib/html_quote.c 2012-01-20 18:55:04 +0000 +++ lib/html_quote.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Robert Collins * === modified file 'lib/malloc_trace.cc' --- lib/malloc_trace.cc 2012-07-02 12:28:10 +0000 +++ lib/malloc_trace.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Harvest Derived * === modified file 'lib/ntlmauth/ntlmauth.cc' --- lib/ntlmauth/ntlmauth.cc 2012-08-28 13:00:30 +0000 +++ lib/ntlmauth/ntlmauth.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Francesco Chemolli * AUTHOR: Guido Serassio: * AUTHOR: Amos Jeffries === modified file 'lib/ntlmauth/ntlmauth.h' --- lib/ntlmauth/ntlmauth.h 2012-08-28 13:00:30 +0000 +++ lib/ntlmauth/ntlmauth.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * * * * * * * Legal stuff * * * * * * * * * (C) 2000 Francesco Chemolli , === modified file 'lib/profiler/Profiler.cc' --- lib/profiler/Profiler.cc 2012-08-28 13:00:30 +0000 +++ lib/profiler/Profiler.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 81 CPU Profiling Routines * AUTHOR: Andres Kroonmaa, Sep.2000 * === modified file 'lib/radix.c' --- lib/radix.c 2012-08-28 13:00:30 +0000 +++ lib/radix.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 53 Radix Tree data structure implementation * AUTHOR: NetBSD Derived * === modified file 'lib/rfc1035.c' --- lib/rfc1035.c 2012-08-28 13:00:30 +0000 +++ lib/rfc1035.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Low level DNS protocol routines * AUTHOR: Duane Wessels * === modified file 'lib/rfc1123.c' --- lib/rfc1123.c 2012-08-28 13:00:30 +0000 +++ lib/rfc1123.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Harvest Derived * === modified file 'lib/rfc1738.c' --- lib/rfc1738.c 2012-01-20 18:55:04 +0000 +++ lib/rfc1738.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Harvest Derived * === modified file 'lib/rfc2617.c' --- lib/rfc2617.c 2012-08-28 13:00:30 +0000 +++ lib/rfc2617.c 2012-09-01 14:38:36 +0000 @@ -12,8 +12,6 @@ */ /* - * $Id$ - * * DEBUG: * AUTHOR: RFC 2617 & Robert Collins * === modified file 'lib/rfc3596.c' --- lib/rfc3596.c 2012-08-28 13:00:30 +0000 +++ lib/rfc3596.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Low level DNS protocol routines * AUTHOR: Amos Jeffries, Rafael Martinez Torres * === modified file 'lib/sspwin32.c' --- lib/sspwin32.c 2012-08-28 13:00:30 +0000 +++ lib/sspwin32.c 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Guido Serassio * inspired by previous work by Robert Collins, Francesco Chemolli. * === modified file 'lib/util.c' --- lib/util.c 2012-06-04 10:00:44 +0000 +++ lib/util.c 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Harvest Derived * === modified file 'src/AsyncEngine.cc' --- src/AsyncEngine.cc 2012-01-20 18:55:04 +0000 +++ src/AsyncEngine.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/AsyncEngine.h' --- src/AsyncEngine.h 2012-08-14 11:53:07 +0000 +++ src/AsyncEngine.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/AuthReg.cc' --- src/AuthReg.cc 2012-01-20 18:55:04 +0000 +++ src/AuthReg.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,7 @@ #include "squid.h" #if USE_AUTH +#include "AuthReg.h" #if HAVE_AUTH_MODULE_BASIC #include "auth/basic/Scheme.h" @@ -16,7 +17,6 @@ #endif #include "Debug.h" -#include "protos.h" /** * Initialize the authentication modules (if any) === added file 'src/AuthReg.h' --- src/AuthReg.h 1970-01-01 00:00:00 +0000 +++ src/AuthReg.h 2012-08-31 16:28:10 +0000 @@ -0,0 +1,45 @@ +#ifndef SQUID_AUTHREG_H_ +#define SQUID_AUTHREG_H_ +/* + * DEBUG: section + * AUTHOR: + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +namespace Auth { + +#if USE_AUTH + /// Initialize Auth subsystem + extern void Init(void); +#else /* USE_AUTH */ + inline void Init(void) {} /* NOP if not USE_AUTH */ +#endif /* USE_AUTH */ + +} // namespace Auth +#endif /* SQUID_AUTHREG_H_ */ === modified file 'src/CacheDigest.cc' --- src/CacheDigest.cc 2012-08-28 19:12:13 +0000 +++ src/CacheDigest.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 70 Cache Digest * AUTHOR: Alex Rousskov * @@ -36,7 +34,6 @@ #include "squid.h" #include "md5.h" #include "Mem.h" -#include "protos.h" #include "StatCounters.h" #include "Store.h" #include "store_key_md5.h" === modified file 'src/CacheManager.h' --- src/CacheManager.h 2012-08-14 11:53:07 +0000 +++ src/CacheManager.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ChunkedCodingParser.h' --- src/ChunkedCodingParser.h 2010-11-21 04:40:05 +0000 +++ src/ChunkedCodingParser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/CommRead.h' --- src/CommRead.h 2012-08-28 13:00:30 +0000 +++ src/CommRead.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Comm * AUTHOR: Robert Collins * === modified file 'src/CommonPool.h' --- src/CommonPool.h 2012-08-14 11:53:07 +0000 +++ src/CommonPool.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/CompletionDispatcher.cc' --- src/CompletionDispatcher.cc 2012-01-20 18:55:04 +0000 +++ src/CompletionDispatcher.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/CompletionDispatcher.h' --- src/CompletionDispatcher.h 2012-08-14 11:53:07 +0000 +++ src/CompletionDispatcher.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ConfigOption.cc' --- src/ConfigOption.cc 2012-08-14 11:53:07 +0000 +++ src/ConfigOption.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration File Parsing * AUTHOR: Robert Collins * === modified file 'src/ConfigOption.h' --- src/ConfigOption.h 2012-08-28 13:00:30 +0000 +++ src/ConfigOption.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ConfigParser.cc' --- src/ConfigParser.cc 2012-08-28 19:12:13 +0000 +++ src/ConfigParser.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -38,7 +36,6 @@ #include "ConfigParser.h" #include "Debug.h" #include "globals.h" -#include "protos.h" void ConfigParser::destruct() === modified file 'src/ConfigParser.h' --- src/ConfigParser.h 2012-08-14 11:53:07 +0000 +++ src/ConfigParser.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/CpuAffinity.cc' --- src/CpuAffinity.cc 2012-08-28 13:00:30 +0000 +++ src/CpuAffinity.cc 2012-08-31 16:57:39 +0000 @@ -1,8 +1,5 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication - * */ #include "squid.h" @@ -11,8 +8,9 @@ #include "CpuAffinityMap.h" #include "CpuAffinitySet.h" #include "Debug.h" -#include "protos.h" +#include "globals.h" #include "structs.h" +#include "tools.h" #include === modified file 'src/CpuAffinity.h' --- src/CpuAffinity.h 2012-08-28 13:00:30 +0000 +++ src/CpuAffinity.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_CPU_AFFINITY_H === modified file 'src/CpuAffinityMap.cc' --- src/CpuAffinityMap.cc 2012-08-28 13:00:30 +0000 +++ src/CpuAffinityMap.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/CpuAffinityMap.h' --- src/CpuAffinityMap.h 2012-08-28 13:00:30 +0000 +++ src/CpuAffinityMap.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_CPU_AFFINITY_MAP_H === modified file 'src/CpuAffinitySet.cc' --- src/CpuAffinitySet.cc 2012-08-30 12:46:47 +0000 +++ src/CpuAffinitySet.cc 2012-09-03 07:16:45 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/CpuAffinitySet.h' --- src/CpuAffinitySet.h 2012-08-30 12:46:47 +0000 +++ src/CpuAffinitySet.h 2012-09-03 07:16:45 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_CPU_AFFINITY_SET_H === modified file 'src/Debug.h' --- src/Debug.h 2012-07-02 01:50:03 +0000 +++ src/Debug.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 00 Debug Routines * AUTHOR: Harvest Derived * === modified file 'src/DelayBucket.cc' --- src/DelayBucket.cc 2012-08-14 11:53:07 +0000 +++ src/DelayBucket.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/DelayBucket.h' --- src/DelayBucket.h 2009-01-21 03:47:47 +0000 +++ src/DelayBucket.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/DelayConfig.cc' --- src/DelayConfig.cc 2012-08-14 11:53:07 +0000 +++ src/DelayConfig.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/DelayConfig.h' --- src/DelayConfig.h 2010-05-26 03:06:02 +0000 +++ src/DelayConfig.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration Settings * AUTHOR: Robert Collins * === modified file 'src/DelayId.cc' --- src/DelayId.cc 2012-08-14 11:53:07 +0000 +++ src/DelayId.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/DelayId.h' --- src/DelayId.h 2010-11-27 06:44:33 +0000 +++ src/DelayId.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/DelayIdComposite.h' --- src/DelayIdComposite.h 2012-08-14 11:53:07 +0000 +++ src/DelayIdComposite.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/DelayPool.cc' --- src/DelayPool.cc 2012-01-20 18:55:04 +0000 +++ src/DelayPool.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/DelayPool.h' --- src/DelayPool.h 2012-08-14 11:53:07 +0000 +++ src/DelayPool.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/DelayPools.h' --- src/DelayPools.h 2011-08-26 16:50:49 +0000 +++ src/DelayPools.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/DelaySpec.cc' --- src/DelaySpec.cc 2012-08-28 19:12:13 +0000 +++ src/DelaySpec.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by @@ -43,7 +41,6 @@ #include "cache_cf.h" #include "DelaySpec.h" #include "Parsing.h" -#include "protos.h" #include "Store.h" DelaySpec::DelaySpec() : restore_bps(-1), max_bytes (-1) === modified file 'src/DelaySpec.h' --- src/DelaySpec.h 2010-11-21 04:40:05 +0000 +++ src/DelaySpec.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/DelayTagged.cc' --- src/DelayTagged.cc 2012-08-14 11:53:07 +0000 +++ src/DelayTagged.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * === modified file 'src/DelayTagged.h' --- src/DelayTagged.h 2012-08-14 11:53:07 +0000 +++ src/DelayTagged.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * === modified file 'src/DelayUser.cc' --- src/DelayUser.cc 2012-08-14 11:53:07 +0000 +++ src/DelayUser.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * === modified file 'src/DelayUser.h' --- src/DelayUser.h 2012-08-14 11:53:07 +0000 +++ src/DelayUser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * === modified file 'src/DelayVector.cc' --- src/DelayVector.cc 2012-08-14 11:53:07 +0000 +++ src/DelayVector.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/DelayVector.h' --- src/DelayVector.h 2010-11-27 06:44:33 +0000 +++ src/DelayVector.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/DescriptorSet.cc' --- src/DescriptorSet.cc 2012-08-14 11:53:07 +0000 +++ src/DescriptorSet.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Comm */ #include "squid.h" === modified file 'src/DiskIO/AIO/AIODiskFile.cc' --- src/DiskIO/AIO/AIODiskFile.cc 2012-08-28 19:12:13 +0000 +++ src/DiskIO/AIO/AIODiskFile.cc 2012-08-31 16:57:39 +0000 @@ -1,5 +1,6 @@ /* - * $Id$ + * AUTHOR: Adrian Chadd + * DEBUG: section 79 Disk IO Routines * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -31,7 +32,6 @@ */ /** - * Author: Adrian Chadd * \par * These routines are simple plugin replacements for the file_* routines @@ -51,7 +51,7 @@ #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" #include "disk.h" -#include "protos.h" +#include "globals.h" #if HAVE_ERRNO_H #include === modified file 'src/DiskIO/AIO/AIODiskFile.h' --- src/DiskIO/AIO/AIODiskFile.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/AIO/AIODiskFile.h 2012-08-30 21:41:23 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/AIO/AIODiskIOModule.cc' --- src/DiskIO/AIO/AIODiskIOModule.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/AIO/AIODiskIOModule.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/AIO/AIODiskIOModule.h' --- src/DiskIO/AIO/AIODiskIOModule.h 2010-11-21 04:40:05 +0000 +++ src/DiskIO/AIO/AIODiskIOModule.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/AIO/AIODiskIOStrategy.cc' --- src/DiskIO/AIO/AIODiskIOStrategy.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/AIO/AIODiskIOStrategy.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/AIO/AIODiskIOStrategy.h' --- src/DiskIO/AIO/AIODiskIOStrategy.h 2011-10-27 23:14:28 +0000 +++ src/DiskIO/AIO/AIODiskIOStrategy.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/AIO/aio_win32.cc' --- src/DiskIO/AIO/aio_win32.cc 2012-08-28 13:00:30 +0000 +++ src/DiskIO/AIO/aio_win32.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 81 aio_xxx() POSIX emulation on Windows * AUTHOR: Guido Serassio * === modified file 'src/DiskIO/AIO/aio_win32.h' --- src/DiskIO/AIO/aio_win32.h 2011-07-23 08:37:52 +0000 +++ src/DiskIO/AIO/aio_win32.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Guido Serassio * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/DiskIO/Blocking/BlockingDiskIOModule.cc' --- src/DiskIO/Blocking/BlockingDiskIOModule.cc 2012-08-28 13:00:30 +0000 +++ src/DiskIO/Blocking/BlockingDiskIOModule.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/Blocking/BlockingDiskIOModule.h' --- src/DiskIO/Blocking/BlockingDiskIOModule.h 2009-01-21 03:47:47 +0000 +++ src/DiskIO/Blocking/BlockingDiskIOModule.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/Blocking/BlockingFile.cc' --- src/DiskIO/Blocking/BlockingFile.cc 2012-08-28 19:12:13 +0000 +++ src/DiskIO/Blocking/BlockingFile.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * @@ -35,11 +33,12 @@ #include "squid.h" #include "BlockingFile.h" #include "Debug.h" +#include "defines.h" +#include "globals.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" #include "disk.h" -#include "protos.h" #if HAVE_ERRNO_H #include === modified file 'src/DiskIO/Blocking/BlockingFile.h' --- src/DiskIO/Blocking/BlockingFile.h 2012-08-07 15:12:08 +0000 +++ src/DiskIO/Blocking/BlockingFile.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * === modified file 'src/DiskIO/Blocking/BlockingIOStrategy.cc' --- src/DiskIO/Blocking/BlockingIOStrategy.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/Blocking/BlockingIOStrategy.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * @@ -37,7 +34,7 @@ #include "squid.h" #include "BlockingIOStrategy.h" #include "BlockingFile.h" -#include "protos.h" +#include "unlinkd.h" bool BlockingIOStrategy::shedLoad() @@ -67,9 +64,5 @@ void BlockingIOStrategy::unlinkFile(char const *path) { -#if USE_UNLINKD unlinkdUnlink(path); -#else - ::unlink(path); -#endif } === modified file 'src/DiskIO/Blocking/BlockingIOStrategy.h' --- src/DiskIO/Blocking/BlockingIOStrategy.h 2011-10-27 23:14:28 +0000 +++ src/DiskIO/Blocking/BlockingIOStrategy.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * === modified file 'src/DiskIO/Blocking/DiskIOBlocking.cc' --- src/DiskIO/Blocking/DiskIOBlocking.cc 2012-01-20 18:55:04 +0000 +++ src/DiskIO/Blocking/DiskIOBlocking.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc' --- src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h' --- src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h 2010-10-28 18:52:59 +0000 +++ src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskDaemon/DiskdAction.cc' --- src/DiskIO/DiskDaemon/DiskdAction.cc 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskDaemon/DiskdAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side DISKD I/O functions. * */ @@ -13,7 +11,7 @@ #include "ipc/TypedMsgHdr.h" #include "mgr/ActionWriter.h" #include "Store.h" -#include "protos.h" +#include "tools.h" DiskdActionData::DiskdActionData() { === modified file 'src/DiskIO/DiskDaemon/DiskdAction.h' --- src/DiskIO/DiskDaemon/DiskdAction.h 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskDaemon/DiskdAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side DISKD I/O functions. * */ === modified file 'src/DiskIO/DiskDaemon/DiskdFile.cc' --- src/DiskIO/DiskDaemon/DiskdFile.cc 2012-08-24 09:57:00 +0000 +++ src/DiskIO/DiskDaemon/DiskdFile.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels * === modified file 'src/DiskIO/DiskDaemon/DiskdFile.h' --- src/DiskIO/DiskDaemon/DiskdFile.h 2012-08-07 15:12:08 +0000 +++ src/DiskIO/DiskDaemon/DiskdFile.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels * === modified file 'src/DiskIO/DiskDaemon/DiskdIOStrategy.cc' --- src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 2012-08-28 19:12:13 +0000 +++ src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels * @@ -41,10 +39,11 @@ #include "DiskdFile.h" #include "diomsg.h" #include "fd.h" -#include "protos.h" #include "Store.h" #include "StatCounters.h" +#include "SquidIpc.h" #include "SquidTime.h" +#include "unlinkd.h" #include #include @@ -120,14 +119,7 @@ if (shedLoad()) { /* Damn, we need to issue a sync unlink here :( */ debugs(79, 2, "storeDiskUnlink: Out of queue space, sync unlink"); -#if USE_UNLINKD - unlinkdUnlink(path); -#else - - unlink(path); -#endif - return; } === modified file 'src/DiskIO/DiskDaemon/DiskdIOStrategy.h' --- src/DiskIO/DiskDaemon/DiskdIOStrategy.h 2011-10-27 23:14:28 +0000 +++ src/DiskIO/DiskDaemon/DiskdIOStrategy.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels * === modified file 'src/DiskIO/DiskDaemon/diskd.cc' --- src/DiskIO/DiskDaemon/diskd.cc 2012-06-22 03:49:38 +0000 +++ src/DiskIO/DiskDaemon/diskd.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section -- External DISKD process implementation. * AUTHOR: Harvest Derived * === modified file 'src/DiskIO/DiskFile.h' --- src/DiskIO/DiskFile.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskFile.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskIOModule.h' --- src/DiskIO/DiskIOModule.h 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskIOModule.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskIOStrategy.h' --- src/DiskIO/DiskIOStrategy.h 2012-08-28 13:04:48 +0000 +++ src/DiskIO/DiskIOStrategy.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskThreads/CommIO.cc' --- src/DiskIO/DiskThreads/CommIO.cc 2012-08-28 19:12:13 +0000 +++ src/DiskIO/DiskThreads/CommIO.cc 2012-08-31 16:57:39 +0000 @@ -37,7 +37,6 @@ #include "DiskIO/DiskThreads/CommIO.h" #include "fd.h" #include "globals.h" -#include "protos.h" void CommIO::Initialise() === modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc' --- src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc 2012-08-28 19:12:13 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Disk IO Routines * AUTHOR: Robert Collins * @@ -44,7 +42,6 @@ #include "globals.h" #include "StatCounters.h" #include "Store.h" -#include "protos.h" #if HAVE_ERRNO_H #include === modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskFile.h' --- src/DiskIO/DiskThreads/DiskThreadsDiskFile.h 2012-08-07 15:12:08 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsDiskFile.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Disk IO Routines * AUTHOR: Robert Collins * === modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc' --- src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h' --- src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc' --- src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side Disk I/O functions. * AUTHOR: Robert Collins * === modified file 'src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h' --- src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h 2011-10-27 23:14:28 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 79 Squid-side Disk I/O functions. * AUTHOR: Robert Collins * === modified file 'src/DiskIO/DiskThreads/aiops.cc' --- src/DiskIO/DiskThreads/aiops.cc 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskThreads/aiops.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 43 AIOPS * AUTHOR: Stewart Forster * === modified file 'src/DiskIO/DiskThreads/aiops_win32.cc' --- src/DiskIO/DiskThreads/aiops_win32.cc 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskThreads/aiops_win32.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 43 Windows AIOPS * AUTHOR: Stewart Forster * AUTHOR: Robert Collins === modified file 'src/DiskIO/DiskThreads/async_io.cc' --- src/DiskIO/DiskThreads/async_io.cc 2012-08-28 13:00:30 +0000 +++ src/DiskIO/DiskThreads/async_io.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 32 Asynchronous Disk I/O * AUTHOR: Pete Bentley * AUTHOR: Stewart Forster === modified file 'src/DiskIO/IORequestor.h' --- src/DiskIO/IORequestor.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/IORequestor.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/IpcIo/IpcIoFile.cc' --- src/DiskIO/IpcIo/IpcIoFile.cc 2012-08-28 19:12:13 +0000 +++ src/DiskIO/IpcIo/IpcIoFile.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines */ @@ -20,9 +18,9 @@ #include "ipc/Queue.h" #include "ipc/StrandSearch.h" #include "ipc/UdsOp.h" -#include "protos.h" #include "SquidTime.h" #include "StatCounters.h" +#include "tools.h" #if HAVE_ERRNO_H #include === modified file 'src/DiskIO/IpcIo/IpcIoIOStrategy.cc' --- src/DiskIO/IpcIo/IpcIoIOStrategy.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/IpcIo/IpcIoIOStrategy.cc 2012-08-31 16:57:39 +0000 @@ -1,14 +1,11 @@ - /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines */ #include "squid.h" #include "IpcIoFile.h" #include "IpcIoIOStrategy.h" -#include "protos.h" +#include "unlinkd.h" bool IpcIoIOStrategy::shedLoad() @@ -38,9 +35,5 @@ void IpcIoIOStrategy::unlinkFile(char const *path) { -#if USE_UNLINKD unlinkdUnlink(path); -#else - ::unlink(path); -#endif } === modified file 'src/DiskIO/Mmapped/MmappedFile.cc' --- src/DiskIO/Mmapped/MmappedFile.cc 2012-08-28 19:12:13 +0000 +++ src/DiskIO/Mmapped/MmappedFile.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines */ @@ -12,7 +10,6 @@ #include "DiskIO/WriteRequest.h" #include "disk.h" #include "globals.h" -#include "protos.h" #if HAVE_SYS_MMAN_H #include === modified file 'src/DiskIO/Mmapped/MmappedIOStrategy.cc' --- src/DiskIO/Mmapped/MmappedIOStrategy.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/Mmapped/MmappedIOStrategy.cc 2012-08-31 16:57:39 +0000 @@ -1,14 +1,11 @@ - /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines */ #include "squid.h" #include "MmappedFile.h" #include "MmappedIOStrategy.h" -#include "protos.h" +#include "unlinkd.h" bool MmappedIOStrategy::shedLoad() @@ -38,9 +35,5 @@ void MmappedIOStrategy::unlinkFile(char const *path) { -#if USE_UNLINKD unlinkdUnlink(path); -#else - ::unlink(path); -#endif } === modified file 'src/DiskIO/ReadRequest.cc' --- src/DiskIO/ReadRequest.cc 2012-01-20 18:55:04 +0000 +++ src/DiskIO/ReadRequest.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/ReadRequest.h' --- src/DiskIO/ReadRequest.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/ReadRequest.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/WriteRequest.cc' --- src/DiskIO/WriteRequest.cc 2012-01-20 18:55:04 +0000 +++ src/DiskIO/WriteRequest.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/DiskIO/WriteRequest.h' --- src/DiskIO/WriteRequest.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/WriteRequest.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/ETag.cc' --- src/ETag.cc 2012-01-20 18:55:04 +0000 +++ src/ETag.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: none ETag parsing support * AUTHOR: Alex Rousskov * === modified file 'src/EventLoop.cc' --- src/EventLoop.cc 2012-08-14 11:53:07 +0000 +++ src/EventLoop.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 01 Main Loop * AUTHOR: Harvest Derived * === modified file 'src/EventLoop.h' --- src/EventLoop.h 2012-08-28 13:00:30 +0000 +++ src/EventLoop.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ExternalACL.h' --- src/ExternalACL.h 2012-08-29 00:12:28 +0000 +++ src/ExternalACL.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ExternalACLEntry.cc' --- src/ExternalACLEntry.cc 2012-08-14 11:53:07 +0000 +++ src/ExternalACLEntry.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 82 External ACL * AUTHOR: Henrik Nordstrom, MARA Systems AB * === modified file 'src/ExternalACLEntry.h' --- src/ExternalACLEntry.h 2012-08-28 13:00:30 +0000 +++ src/ExternalACLEntry.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 82 External ACL * AUTHOR: Henrik Nordstrom, MARA Systems AB * === modified file 'src/Generic.h' --- src/Generic.h 2009-05-03 13:02:50 +0000 +++ src/Generic.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HelperChildConfig.cc' --- src/HelperChildConfig.cc 2012-08-28 19:12:13 +0000 +++ src/HelperChildConfig.cc 2012-08-31 16:57:39 +0000 @@ -3,7 +3,6 @@ #include "Debug.h" #include "HelperChildConfig.h" #include "globals.h" -#include "protos.h" #include === modified file 'src/HierarchyLogEntry.h' --- src/HierarchyLogEntry.h 2011-08-20 08:21:11 +0000 +++ src/HierarchyLogEntry.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpBody.cc' --- src/HttpBody.cc 2012-08-28 13:00:30 +0000 +++ src/HttpBody.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 56 HTTP Message Body * AUTHOR: Alex Rousskov * === modified file 'src/HttpHdrCc.cc' --- src/HttpHdrCc.cc 2012-08-28 19:12:13 +0000 +++ src/HttpHdrCc.cc 2012-08-31 16:57:39 +0000 @@ -38,7 +38,7 @@ #include "HttpHdrCc.h" #include "StatHist.h" #include "Store.h" -#include "protos.h" +#include "StrList.h" #if HAVE_MAP #include === modified file 'src/HttpHdrContRange.cc' --- src/HttpHdrContRange.cc 2012-08-28 19:12:13 +0000 +++ src/HttpHdrContRange.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 68 HTTP Content-Range Header * AUTHOR: Alex Rousskov * @@ -39,7 +37,6 @@ #include "HttpHdrContRange.h" #include "HttpHeaderTools.h" #include "Mem.h" -#include "protos.h" /* * Currently only byte ranges are supported === modified file 'src/HttpHdrContRange.h' --- src/HttpHdrContRange.h 2010-11-21 04:40:05 +0000 +++ src/HttpHdrContRange.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpHdrRange.cc' --- src/HttpHdrRange.cc 2012-08-28 13:00:30 +0000 +++ src/HttpHdrRange.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 64 HTTP Range Header * AUTHOR: Alex Rousskov * @@ -38,7 +36,7 @@ #include "HttpHeaderRange.h" #include "client_side_request.h" #include "HttpReply.h" -#include "protos.h" +#include "StrList.h" /* * Currently only byte ranges are supported === modified file 'src/HttpHdrSc.cc' --- src/HttpHdrSc.cc 2012-08-28 19:12:13 +0000 +++ src/HttpHdrSc.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 90 HTTP Cache Control Header * AUTHOR: Alex Rousskov * Robert Collins (Surrogate-Control is derived from @@ -42,7 +40,7 @@ #include "HttpHeaderStat.h" #include "HttpHeaderTools.h" #include "Store.h" -#include "protos.h" +#include "StrList.h" #if HAVE_MAP #include === modified file 'src/HttpHdrSc.h' --- src/HttpHdrSc.h 2012-08-14 11:53:07 +0000 +++ src/HttpHdrSc.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpHdrScTarget.cc' --- src/HttpHdrScTarget.cc 2012-08-14 11:53:07 +0000 +++ src/HttpHdrScTarget.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 90 HTTP Cache Control Header * AUTHOR: Alex Rousskov * Robert Collins (Surrogate-Control is derived from === modified file 'src/HttpHdrScTarget.h' --- src/HttpHdrScTarget.h 2012-08-28 13:00:30 +0000 +++ src/HttpHdrScTarget.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpHeader.cc' --- src/HttpHeader.cc 2012-08-28 19:12:13 +0000 +++ src/HttpHeader.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 55 HTTP Header * AUTHOR: Alex Rousskov * @@ -30,11 +27,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * */ #include "squid.h" #include "base64.h" +#include "globals.h" #include "HttpHdrCc.h" #include "HttpHdrContRange.h" #include "HttpHdrSc.h" @@ -44,10 +41,11 @@ #include "MemBuf.h" #include "mgr/Registration.h" #include "profiler/Profiler.h" -#include "protos.h" #include "rfc1123.h" #include "StatHist.h" #include "Store.h" +#include "StrList.h" +#include "SquidString.h" #include "TimeOrTag.h" /* @@ -279,9 +277,10 @@ static int HeaderEntryParsedCount = 0; /* - * local routines + * forward declarations and local routines */ +class StoreEntry; #define assert_eid(id) assert((id) >= 0 && (id) < HDR_ENUM_END) static void httpHeaderNoteParsedEntry(http_hdr_type id, String const &value, int error); @@ -289,6 +288,9 @@ static void httpHeaderStatInit(HttpHeaderStat * hs, const char *label); static void httpHeaderStatDump(const HttpHeaderStat * hs, StoreEntry * e); +/** store report about current header usage and other stats */ +static void httpHeaderStoreReport(StoreEntry * e); + /* * Module initialization routines */ === modified file 'src/HttpHeader.h' --- src/HttpHeader.h 2012-08-28 19:12:13 +0000 +++ src/HttpHeader.h 2012-09-03 09:02:20 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -44,6 +42,7 @@ class HttpHdrSc; class HttpHdrRange; class String; +class StoreEntry; /* constant attributes of http header fields */ === modified file 'src/HttpHeaderMask.h' --- src/HttpHeaderMask.h 2010-11-21 04:40:05 +0000 +++ src/HttpHeaderMask.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpHeaderRange.h' --- src/HttpHeaderRange.h 2011-02-01 08:49:56 +0000 +++ src/HttpHeaderRange.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpHeaderTools.cc' --- src/HttpHeaderTools.cc 2012-08-28 13:00:30 +0000 +++ src/HttpHeaderTools.cc 2012-09-03 09:02:20 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 66 HTTP Header Tools * AUTHOR: Alex Rousskov * @@ -45,8 +43,8 @@ #include "HttpHeaderTools.h" #include "HttpRequest.h" #include "MemBuf.h" -#include "protos.h" #include "Store.h" +#include "StrList.h" #if USE_SSL #include "ssl/support.h" @@ -181,124 +179,6 @@ return res; } -/** returns true iff "m" is a member of the list */ -int -strListIsMember(const String * list, const char *m, char del) -{ - const char *pos = NULL; - const char *item; - int ilen = 0; - int mlen; - assert(list && m); - mlen = strlen(m); - - while (strListGetItem(list, del, &item, &ilen, &pos)) { - if (mlen == ilen && !strncasecmp(item, m, ilen)) - return 1; - } - - return 0; -} - -/** returns true iff "s" is a substring of a member of the list */ -int -strListIsSubstr(const String * list, const char *s, char del) -{ - assert(list && del); - return (list->find(s) != String::npos); - - /** \note - * Note: the original code with a loop is broken because it uses strstr() - * instead of strnstr(). If 's' contains a 'del', strListIsSubstr() may - * return true when it should not. If 's' does not contain a 'del', the - * implementaion is equavalent to strstr()! Thus, we replace the loop with - * strstr() above until strnstr() is available. - */ -} - -/** appends an item to the list */ -void -strListAdd(String * str, const char *item, char del) -{ - assert(str && item); - - if (str->size()) { - char buf[3]; - buf[0] = del; - buf[1] = ' '; - buf[2] = '\0'; - str->append(buf, 2); - } - - str->append(item, strlen(item)); -} - -/** - * iterates through a 0-terminated string of items separated by 'del's. - * white space around 'del' is considered to be a part of 'del' - * like strtok, but preserves the source, and can iterate several strings at once - * - * returns true if next item is found. - * init pos with NULL to start iteration. - */ -int -strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos) -{ - size_t len; - /* ',' is always enabled as field delimiter as this is required for - * processing merged header values properly, even if Cookie normally - * uses ';' as delimiter. - */ - static char delim[3][8] = { - "\"?,", - "\"\\", - " ?,\t\r\n" - }; - int quoted = 0; - assert(str && item && pos); - - delim[0][1] = del; - delim[2][1] = del; - - if (!*pos) { - *pos = str->termedBuf(); - - if (!*pos) - return 0; - } - - /* skip leading whitespace and delimiters */ - *pos += strspn(*pos, delim[2]); - - *item = *pos; /* remember item's start */ - - /* find next delimiter */ - do { - *pos += strcspn(*pos, delim[quoted]); - if (**pos == '"') { - quoted = !quoted; - *pos += 1; - } else if (quoted && **pos == '\\') { - *pos += 1; - if (**pos) - *pos += 1; - } else { - break; /* Delimiter found, marking the end of this value */ - } - } while (**pos); - - len = *pos - *item; /* *pos points to del or '\0' */ - - /* rtrim */ - while (len > 0 && xisspace((*item)[len - 1])) - --len; - - if (ilen) - *ilen = len; - - return len > 0; -} - /** handy to printf prefixes of potentially very long buffers */ const char * getStringPrefix(const char *str, const char *end) === modified file 'src/HttpHeaderTools.h' --- src/HttpHeaderTools.h 2012-08-29 00:12:28 +0000 +++ src/HttpHeaderTools.h 2012-09-03 09:02:20 +0000 @@ -96,6 +96,8 @@ class HttpHeaderFieldInfo; class String; +class HttpHeader; +class HttpRequest; extern HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count); extern void httpHeaderDestroyFieldsInfo(HttpHeaderFieldInfo * info, int count); @@ -106,4 +108,8 @@ extern int httpHeaderParseInt(const char *start, int *val); extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3; +extern const char *getStringPrefix(const char *str, const char *end); + +extern void httpHdrMangleList(HttpHeader *, HttpRequest *, int req_or_rep); + #endif === modified file 'src/HttpMsg.cc' --- src/HttpMsg.cc 2012-08-28 19:12:13 +0000 +++ src/HttpMsg.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 74 HTTP Message * AUTHOR: Alex Rousskov * @@ -38,8 +36,8 @@ #include "HttpHeaderTools.h" #include "HttpMsg.h" #include "MemBuf.h" +#include "mime_header.h" #include "profiler/Profiler.h" -#include "protos.h" HttpMsg::HttpMsg(http_hdr_owner_type owner): header(owner), cache_control(NULL), hdr_sz(0), content_length(0), protocol(AnyP::PROTO_NONE), === modified file 'src/HttpMsg.h' --- src/HttpMsg.h 2012-08-28 13:00:30 +0000 +++ src/HttpMsg.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpReply.cc' --- src/HttpReply.cc 2012-08-28 13:00:30 +0000 +++ src/HttpReply.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 58 HTTP Reply (Response) * AUTHOR: Alex Rousskov * @@ -43,9 +41,9 @@ #include "HttpReply.h" #include "HttpRequest.h" #include "MemBuf.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" +#include "StrList.h" /* local constants */ === modified file 'src/HttpReply.h' --- src/HttpReply.h 2012-08-14 11:53:07 +0000 +++ src/HttpReply.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpRequest.cc' --- src/HttpRequest.cc 2012-08-28 19:12:13 +0000 +++ src/HttpRequest.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 73 HTTP Request * AUTHOR: Duane Wessels * @@ -40,6 +37,7 @@ #include "client_side.h" #include "DnsLookupDetails.h" #include "err_detail_type.h" +#include "globals.h" #include "gopher.h" #include "http.h" #include "HttpHdrCc.h" @@ -47,7 +45,6 @@ #include "HttpRequest.h" #include "log/Config.h" #include "MemBuf.h" -#include "protos.h" #include "Store.h" #include "URL.h" === modified file 'src/HttpRequest.h' --- src/HttpRequest.h 2012-08-14 11:53:07 +0000 +++ src/HttpRequest.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpRequestMethod.cc' --- src/HttpRequestMethod.cc 2012-08-14 11:53:07 +0000 +++ src/HttpRequestMethod.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 73 HTTP Request * AUTHOR: Duane Wessels * === modified file 'src/HttpRequestMethod.h' --- src/HttpRequestMethod.h 2012-08-28 13:00:30 +0000 +++ src/HttpRequestMethod.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpStatusLine.cc' --- src/HttpStatusLine.cc 2012-08-14 11:53:07 +0000 +++ src/HttpStatusLine.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 57 HTTP Status-line * AUTHOR: Alex Rousskov * @@ -36,7 +34,6 @@ #include "squid.h" #include "Debug.h" #include "HttpStatusLine.h" -#include "protos.h" #include "Packer.h" /* local constants */ === modified file 'src/HttpStatusLine.h' --- src/HttpStatusLine.h 2012-08-28 13:00:30 +0000 +++ src/HttpStatusLine.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/HttpVersion.h' --- src/HttpVersion.h 2011-07-29 13:12:29 +0000 +++ src/HttpVersion.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ICP.h' --- src/ICP.h 2012-08-28 13:00:30 +0000 +++ src/ICP.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/LeakFinder.cc' --- src/LeakFinder.cc 2012-08-28 13:00:30 +0000 +++ src/LeakFinder.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 45 Callback Data Registry * AUTHOR: Duane Wessels * === modified file 'src/Makefile.am' --- src/Makefile.am 2012-08-28 19:12:13 +0000 +++ src/Makefile.am 2012-09-01 14:24:50 +0000 @@ -59,6 +59,7 @@ SNMP_ALL_SOURCE = \ snmp_core.h \ snmp_core.cc \ + snmp_agent.h \ snmp_agent.cc if ENABLE_SNMP SNMP_SOURCE = $(SNMP_ALL_SOURCE) @@ -137,15 +138,17 @@ endif if ENABLE_UNLINKD -UNLINKDSOURCE = unlinkd.cc +UNLINKDSOURCE = unlinkd.h unlinkd.cc UNLINKD = unlinkd else -UNLINKDSOURCE = +UNLINKDSOURCE = unlinkd.h UNLINKD = endif WIN32_ALL_SOURCE = \ + win32.h \ win32.cc \ + WinSvc.h \ WinSvc.cc if ENABLE_WIN32SPECIFIC WIN32_SOURCE = win32.cc @@ -156,9 +159,9 @@ endif if USE_IPC_WIN32 -IPC_SOURCE = ipc_win32.cc +IPC_SOURCE = SquidIpc.h ipc_win32.cc else -IPC_SOURCE = ipc.cc +IPC_SOURCE = SquidIpc.h ipc.cc endif AIO_WIN32_ALL_SOURCES = \ @@ -264,6 +267,7 @@ AsyncEngine.cc \ AsyncEngine.h \ cache_cf.h \ + AuthReg.h \ cache_cf.cc \ CacheDigest.h \ CacheDigest.cc \ @@ -393,6 +397,7 @@ icp_opcode.h \ icp_v2.cc \ icp_v3.cc \ + int.h \ int.cc \ internal.h \ internal.cc \ @@ -400,7 +405,8 @@ ipcache.cc \ ipcache.h \ $(LEAKFINDERSOURCE) \ - list.cc \ + SquidList.h \ + SquidList.cc \ lookup_t.h \ main.cc \ Mem.h \ @@ -411,8 +417,11 @@ MemBuf.cc \ MemObject.cc \ MemObject.h \ + mime.h \ mime.cc \ + mime_header.h \ mime_header.cc \ + multicast.h \ multicast.cc \ neighbors.h \ neighbors.cc \ @@ -425,6 +434,7 @@ pconn.h \ PeerDigest.h \ peer_digest.cc \ + peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ peer_select.cc \ peer_sourcehash.h \ @@ -434,11 +444,13 @@ PeerSelectState.h \ PingData.h \ protos.h \ + redirect.h \ redirect.cc \ refresh.h \ refresh.cc \ RemovalPolicy.cc \ RemovalPolicy.h \ + send-announce.h \ send-announce.cc \ $(SBUF_SOURCE) \ $(SNMP_SOURCE) \ @@ -452,8 +464,11 @@ StatHist.h \ StatHist.cc \ String.cc \ + StrList.h \ + StrList.cc \ stmem.cc \ stmem.h \ + repl_modules.h \ store.cc \ Store.h \ StoreFileSystem.cc \ @@ -465,12 +480,16 @@ StoreIOState.h \ store_client.cc \ StoreClient.h \ + store_digest.h \ store_digest.cc \ store_dir.cc \ store_key_md5.h \ store_key_md5.cc \ + store_log.h \ store_log.cc \ + store_rebuild.h \ store_rebuild.cc \ + store_swapin.h \ store_swapin.cc \ store_swapmeta.cc \ store_swapout.cc \ @@ -513,6 +532,7 @@ URL.h \ URLScheme.cc \ URLScheme.h \ + urn.h \ urn.cc \ wccp.h \ wccp.cc \ @@ -690,6 +710,7 @@ cbdata.h \ cbdata.cc \ debug.cc \ + int.h \ int.cc \ Mem.h \ mem.cc \ @@ -1112,12 +1133,15 @@ mem.cc \ MemBuf.cc \ MemBuf.h \ + mime_header.h \ mime_header.cc \ Packer.cc \ Packer.h \ SquidString.h \ SquidTime.h \ String.cc \ + StrList.h \ + StrList.cc \ log/access_log.h \ tests/stub_access_log.cc \ cache_cf.h \ @@ -1131,6 +1155,7 @@ StatCounters.cc \ StatHist.h \ tests/stub_StatHist.cc \ + repl_modules.h \ tests/stub_store.cc \ tests/stub_store_stats.cc \ tools.h \ @@ -1166,7 +1191,6 @@ $(XTRA_LIBS) tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA) - tests_testACLMaxUserIP_SOURCES= \ cbdata.cc \ ClientInfo.h \ @@ -1194,8 +1218,10 @@ HttpHdrScTarget.cc \ HttpMsg.cc \ HttpRequestMethod.cc \ + int.h \ int.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ mem_node.cc \ Packer.cc \ Parsing.cc \ @@ -1203,6 +1229,8 @@ StatCounters.cc \ StatCounters.h \ StatHist.h \ + StrList.h \ + StrList.cc \ tests/stub_StatHist.cc \ stmem.cc \ String.cc \ @@ -1240,10 +1268,13 @@ tests/stub_libsslsquid.cc \ tests/stub_MemObject.cc \ tests/stub_MemStore.cc \ + mime.h \ tests/stub_mime.cc \ tests/stub_pconn.cc \ tests/stub_Port.cc \ + repl_modules.h \ tests/stub_store.cc \ + store_rebuild.h \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ tests/stub_store_swapout.cc \ @@ -1333,6 +1364,7 @@ BodyPipe.cc \ cache_manager.cc \ cache_cf.h \ + AuthReg.h \ cache_cf.cc \ CacheDigest.h \ CacheDigest.cc \ @@ -1404,15 +1436,20 @@ icp_v3.cc \ $(IPC_SOURCE) \ ipcache.cc \ + int.h \ int.cc \ internal.h \ internal.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ + multicast.h \ multicast.cc \ mem_node.cc \ MemBuf.cc \ MemObject.cc \ + mime.h \ mime.cc \ + mime_header.h \ mime_header.cc \ neighbors.h \ neighbors.cc \ @@ -1420,12 +1457,14 @@ Parsing.cc \ pconn.cc \ peer_digest.cc \ + peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ peer_select.cc \ peer_sourcehash.h \ peer_sourcehash.cc \ peer_userhash.h \ peer_userhash.cc \ + redirect.h \ redirect.cc \ refresh.h \ refresh.cc \ @@ -1439,17 +1478,24 @@ StatCounters.h \ StatCounters.cc \ StatHist.h \ + StrList.h \ + StrList.cc \ tests/stub_StatHist.cc \ stmem.cc \ + repl_modules.h \ store.cc \ store_client.cc \ + store_digest.h \ store_digest.cc \ store_dir.cc \ store_io.cc \ store_key_md5.h \ store_key_md5.cc \ + store_log.h \ store_log.cc \ + store_rebuild.h \ store_rebuild.cc \ + store_swapin.h \ store_swapin.cc \ store_swapmeta.cc \ store_swapout.cc \ @@ -1471,6 +1517,7 @@ $(UNLINKDSOURCE) \ url.cc \ URLScheme.cc \ + urn.h \ urn.cc \ wccp2.h \ wccp2.cc \ @@ -1561,8 +1608,10 @@ HttpReply.cc \ HttpRequestMethod.cc \ HttpStatusLine.cc \ + int.h \ int.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ MemBuf.cc \ MemObject.cc \ mem_node.cc \ @@ -1594,8 +1643,11 @@ store_key_md5.cc \ store_swapout.cc \ store_swapmeta.cc \ + repl_modules.h \ store.cc \ String.cc \ + StrList.h \ + StrList.cc \ SwapDir.cc \ log/access_log.h \ tests/stub_access_log.cc \ @@ -1619,14 +1671,14 @@ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ tests/stub_MemStore.cc \ + mime.h \ tests/stub_mime.cc \ tests/stub_pconn.cc \ tests/stub_Port.cc \ tests/stub_store_client.cc \ tests/stub_store_stats.cc \ + store_rebuild.h \ tests/stub_store_rebuild.cc \ - tools.h \ - tests/stub_tools.cc \ tests/stub_UdsOp.cc \ tests/testDiskIO.cc \ tests/testDiskIO.h \ @@ -1639,7 +1691,9 @@ URLScheme.cc \ $(WIN32_SOURCE) \ wordlist.h \ - wordlist.cc + wordlist.cc \ + tools.h \ + tests/stub_tools.cc nodist_tests_testDiskIO_SOURCES= \ $(TESTSOURCES) \ $(DISKIO_GEN_SOURCE) \ @@ -1693,6 +1747,7 @@ CacheDigest.h \ CacheDigest.cc \ cache_cf.h \ + AuthReg.h \ cache_cf.cc \ cache_manager.cc \ carp.h \ @@ -1771,17 +1826,22 @@ icp_v3.cc \ $(IPC_SOURCE) \ ipcache.cc \ + int.h \ int.cc \ internal.h \ internal.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ Mem.h \ mem.cc \ mem_node.cc \ MemBuf.cc \ MemObject.cc \ + mime.h \ mime.cc \ + mime_header.h \ mime_header.cc \ + multicast.h \ multicast.cc \ neighbors.h \ neighbors.cc \ @@ -1789,17 +1849,21 @@ Parsing.cc \ pconn.cc \ peer_digest.cc \ + peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ peer_select.cc \ peer_sourcehash.h \ peer_sourcehash.cc \ peer_userhash.h \ peer_userhash.cc \ + redirect.h \ redirect.cc \ refresh.h \ refresh.cc \ RemovalPolicy.cc \ Server.cc \ + StrList.h \ + StrList.cc \ $(SNMP_SOURCE) \ SquidMath.cc \ SquidMath.h \ @@ -1810,15 +1874,20 @@ StatHist.h \ StatHist.cc \ stmem.cc \ + repl_modules.h \ store.cc \ store_client.cc \ + store_digest.h \ store_digest.cc \ store_dir.cc \ store_io.cc \ store_key_md5.h \ store_key_md5.cc \ + store_log.h \ store_log.cc \ + store_rebuild.h \ store_rebuild.cc \ + store_swapin.h \ store_swapin.cc \ store_swapmeta.cc \ store_swapout.cc \ @@ -1849,6 +1918,7 @@ $(UNLINKDSOURCE) \ url.cc \ URLScheme.cc \ + urn.h \ urn.cc \ wccp2.h \ wccp2.cc \ @@ -1910,6 +1980,7 @@ CacheDigest.cc \ cache_manager.cc \ cache_cf.h \ + AuthReg.h \ cache_cf.cc \ carp.h \ carp.cc \ @@ -1987,17 +2058,22 @@ icp_v3.cc \ $(IPC_SOURCE) \ ipcache.cc \ + int.h \ int.cc \ internal.h \ internal.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ MemBuf.cc \ MemObject.cc \ Mem.h \ mem.cc \ mem_node.cc \ + mime.h \ mime.cc \ + mime_header.h \ mime_header.cc \ + multicast.h \ multicast.cc \ neighbors.h \ neighbors.cc \ @@ -2005,6 +2081,7 @@ Parsing.cc \ pconn.cc \ peer_digest.cc \ + peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ peer_select.cc \ peer_sourcehash.h \ @@ -2012,6 +2089,7 @@ peer_userhash.h \ peer_userhash.cc \ RemovalPolicy.cc \ + redirect.h \ redirect.cc \ refresh.h \ refresh.cc \ @@ -2027,15 +2105,20 @@ StatHist.cc \ Mem.h \ stmem.cc \ + repl_modules.h \ store.cc \ store_client.cc \ + store_digest.h \ store_digest.cc \ store_dir.cc \ store_io.cc \ store_key_md5.h \ store_key_md5.cc \ + store_log.h \ store_log.cc \ + store_rebuild.h \ store_rebuild.cc \ + store_swapin.h \ store_swapin.cc \ store_swapmeta.cc \ store_swapout.cc \ @@ -2050,6 +2133,8 @@ StoreMetaVary.cc \ StoreSwapLogData.cc \ String.cc \ + StrList.h \ + StrList.cc \ SwapDir.cc \ tests/testEventLoop.cc \ tests/testEventLoop.h \ @@ -2065,6 +2150,7 @@ $(UNLINKDSOURCE) \ url.cc \ URLScheme.cc \ + urn.h \ urn.cc \ wccp2.h \ wccp2.cc \ @@ -2122,6 +2208,7 @@ $(ACL_REGISTRATION_SOURCES) \ BodyPipe.cc \ cache_cf.h \ + AuthReg.h \ cache_cf.cc \ cache_manager.cc \ CacheDigest.h \ @@ -2198,25 +2285,31 @@ HttpStatusLine.cc \ icp_v2.cc \ icp_v3.cc \ + int.h \ int.cc \ internal.h \ internal.cc \ $(IPC_SOURCE) \ ipcache.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ MemBuf.cc \ MemObject.cc \ Mem.h \ mem.cc \ mem_node.cc \ + mime.h \ mime.cc \ + mime_header.h \ mime_header.cc \ + multicast.h \ multicast.cc \ neighbors.h \ neighbors.cc \ Packer.cc \ Parsing.cc \ peer_digest.cc \ + peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ peer_select.cc \ peer_sourcehash.h \ @@ -2224,6 +2317,7 @@ peer_userhash.h \ peer_userhash.cc \ pconn.cc \ + redirect.h \ redirect.cc \ refresh.h \ refresh.cc \ @@ -2239,15 +2333,20 @@ StatHist.h \ StatHist.cc \ stmem.cc \ + repl_modules.h \ store.cc \ store_client.cc \ + store_digest.h \ store_digest.cc \ store_dir.cc \ store_key_md5.h \ store_key_md5.cc \ store_io.cc \ + store_log.h \ store_log.cc \ + store_rebuild.h \ store_rebuild.cc \ + store_swapin.h \ store_swapin.cc \ store_swapmeta.cc \ store_swapout.cc \ @@ -2262,6 +2361,8 @@ StoreMetaVary.cc \ StoreSwapLogData.cc \ String.cc \ + StrList.h \ + StrList.cc \ SwapDir.cc \ tests/test_http_range.cc \ tests/stub_ipc_Forwarder.cc \ @@ -2275,6 +2376,7 @@ $(UNLINKDSOURCE) \ url.cc \ URLScheme.cc \ + urn.h \ urn.cc \ wccp2.h \ wccp2.cc \ @@ -2389,6 +2491,7 @@ BodyPipe.cc \ cache_manager.cc \ cache_cf.h \ + AuthReg.h \ cache_cf.cc \ debug.cc \ CacheDigest.h \ @@ -2457,15 +2560,20 @@ icp_v3.cc \ $(IPC_SOURCE) \ ipcache.cc \ + int.h \ int.cc \ internal.h \ internal.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ + multicast.h \ multicast.cc \ mem_node.cc \ MemBuf.cc \ MemObject.cc \ + mime.h \ mime.cc \ + mime_header.h \ mime_header.cc \ neighbors.h \ neighbors.cc \ @@ -2473,12 +2581,14 @@ Parsing.cc \ pconn.cc \ peer_digest.cc \ + peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ peer_select.cc \ peer_sourcehash.h \ peer_sourcehash.cc \ peer_userhash.h \ peer_userhash.cc \ + redirect.h \ redirect.cc \ refresh.h \ refresh.cc \ @@ -2494,15 +2604,20 @@ StatHist.h \ StatHist.cc \ stmem.cc \ + repl_modules.h \ store.cc \ store_client.cc \ + store_digest.h \ store_digest.cc \ store_dir.cc \ store_io.cc \ store_key_md5.h \ store_key_md5.cc \ + store_log.h \ store_log.cc \ + store_rebuild.h \ store_rebuild.cc \ + store_swapin.h \ store_swapin.cc \ store_swapmeta.cc \ store_swapout.cc \ @@ -2516,6 +2631,8 @@ StoreMetaURL.cc \ StoreMetaVary.cc \ StoreSwapLogData.cc \ + StrList.h \ + StrList.cc \ event.cc \ tools.h \ tools.cc \ @@ -2524,6 +2641,7 @@ MemStore.cc \ url.cc \ URLScheme.cc \ + urn.h \ urn.cc \ wccp2.h \ wccp2.cc \ @@ -2607,8 +2725,10 @@ HttpHeader.cc \ HttpMsg.cc \ HttpRequestMethod.cc \ + int.h \ int.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ Mem.h \ mem.cc \ mem_node.cc \ @@ -2624,6 +2744,7 @@ StatHist.h \ StatHist.cc \ stmem.cc \ + repl_modules.h \ store.cc \ store_dir.cc \ store_io.cc \ @@ -2640,6 +2761,8 @@ store_key_md5.h \ store_key_md5.cc \ String.cc \ + StrList.h \ + StrList.cc \ SwapDir.cc \ tests/CapturingStoreEntry.h \ log/access_log.h \ @@ -2665,10 +2788,12 @@ tests/stub_HttpRequest.cc \ tests/stub_libcomm.cc \ tests/stub_MemStore.cc \ + mime.h \ tests/stub_mime.cc \ tests/stub_Port.cc \ tests/stub_store_client.cc \ tests/stub_store_stats.cc \ + store_rebuild.h \ tests/stub_store_rebuild.cc \ tests/stub_store_swapout.cc \ tools.h \ @@ -2802,6 +2927,7 @@ internal.h \ tests/stub_internal.cc \ tests/stub_libformat.cc \ + store_rebuild.h \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ fd.h \ @@ -2815,8 +2941,10 @@ HttpBody.cc \ HttpReply.cc \ HttpStatusLine.cc \ + int.h \ int.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ MemObject.cc \ StoreSwapLogData.cc \ StoreIOState.cc \ @@ -2842,6 +2970,7 @@ HttpMsg.cc \ RemovalPolicy.cc \ store_dir.cc \ + repl_modules.h \ store.cc \ HttpRequestMethod.cc \ store_key_md5.h \ @@ -2860,6 +2989,7 @@ tests/stub_http.cc \ mem_node.cc \ stmem.cc \ + mime.h \ tests/stub_mime.cc \ HttpHeaderTools.h \ HttpHeaderTools.cc \ @@ -2881,6 +3011,8 @@ StatCounters.cc \ StatHist.h \ StatHist.cc \ + StrList.h \ + StrList.cc \ HttpHdrRange.cc \ ETag.cc \ tests/stub_errorpage.cc \ @@ -2973,8 +3105,10 @@ HttpReply.cc \ HttpRequestMethod.cc \ HttpStatusLine.cc \ + int.h \ int.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ Mem.h \ mem.cc \ MemBuf.cc \ @@ -2988,6 +3122,7 @@ StatHist.h \ tests/stub_StatHist.cc \ stmem.cc \ + repl_modules.h \ store.cc \ StoreFileSystem.cc \ StoreIOState.cc \ @@ -3006,6 +3141,8 @@ store_swapmeta.cc \ store_swapout.cc \ String.cc \ + StrList.h \ + StrList.cc \ SwapDir.cc \ tests/testRock.cc \ tests/testMain.cc \ @@ -3031,10 +3168,12 @@ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ tests/stub_MemStore.cc \ + mime.h \ tests/stub_mime.cc \ tests/stub_Port.cc \ tests/stub_pconn.cc \ tests/stub_store_client.cc \ + store_rebuild.h \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ tools.h \ @@ -3097,6 +3236,7 @@ tests/stub_internal.cc \ tests/stub_ipc.cc \ tests/stub_pconn.cc \ + store_rebuild.h \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ fd.h \ @@ -3109,8 +3249,10 @@ HttpBody.cc \ HttpReply.cc \ HttpStatusLine.cc \ + int.h \ int.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ MemObject.cc \ StoreSwapLogData.cc \ StoreIOState.cc \ @@ -3136,6 +3278,7 @@ HttpMsg.cc \ RemovalPolicy.cc \ store_dir.cc \ + repl_modules.h \ store.cc \ HttpRequestMethod.cc \ store_key_md5.h \ @@ -3153,6 +3296,7 @@ tests/stub_http.cc \ mem_node.cc \ stmem.cc \ + mime.h \ tests/stub_mime.cc \ HttpHeaderTools.h \ HttpHeaderTools.cc \ @@ -3243,6 +3387,7 @@ tests/testNull.h \ internal.h \ tests/stub_internal.cc \ + store_rebuild.h \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ fd.h \ @@ -3255,8 +3400,10 @@ HttpBody.cc \ HttpReply.cc \ HttpStatusLine.cc \ + int.h \ int.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ MemObject.cc \ StoreSwapLogData.cc \ StoreIOState.cc \ @@ -3282,6 +3429,7 @@ HttpMsg.cc \ RemovalPolicy.cc \ store_dir.cc \ + repl_modules.h \ store.cc \ HttpRequestMethod.cc \ store_key_md5.h \ @@ -3301,6 +3449,7 @@ tests/stub_http.cc \ mem_node.cc \ stmem.cc \ + mime.h \ tests/stub_mime.cc \ HttpHeaderTools.h \ HttpHeaderTools.cc \ @@ -3380,6 +3529,7 @@ $(ACL_REGISTRATION_SOURCES) \ BodyPipe.cc \ cache_cf.h \ + AuthReg.h \ cache_cf.cc \ cache_manager.cc \ CacheDigest.h \ @@ -3457,17 +3607,22 @@ icp_v3.cc \ $(IPC_SOURCE) \ ipcache.cc \ + int.h \ int.cc \ internal.h \ internal.cc \ - list.cc \ + SquidList.h \ + SquidList.cc \ + multicast.h \ multicast.cc \ Mem.h \ mem.cc \ mem_node.cc \ MemBuf.cc \ MemObject.cc \ + mime.h \ mime.cc \ + mime_header.h \ mime_header.cc \ neighbors.h \ neighbors.cc \ @@ -3475,12 +3630,14 @@ Parsing.cc \ pconn.cc \ peer_digest.cc \ + peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ peer_select.cc \ peer_sourcehash.h \ peer_sourcehash.cc \ peer_userhash.h \ peer_userhash.cc \ + redirect.h \ redirect.cc \ refresh.h \ refresh.cc \ @@ -3496,15 +3653,20 @@ StatHist.h \ tests/stub_StatHist.cc \ stmem.cc \ + repl_modules.h \ store.cc \ store_client.cc \ + store_digest.h \ store_digest.cc \ store_dir.cc \ store_io.cc \ store_key_md5.h \ store_key_md5.cc \ + store_log.h \ store_log.cc \ + store_rebuild.h \ store_rebuild.cc \ + store_swapin.h \ store_swapin.cc \ store_swapmeta.cc \ store_swapout.cc \ @@ -3519,6 +3681,8 @@ StoreMetaVary.cc \ StoreSwapLogData.cc \ String.cc \ + StrList.h \ + StrList.cc \ SwapDir.cc \ MemStore.cc \ tests/stub_debug.cc \ @@ -3537,6 +3701,7 @@ tunnel.cc \ url.cc \ URLScheme.cc \ + urn.h \ urn.cc \ wccp2.h \ wccp2.cc \ @@ -3639,9 +3804,11 @@ Mem.h \ tests/stub_mem.cc \ tests/stub_MemObject.cc \ + mime.h \ tests/stub_mime.cc \ tests/stub_pconn.cc \ tests/stub_stmem.cc \ + repl_modules.h \ tests/stub_store.cc \ tests/stub_store_stats.cc \ tools.h \ === modified file 'src/Mem.h' --- src/Mem.h 2012-08-28 19:12:13 +0000 +++ src/Mem.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 13 High Level Memory Pool Management * AUTHOR: Harvest Derived * === modified file 'src/MemBlob.cc' --- src/MemBlob.cc 2012-08-28 13:00:30 +0000 +++ src/MemBlob.cc 2012-08-31 16:57:39 +0000 @@ -33,7 +33,6 @@ #include "Debug.h" #include "Mem.h" #include "MemBlob.h" -#include "protos.h" #if HAVE_IOSTREAM #include === modified file 'src/MemBuf.cc' --- src/MemBuf.cc 2012-08-28 19:12:13 +0000 +++ src/MemBuf.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 59 auto-growing Memory Buffer with printf * AUTHOR: Alex Rousskov * @@ -103,7 +101,6 @@ #include "Mem.h" #include "MemBuf.h" #include "profiler/Profiler.h" -#include "protos.h" #ifdef VA_COPY #undef VA_COPY === modified file 'src/MemBuf.cci' --- src/MemBuf.cci 2009-01-21 03:47:47 +0000 +++ src/MemBuf.cci 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 59 auto-growing Memory Buffer with printf * AUTHOR: Robert Collins * === modified file 'src/MemBuf.h' --- src/MemBuf.h 2012-08-07 15:12:08 +0000 +++ src/MemBuf.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/MemObject.cc' --- src/MemObject.cc 2012-08-28 13:00:30 +0000 +++ src/MemObject.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Robert Collins * @@ -36,6 +34,7 @@ #include "squid.h" #include "comm/Connection.h" #include "Generic.h" +#include "globals.h" #include "HttpReply.h" #include "HttpRequest.h" #include "MemBuf.h" @@ -43,7 +42,6 @@ #include "profiler/Profiler.h" #include "Store.h" #include "StoreClient.h" -#include "protos.h" #if USE_DELAY_POOLS #include "DelayPools.h" === modified file 'src/MemObject.h' --- src/MemObject.h 2012-08-28 13:00:30 +0000 +++ src/MemObject.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/MemStore.cc' --- src/MemStore.cc 2012-08-28 13:00:30 +0000 +++ src/MemStore.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 20 Memory Cache * */ @@ -12,8 +10,9 @@ #include "ipc/mem/Pages.h" #include "MemObject.h" #include "MemStore.h" -#include "protos.h" +#include "mime_header.h" #include "StoreStats.h" +#include "tools.h" /// shared memory segment path to use for MemStore maps static const char *ShmLabel = "cache_mem"; === modified file 'src/NullDelayId.cc' --- src/NullDelayId.cc 2012-08-14 11:53:07 +0000 +++ src/NullDelayId.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/NullDelayId.h' --- src/NullDelayId.h 2012-08-14 11:53:07 +0000 +++ src/NullDelayId.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins * Based upon original delay pools code by === modified file 'src/Packer.cc' --- src/Packer.cc 2012-08-28 13:00:30 +0000 +++ src/Packer.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 60 Packer: A uniform interface to store-like modules * AUTHOR: Alex Rousskov * === modified file 'src/Packer.h' --- src/Packer.h 2012-08-28 13:00:30 +0000 +++ src/Packer.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/Parsing.cc' --- src/Parsing.cc 2012-08-28 19:12:13 +0000 +++ src/Parsing.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration File Parsing * AUTHOR: Harvest Derived * @@ -36,7 +34,6 @@ #include "cache_cf.h" #include "compat/strtoll.h" #include "Parsing.h" -#include "protos.h" /* * These functions is the same as atoi/l/f, except that they check for errors === modified file 'src/Parsing.h' --- src/Parsing.h 2012-08-14 11:53:07 +0000 +++ src/Parsing.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration File Parsing * AUTHOR: Harvest Derived * === modified file 'src/PeerDigest.h' --- src/PeerDigest.h 2012-08-29 00:12:28 +0000 +++ src/PeerDigest.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/PingData.h' --- src/PingData.h 2010-11-21 04:40:05 +0000 +++ src/PingData.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ProfStats.cc' --- src/ProfStats.cc 2012-08-14 11:53:07 +0000 +++ src/ProfStats.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 81 CPU Profiling Routines * AUTHOR: Andres Kroonmaa * === modified file 'src/RemovalPolicy.cc' --- src/RemovalPolicy.cc 2012-01-20 18:55:04 +0000 +++ src/RemovalPolicy.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: none Common Removal Policy * AUTHOR: Robert Collins * === modified file 'src/RemovalPolicy.h' --- src/RemovalPolicy.h 2012-08-28 13:00:30 +0000 +++ src/RemovalPolicy.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/Server.cc' --- src/Server.cc 2012-08-28 19:12:13 +0000 +++ src/Server.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: * AUTHOR: Duane Wessels * @@ -43,7 +41,6 @@ #include "errorpage.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "protos.h" #include "Server.h" #include "SquidTime.h" #include "StatCounters.h" === modified file 'src/Server.h' --- src/Server.h 2011-11-18 16:53:45 +0000 +++ src/Server.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Duane Wessels * * SQUID Web Proxy Cache http://www.squid-cache.org/ === added file 'src/SquidIpc.h' --- src/SquidIpc.h 1970-01-01 00:00:00 +0000 +++ src/SquidIpc.h 2012-09-03 09:02:20 +0000 @@ -0,0 +1,47 @@ +#ifndef SQUID_SQUIDIPC_H_ +#define SQUID_SQUIDIPC_H_ +/* + * DEBUG: section 54 Interprocess Communication + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +namespace Ip { + class Address; +} +extern pid_t ipcCreate(int type, + const char *prog, + const char *const args[], + const char *name, + Ip::Address &local_addr, + int *rfd, + int *wfd, + void **hIpc); + +#endif /* SQUID_SQUIDIPC_H_ */ === renamed file 'src/list.cc' => 'src/SquidList.cc' --- src/list.cc 2012-08-28 19:12:13 +0000 +++ src/SquidList.cc 2012-08-31 08:48:38 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: none Linked list functions (deprecated) * AUTHOR: Harvest Derived * @@ -35,7 +33,7 @@ #include "squid.h" #include "Mem.h" -#include "protos.h" +#include "SquidList.h" #include "typedefs.h" /* This should go away, in favour of the List template class */ === added file 'src/SquidList.h' --- src/SquidList.h 1970-01-01 00:00:00 +0000 +++ src/SquidList.h 2012-08-31 08:48:38 +0000 @@ -0,0 +1,44 @@ +#ifndef SQUID_SQUIDLIST_H_ +#define SQUID_SQUIDLIST_H_ +/* + * DEBUG: none Linked list functions (deprecated) + * AUTHOR: Harvest Derived + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +class link_list { + public: + void *ptr; + link_list *next; +}; + +extern void linklistPush(link_list **, void *); +extern void *linklistShift(link_list **); + +#endif /* SQUID_SQUIDLIST_H_ */ === modified file 'src/SquidNew.cc' --- src/SquidNew.cc 2012-08-28 13:00:30 +0000 +++ src/SquidNew.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: none Memory Allocation * AUTHOR: Robert Collins * === modified file 'src/SquidString.h' --- src/SquidString.h 2012-08-28 13:00:30 +0000 +++ src/SquidString.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 67 String * AUTHOR: Duane Wessels * @@ -185,4 +183,9 @@ #include "String.cci" #endif +extern const char *checkNullString(const char *p); +extern int stringHasWhitespace(const char *); +extern int stringHasCntl(const char *); +extern char *strwordtok(char *buf, char **t); + #endif /* SQUID_STRING_H */ === modified file 'src/Store.cci' --- src/Store.cci 2009-01-21 03:47:47 +0000 +++ src/Store.cci 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived * === modified file 'src/Store.h' --- src/Store.h 2012-08-28 13:00:30 +0000 +++ src/Store.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreClient.h' --- src/StoreClient.h 2012-08-28 13:00:30 +0000 +++ src/StoreClient.h 2012-09-03 09:02:20 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -127,6 +125,11 @@ CBDATA_CLASS(store_client); }; -SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *); +extern void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *); +extern store_client* storeClientListAdd(StoreEntry * e, void *data); +extern int storeClientCopyPending(store_client *, StoreEntry * e, void *data); +extern int storeUnregister(store_client * sc, StoreEntry * e, void *data); +extern int storePendingNClients(const StoreEntry * e); +extern int storeClientIsThisAClient(store_client * sc, void *someClient); #endif /* SQUID_STORECLIENT_H */ === modified file 'src/StoreEntryStream.h' --- src/StoreEntryStream.h 2011-08-02 07:31:53 +0000 +++ src/StoreEntryStream.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreFileSystem.cc' --- src/StoreFileSystem.cc 2012-08-14 11:53:07 +0000 +++ src/StoreFileSystem.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 92 Storage File System * AUTHOR: Robert Collins * === modified file 'src/StoreFileSystem.h' --- src/StoreFileSystem.h 2012-08-28 13:00:30 +0000 +++ src/StoreFileSystem.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/StoreHashIndex.h' --- src/StoreHashIndex.h 2011-10-14 16:21:48 +0000 +++ src/StoreHashIndex.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreIOBuffer.h' --- src/StoreIOBuffer.h 2011-11-18 16:53:45 +0000 +++ src/StoreIOBuffer.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreIOState.cc' --- src/StoreIOState.cc 2012-08-14 11:53:07 +0000 +++ src/StoreIOState.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Swap Dir base object * AUTHOR: Robert Collins * === modified file 'src/StoreIOState.h' --- src/StoreIOState.h 2011-09-06 22:32:30 +0000 +++ src/StoreIOState.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMeta.cc' --- src/StoreMeta.cc 2012-08-28 13:00:30 +0000 +++ src/StoreMeta.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Metadata * AUTHOR: Kostas Anagnostakis * === modified file 'src/StoreMeta.h' --- src/StoreMeta.h 2011-08-30 15:04:30 +0000 +++ src/StoreMeta.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMetaMD5.cc' --- src/StoreMetaMD5.cc 2012-08-14 11:53:07 +0000 +++ src/StoreMetaMD5.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Metadata * AUTHOR: Kostas Anagnostakis * @@ -34,9 +32,9 @@ */ #include "squid.h" +#include "int.h" #include "md5.h" #include "MemObject.h" -#include "protos.h" #include "Store.h" #include "StoreMetaMD5.h" === modified file 'src/StoreMetaMD5.h' --- src/StoreMetaMD5.h 2009-01-21 03:47:47 +0000 +++ src/StoreMetaMD5.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMetaObjSize.h' --- src/StoreMetaObjSize.h 2009-01-21 03:47:47 +0000 +++ src/StoreMetaObjSize.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMetaSTD.cc' --- src/StoreMetaSTD.cc 2012-08-14 11:53:07 +0000 +++ src/StoreMetaSTD.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Metadata * AUTHOR: Kostas Anagnostakis * === modified file 'src/StoreMetaSTD.h' --- src/StoreMetaSTD.h 2009-01-21 03:47:47 +0000 +++ src/StoreMetaSTD.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMetaSTDLFS.cc' --- src/StoreMetaSTDLFS.cc 2012-08-14 11:53:07 +0000 +++ src/StoreMetaSTDLFS.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Metadata * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/StoreMetaSTDLFS.h' --- src/StoreMetaSTDLFS.h 2009-01-21 03:47:47 +0000 +++ src/StoreMetaSTDLFS.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMetaURL.cc' --- src/StoreMetaURL.cc 2012-08-14 11:53:07 +0000 +++ src/StoreMetaURL.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Metadata * AUTHOR: Kostas Anagnostakis * === modified file 'src/StoreMetaURL.h' --- src/StoreMetaURL.h 2009-01-21 03:47:47 +0000 +++ src/StoreMetaURL.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMetaUnpacker.cc' --- src/StoreMetaUnpacker.cc 2012-08-14 11:53:07 +0000 +++ src/StoreMetaUnpacker.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Unpacker * AUTHOR: Robert Collins * === modified file 'src/StoreMetaUnpacker.h' --- src/StoreMetaUnpacker.h 2011-01-27 21:14:56 +0000 +++ src/StoreMetaUnpacker.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreMetaVary.cc' --- src/StoreMetaVary.cc 2012-08-14 11:53:07 +0000 +++ src/StoreMetaVary.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Metadata * AUTHOR: Kostas Anagnostakis * === modified file 'src/StoreMetaVary.h' --- src/StoreMetaVary.h 2009-01-21 03:47:47 +0000 +++ src/StoreMetaVary.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/StoreSearch.h' --- src/StoreSearch.h 2012-08-14 11:53:07 +0000 +++ src/StoreSearch.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/StoreStats.cc' --- src/StoreStats.cc 2012-08-28 13:00:30 +0000 +++ src/StoreStats.cc 2012-09-01 14:38:36 +0000 @@ -1,12 +1,10 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Statistics * */ #include "squid.h" -#include "protos.h" /* for xmemset only */ +#include "tools.h" #include "StoreStats.h" /* StoreInfoStats */ === modified file 'src/StoreSwapLogData.cc' --- src/StoreSwapLogData.cc 2012-04-11 00:15:57 +0000 +++ src/StoreSwapLogData.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels * === modified file 'src/StoreSwapLogData.h' --- src/StoreSwapLogData.h 2012-08-28 13:00:30 +0000 +++ src/StoreSwapLogData.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === added file 'src/StrList.cc' --- src/StrList.cc 1970-01-01 00:00:00 +0000 +++ src/StrList.cc 2012-08-29 09:34:34 +0000 @@ -0,0 +1,151 @@ +/* + * DEBUG: section 66 HTTP Header Tools + * AUTHOR: Alex Rousskov + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#include "squid.h" +#include "SquidString.h" +#include "StrList.h" + +/** appends an item to the list */ +void +strListAdd(String * str, const char *item, char del) +{ + assert(str && item); + if (str->size()) { + char buf[3]; + buf[0] = del; + buf[1] = ' '; + buf[2] = '\0'; + str->append(buf, 2); + } + str->append(item, strlen(item)); +} + +/** returns true iff "m" is a member of the list */ +int +strListIsMember(const String * list, const char *m, char del) +{ + const char *pos = NULL; + const char *item; + int ilen = 0; + int mlen; + + assert(list && m); + mlen = strlen(m); + while (strListGetItem(list, del, &item, &ilen, &pos)) { + if (mlen == ilen && !strncasecmp(item, m, ilen)) + return 1; + } + return 0; +} + +/** returns true iff "s" is a substring of a member of the list */ +int +strListIsSubstr(const String * list, const char *s, char del) +{ + assert(list && del); + return (list->find(s) != String::npos); + + /** \note + * Note: the original code with a loop is broken because it uses strstr() + * instead of strnstr(). If 's' contains a 'del', strListIsSubstr() may + * return true when it should not. If 's' does not contain a 'del', the + * implementaion is equavalent to strstr()! Thus, we replace the loop with + * strstr() above until strnstr() is available. + */ +} + +/** + * iterates through a 0-terminated string of items separated by 'del's. + * white space around 'del' is considered to be a part of 'del' + * like strtok, but preserves the source, and can iterate several strings at once + * + * returns true if next item is found. + * init pos with NULL to start iteration. + */ +int +strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos) +{ + size_t len; + /* ',' is always enabled as field delimiter as this is required for + * processing merged header values properly, even if Cookie normally + * uses ';' as delimiter. + */ + static char delim[3][8] = { + "\"?,", + "\"\\", + " ?,\t\r\n" + }; + int quoted = 0; + assert(str && item && pos); + + delim[0][1] = del; + delim[2][1] = del; + + if (!*pos) { + *pos = str->termedBuf(); + + if (!*pos) + return 0; + } + + /* skip leading whitespace and delimiters */ + *pos += strspn(*pos, delim[2]); + + *item = *pos; /* remember item's start */ + + /* find next delimiter */ + do { + *pos += strcspn(*pos, delim[quoted]); + if (**pos == '"') { + quoted = !quoted; + *pos += 1; + } else if (quoted && **pos == '\\') { + *pos += 1; + if (**pos) + *pos += 1; + } else { + break; /* Delimiter found, marking the end of this value */ + } + } while (**pos); + + len = *pos - *item; /* *pos points to del or '\0' */ + + /* rtrim */ + while (len > 0 && xisspace((*item)[len - 1])) + --len; + + if (ilen) + *ilen = len; + + return len > 0; +} + === added file 'src/StrList.h' --- src/StrList.h 1970-01-01 00:00:00 +0000 +++ src/StrList.h 2012-08-29 09:34:34 +0000 @@ -0,0 +1,43 @@ +/* + * DEBUG: section 66 HTTP Header Tools + * AUTHOR: Alex Rousskov + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef SQUID_STRLIST_H_ +#define SQUID_STRLIST_H_ + +class String; + +extern void strListAdd(String * str, const char *item, char del); +extern int strListIsMember(const String * str, const char *item, char del); +extern int strListIsSubstr(const String * list, const char *s, char del); +extern int strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos); + +#endif /* SQUID_STRLIST_H_ */ === modified file 'src/String.cc' --- src/String.cc 2012-08-28 19:12:13 +0000 +++ src/String.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 67 String * AUTHOR: Duane Wessels * @@ -38,7 +36,6 @@ #include "Mem.h" #include "mgr/Registration.h" #include "profiler/Profiler.h" -#include "protos.h" #include "Store.h" #if HAVE_LIMITS_H === modified file 'src/String.cci' --- src/String.cci 2012-08-28 13:00:30 +0000 +++ src/String.cci 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 67 String * AUTHOR: Duane Wessels * === modified file 'src/SwapDir.cc' --- src/SwapDir.cc 2012-08-28 19:12:13 +0000 +++ src/SwapDir.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 20 Swap Dir base object * AUTHOR: Robert Collins * @@ -36,10 +34,11 @@ #include "cache_cf.h" #include "compat/strtoll.h" #include "ConfigOption.h" +#include "globals.h" #include "Parsing.h" -#include "protos.h" #include "StoreFileSystem.h" #include "SwapDir.h" +#include "tools.h" SwapDir::SwapDir(char const *aType): theType(aType), max_size(0), === modified file 'src/SwapDir.h' --- src/SwapDir.h 2012-07-13 14:33:19 +0000 +++ src/SwapDir.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/URL.h' --- src/URL.h 2012-08-29 00:12:28 +0000 +++ src/URL.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/URLScheme.cc' --- src/URLScheme.cc 2012-01-20 18:55:04 +0000 +++ src/URLScheme.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 23 URL Scheme parsing * AUTHOR: Robert Collins * === modified file 'src/URLScheme.h' --- src/URLScheme.h 2011-03-02 07:27:24 +0000 +++ src/URLScheme.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/WinSvc.cc' --- src/WinSvc.cc 2012-08-14 11:53:07 +0000 +++ src/WinSvc.cc 2012-09-01 10:40:00 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * Windows support * AUTHOR: Guido Serassio * inspired by previous work by Romeo Anghelache & Eric Stern. @@ -35,6 +32,7 @@ */ #include "squid.h" +#include "protos.h" #include "squid_windows.h" #if _SQUID_MSWIN_ @@ -47,6 +45,10 @@ #endif #endif +/* forward declarations */ +static void WIN32_Exit(void); +static void WIN32_Abort(int); + static unsigned int GetOSVersion(); void WIN32_svcstatusupdate(DWORD, DWORD); void WINAPI WIN32_svcHandler(DWORD); @@ -57,7 +59,6 @@ #endif extern "C" void WINAPI SquidWinSvcMain(DWORD, char **); -#if _SQUID_MSWIN_ #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ void Squid_Win32InvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); #endif @@ -67,7 +68,6 @@ void WIN32_ExceptionHandlerCleanup(void); static int s_iInitCount = 0; static HANDLE NotifyAddrChange_thread = INVALID_HANDLE_VALUE; -#endif /* _SQUID_MSWIN_ */ static int Squid_Aborting = 0; @@ -401,7 +401,6 @@ WIN32_Exit(); } -#if _SQUID_MSWIN_ void WIN32_IpAddrChangeMonitorExit() { @@ -412,14 +411,11 @@ CloseHandle(NotifyAddrChange_thread); } } -#endif void WIN32_Exit() { -#if _SQUID_MSWIN_ Win32SockCleanup(); -#endif #if USE_WIN32_SERVICE if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) { @@ -430,19 +426,14 @@ } #endif -#if _SQUID_MSWIN_ if (dbg_mutex) DeleteCriticalSection(dbg_mutex); WIN32_ExceptionHandlerCleanup(); WIN32_IpAddrChangeMonitorExit(); - -#endif - _exit(0); } -#if _SQUID_MSWIN_ static DWORD WINAPI WIN32_IpAddrChangeMonitor(LPVOID lpParam) { @@ -484,7 +475,6 @@ } return status; } -#endif /* _SQUID_MSWIN_ */ int WIN32_Subsystem_Init(int * argc, char *** argv) { @@ -580,20 +570,15 @@ svcStatus.dwCheckPoint = 0; svcStatus.dwWaitHint = 10000; SetServiceStatus(svcHandle, &svcStatus); -#if _SQUID_MSWIN_ _setmaxstdio(Squid_MaxFD); -#endif } #endif /* USE_WIN32_SERVICE */ -#if _SQUID_MSWIN_ if (Win32SockInit() < 0) return 1; -#endif - return 0; } @@ -964,12 +949,8 @@ } } else { WIN32_run_mode = _WIN_SQUID_RUN_MODE_INTERACTIVE; -#if _SQUID_MSWIN_ - opt_no_daemon = 1; -#endif - return SquidMain(argc, argv); } @@ -978,7 +959,6 @@ #endif /* USE_WIN32_SERVICE */ -#if _SQUID_MSWIN_ static int Win32SockInit(void) { int iVersionRequested; @@ -1042,5 +1022,3 @@ { return; } - -#endif /* SQUID_MSWIN_ */ === added file 'src/WinSvc.h' --- src/WinSvc.h 1970-01-01 00:00:00 +0000 +++ src/WinSvc.h 2012-09-03 09:02:20 +0000 @@ -0,0 +1,50 @@ +#ifndef WINSVC_H_ +#define WINSVC_H_ +/* + * DEBUG: none + * AUTHOR: Guido Serassio + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#if _SQUID_WINDOWS_ +extern int WIN32_Subsystem_Init(int *, char ***); +extern void WIN32_sendSignal(int); +extern void WIN32_SetServiceCommandLine(void); +extern void WIN32_InstallService(void); +extern void WIN32_RemoveService(void); +extern int SquidMain(int, char **); +#else /* _SQUID_WINDOWS_ */ +inline int WIN32_Subsystem_Init(int *foo, char ***bar) {return 0; } /* NOP */ +inline void WIN32_sendSignal(int foo) { return; } /* NOP */ +inline void WIN32_SetServiceCommandLine(void) {} /* NOP */ +inline void WIN32_InstallService(void) {} /* NOP */ +inline void WIN32_RemoveService(void) {} /* NOP */ +#endif /* _SQUID_WINDOWS_ */ + +#endif /* WINSVC_H_ */ === modified file 'src/acl/Acl.cc' --- src/acl/Acl.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Acl.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/Acl.h' --- src/acl/Acl.h 2012-08-28 13:00:30 +0000 +++ src/acl/Acl.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Arp.cc' --- src/acl/Arp.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Arp.cc 2012-08-31 16:57:39 +0000 @@ -38,10 +38,10 @@ #include "acl/Arp.h" #include "acl/FilledChecklist.h" +#include "cache_cf.h" #include "Debug.h" #include "eui/Eui48.h" #include "ip/Address.h" -#include "protos.h" #include "wordlist.h" static void aclParseArpList(SplayNode **curlist); === modified file 'src/acl/Arp.h' --- src/acl/Arp.h 2009-11-01 00:13:06 +0000 +++ src/acl/Arp.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Asn.cc' --- src/acl/Asn.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Asn.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 53 AS Number handling * AUTHOR: Duane Wessels, Kostas Anagnostakis * @@ -45,10 +43,11 @@ #include "acl/SourceAsn.h" #include "acl/DestinationAsn.h" #include "acl/DestinationIp.h" +#include "cache_cf.h" #include "HttpReply.h" #include "ipcache.h" #include "forward.h" -#include "protos.h" +#include "StoreClient.h" #include "wordlist.h" #define WHOIS_PORT 43 === modified file 'src/acl/Browser.cc' --- src/acl/Browser.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Browser.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/Browser.h' --- src/acl/Browser.h 2009-03-08 19:34:36 +0000 +++ src/acl/Browser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Certificate.cc' --- src/acl/Certificate.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Certificate.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/Certificate.h' --- src/acl/Certificate.h 2010-11-18 08:01:53 +0000 +++ src/acl/Certificate.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/CertificateData.cc' --- src/acl/CertificateData.cc 2012-08-28 19:12:13 +0000 +++ src/acl/CertificateData.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -38,7 +36,6 @@ #include "acl/CertificateData.h" #include "acl/Checklist.h" #include "cache_cf.h" -#include "protos.h" #include "wordlist.h" ACLCertificateData::ACLCertificateData(SSLGETATTRIBUTE *sslStrategy) : attribute (NULL), values (), sslAttributeCall (sslStrategy) === modified file 'src/acl/CertificateData.h' --- src/acl/CertificateData.h 2010-11-18 08:01:53 +0000 +++ src/acl/CertificateData.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Checklist.cc' --- src/acl/Checklist.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Checklist.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/Checklist.h' --- src/acl/Checklist.h 2012-08-28 13:00:30 +0000 +++ src/acl/Checklist.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Data.h' --- src/acl/Data.h 2009-03-08 19:34:36 +0000 +++ src/acl/Data.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/DestinationDomain.cc' --- src/acl/DestinationDomain.cc 2012-08-28 19:12:13 +0000 +++ src/acl/DestinationDomain.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -42,7 +40,6 @@ #include "fqdncache.h" #include "HttpRequest.h" #include "ipcache.h" -#include "protos.h" DestinationDomainLookup DestinationDomainLookup::instance_; === modified file 'src/acl/DestinationDomain.h' --- src/acl/DestinationDomain.h 2011-11-10 01:35:23 +0000 +++ src/acl/DestinationDomain.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/DestinationIp.cc' --- src/acl/DestinationIp.cc 2012-08-28 13:00:30 +0000 +++ src/acl/DestinationIp.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/DestinationIp.h' --- src/acl/DestinationIp.h 2011-05-15 08:42:17 +0000 +++ src/acl/DestinationIp.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/DomainData.cc' --- src/acl/DomainData.cc 2012-08-28 19:12:13 +0000 +++ src/acl/DomainData.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -39,7 +37,6 @@ #include "acl/Checklist.h" #include "cache_cf.h" #include "Debug.h" -#include "protos.h" #include "wordlist.h" #include "URL.h" === modified file 'src/acl/DomainData.h' --- src/acl/DomainData.h 2009-03-31 12:39:30 +0000 +++ src/acl/DomainData.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Eui64.cc' --- src/acl/Eui64.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Eui64.cc 2012-08-31 16:57:39 +0000 @@ -38,10 +38,10 @@ #include "acl/Eui64.h" #include "acl/FilledChecklist.h" +#include "cache_cf.h" #include "Debug.h" #include "eui/Eui64.h" #include "ip/Address.h" -#include "protos.h" #include "wordlist.h" static void aclParseEuiList(SplayNode **curlist); === modified file 'src/acl/ExtUser.cc' --- src/acl/ExtUser.cc 2012-08-14 11:53:07 +0000 +++ src/acl/ExtUser.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/ExtUser.h' --- src/acl/ExtUser.h 2011-02-07 10:27:53 +0000 +++ src/acl/ExtUser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Gadgets.cc' --- src/acl/Gadgets.cc 2012-08-28 19:12:13 +0000 +++ src/acl/Gadgets.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -48,7 +46,6 @@ #include "globals.h" #include "HttpRequest.h" #include "Mem.h" -#include "protos.h" /* does name lookup, returns page_id */ err_type === modified file 'src/acl/HierCodeData.cc' --- src/acl/HierCodeData.cc 2012-08-14 11:53:07 +0000 +++ src/acl/HierCodeData.cc 2012-08-31 16:57:39 +0000 @@ -1,8 +1,8 @@ #include "squid.h" #include "acl/HierCodeData.h" #include "acl/Checklist.h" +#include "cache_cf.h" #include "hier_code.h" -#include "protos.h" #include "wordlist.h" ACLHierCodeData::ACLHierCodeData() === modified file 'src/acl/HttpHeaderData.cc' --- src/acl/HttpHeaderData.cc 2012-08-28 19:12:13 +0000 +++ src/acl/HttpHeaderData.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -39,8 +37,8 @@ #include "acl/Checklist.h" #include "acl/Acl.h" #include "acl/RegexData.h" +#include "cache_cf.h" #include "Debug.h" -#include "protos.h" #include "wordlist.h" #include "ConfigParser.h" #include "HttpHeaderTools.h" === modified file 'src/acl/HttpHeaderData.h' --- src/acl/HttpHeaderData.h 2009-03-08 19:34:36 +0000 +++ src/acl/HttpHeaderData.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/HttpRepHeader.cc' --- src/acl/HttpRepHeader.cc 2012-08-28 13:00:30 +0000 +++ src/acl/HttpRepHeader.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/HttpRepHeader.h' --- src/acl/HttpRepHeader.h 2009-03-08 21:53:27 +0000 +++ src/acl/HttpRepHeader.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/HttpReqHeader.cc' --- src/acl/HttpReqHeader.cc 2012-08-28 13:00:30 +0000 +++ src/acl/HttpReqHeader.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/HttpReqHeader.h' --- src/acl/HttpReqHeader.h 2009-03-08 21:53:27 +0000 +++ src/acl/HttpReqHeader.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/HttpStatus.cc' --- src/acl/HttpStatus.cc 2012-08-28 13:00:30 +0000 +++ src/acl/HttpStatus.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -37,9 +35,9 @@ #include "squid.h" #include "acl/HttpStatus.h" #include "acl/FilledChecklist.h" +#include "cache_cf.h" #include "Debug.h" #include "HttpReply.h" -#include "protos.h" #include "wordlist.h" #if HAVE_LIMITS_H === modified file 'src/acl/HttpStatus.h' --- src/acl/HttpStatus.h 2009-03-31 12:39:30 +0000 +++ src/acl/HttpStatus.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/IntRange.cc' --- src/acl/IntRange.cc 2012-08-28 19:12:13 +0000 +++ src/acl/IntRange.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Robert Collins * @@ -40,7 +38,6 @@ #include "Debug.h" #include "wordlist.h" #include "Parsing.h" -#include "protos.h" /* explicit instantiation required for some systems */ /** \cond AUTODOCS-IGNORE */ === modified file 'src/acl/IntRange.h' --- src/acl/IntRange.h 2009-03-08 19:34:36 +0000 +++ src/acl/IntRange.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Ip.cc' --- src/acl/Ip.cc 2012-08-28 19:12:13 +0000 +++ src/acl/Ip.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -40,7 +38,6 @@ #include "Debug.h" #include "ip/tools.h" #include "MemBuf.h" -#include "protos.h" #include "wordlist.h" void * === modified file 'src/acl/LocalIp.cc' --- src/acl/LocalIp.cc 2012-08-28 13:00:30 +0000 +++ src/acl/LocalIp.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/LocalIp.h' --- src/acl/LocalIp.h 2011-06-20 08:51:32 +0000 +++ src/acl/LocalIp.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/LocalPort.cc' --- src/acl/LocalPort.cc 2012-08-14 11:53:07 +0000 +++ src/acl/LocalPort.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/LocalPort.h' --- src/acl/LocalPort.h 2011-06-20 08:51:32 +0000 +++ src/acl/LocalPort.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/MaxConnection.cc' --- src/acl/MaxConnection.cc 2012-08-28 19:12:13 +0000 +++ src/acl/MaxConnection.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -37,9 +35,9 @@ #include "squid.h" #include "acl/FilledChecklist.h" #include "acl/MaxConnection.h" +#include "cache_cf.h" #include "client_db.h" #include "Debug.h" -#include "protos.h" #include "wordlist.h" ACL * === modified file 'src/acl/MaxConnection.h' --- src/acl/MaxConnection.h 2009-03-31 12:39:30 +0000 +++ src/acl/MaxConnection.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Method.cc' --- src/acl/Method.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Method.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Method.h' --- src/acl/Method.h 2012-08-15 15:17:32 +0000 +++ src/acl/Method.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/MethodData.cc' --- src/acl/MethodData.cc 2012-08-14 11:53:07 +0000 +++ src/acl/MethodData.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -37,8 +35,8 @@ #include "squid.h" #include "acl/MethodData.h" #include "acl/Checklist.h" +#include "cache_cf.h" #include "HttpRequestMethod.h" -#include "protos.h" #include "wordlist.h" int ACLMethodData::ThePurgeCount = 0; === modified file 'src/acl/MethodData.h' --- src/acl/MethodData.h 2012-08-14 11:53:07 +0000 +++ src/acl/MethodData.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/MyPortName.cc' --- src/acl/MyPortName.cc 2012-08-14 11:53:07 +0000 +++ src/acl/MyPortName.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/MyPortName.h' --- src/acl/MyPortName.h 2009-03-08 21:53:27 +0000 +++ src/acl/MyPortName.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Protocol.cc' --- src/acl/Protocol.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Protocol.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Protocol.h' --- src/acl/Protocol.h 2011-03-02 07:27:24 +0000 +++ src/acl/Protocol.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/ProtocolData.cc' --- src/acl/ProtocolData.cc 2012-08-14 11:53:07 +0000 +++ src/acl/ProtocolData.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -37,8 +35,8 @@ #include "squid.h" #include "acl/ProtocolData.h" #include "acl/Checklist.h" +#include "cache_cf.h" #include "Debug.h" -#include "protos.h" #include "URLScheme.h" #include "wordlist.h" === modified file 'src/acl/ProtocolData.h' --- src/acl/ProtocolData.h 2011-03-02 07:27:24 +0000 +++ src/acl/ProtocolData.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Random.cc' --- src/acl/Random.cc 2012-08-28 19:12:13 +0000 +++ src/acl/Random.cc 2012-08-31 16:57:39 +0000 @@ -39,7 +39,6 @@ #include "cache_cf.h" #include "Debug.h" #include "Parsing.h" -#include "protos.h" #include "wordlist.h" ACL * === modified file 'src/acl/Referer.cc' --- src/acl/Referer.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Referer.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/Referer.h' --- src/acl/Referer.h 2009-03-08 19:34:36 +0000 +++ src/acl/Referer.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/RegexData.cc' --- src/acl/RegexData.cc 2012-08-28 19:12:13 +0000 +++ src/acl/RegexData.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * AUTHOR: Marcus Kool @@ -43,7 +41,6 @@ #include "ConfigParser.h" #include "Debug.h" #include "Mem.h" -#include "protos.h" #include "wordlist.h" static void === modified file 'src/acl/RegexData.h' --- src/acl/RegexData.h 2009-03-08 19:34:36 +0000 +++ src/acl/RegexData.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/ReplyHeaderStrategy.h' --- src/acl/ReplyHeaderStrategy.h 2009-03-08 21:53:27 +0000 +++ src/acl/ReplyHeaderStrategy.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/ReplyMimeType.cc' --- src/acl/ReplyMimeType.cc 2012-08-28 13:00:30 +0000 +++ src/acl/ReplyMimeType.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/ReplyMimeType.h' --- src/acl/ReplyMimeType.h 2009-03-08 21:53:27 +0000 +++ src/acl/ReplyMimeType.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/RequestHeaderStrategy.h' --- src/acl/RequestHeaderStrategy.h 2009-03-08 21:53:27 +0000 +++ src/acl/RequestHeaderStrategy.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/RequestMimeType.cc' --- src/acl/RequestMimeType.cc 2012-08-28 13:00:30 +0000 +++ src/acl/RequestMimeType.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/RequestMimeType.h' --- src/acl/RequestMimeType.h 2009-03-08 21:53:27 +0000 +++ src/acl/RequestMimeType.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/SourceDomain.cc' --- src/acl/SourceDomain.cc 2012-08-28 19:12:13 +0000 +++ src/acl/SourceDomain.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -41,7 +39,6 @@ #include "acl/DomainData.h" #include "fqdncache.h" #include "HttpRequest.h" -#include "protos.h" SourceDomainLookup SourceDomainLookup::instance_; === modified file 'src/acl/SourceDomain.h' --- src/acl/SourceDomain.h 2009-07-12 22:56:47 +0000 +++ src/acl/SourceDomain.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/SourceIp.cc' --- src/acl/SourceIp.cc 2012-08-28 13:00:30 +0000 +++ src/acl/SourceIp.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/SourceIp.h' --- src/acl/SourceIp.h 2009-03-31 12:39:30 +0000 +++ src/acl/SourceIp.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/SslErrorData.cc' --- src/acl/SslErrorData.cc 2012-08-14 11:53:07 +0000 +++ src/acl/SslErrorData.cc 2012-08-31 16:57:39 +0000 @@ -1,11 +1,40 @@ /* - * $Id$ + * DEBUG: none + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + * + * Copyright (c) 2003, Robert Collins */ #include "squid.h" #include "acl/SslErrorData.h" #include "acl/Checklist.h" -#include "protos.h" +#include "cache_cf.h" #include "wordlist.h" ACLSslErrorData::ACLSslErrorData() : values (NULL) === modified file 'src/acl/Strategised.cc' --- src/acl/Strategised.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Strategised.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/Strategised.h' --- src/acl/Strategised.h 2010-03-21 03:08:26 +0000 +++ src/acl/Strategised.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Strategy.h' --- src/acl/Strategy.h 2009-03-08 21:57:12 +0000 +++ src/acl/Strategy.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/StringData.cc' --- src/acl/StringData.cc 2012-08-14 11:53:07 +0000 +++ src/acl/StringData.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -37,7 +35,8 @@ #include "squid.h" #include "acl/StringData.h" #include "acl/Checklist.h" -#include "protos.h" +#include "cache_cf.h" +#include "Debug.h" #include "wordlist.h" ACLStringData::ACLStringData() : values (NULL) === modified file 'src/acl/StringData.h' --- src/acl/StringData.h 2012-08-28 13:00:30 +0000 +++ src/acl/StringData.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Tag.h' --- src/acl/Tag.h 2009-06-14 12:18:00 +0000 +++ src/acl/Tag.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Time.cc' --- src/acl/Time.cc 2012-08-28 13:00:30 +0000 +++ src/acl/Time.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/Time.h' --- src/acl/Time.h 2009-03-08 21:57:12 +0000 +++ src/acl/Time.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/TimeData.cc' --- src/acl/TimeData.cc 2012-08-28 19:12:13 +0000 +++ src/acl/TimeData.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -39,7 +37,6 @@ #include "acl/Checklist.h" #include "cache_cf.h" #include "Debug.h" -#include "protos.h" #include "wordlist.h" ACLTimeData::ACLTimeData () : weekbits (0), start (0), stop (0), next (NULL) {} === modified file 'src/acl/TimeData.h' --- src/acl/TimeData.h 2009-03-31 12:39:30 +0000 +++ src/acl/TimeData.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/Url.cc' --- src/acl/Url.cc 2012-08-28 19:12:13 +0000 +++ src/acl/Url.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -38,7 +36,6 @@ #include "acl/Url.h" #include "acl/Checklist.h" #include "acl/RegexData.h" -#include "protos.h" #include "rfc1738.h" #include "URL.h" === modified file 'src/acl/Url.h' --- src/acl/Url.h 2009-03-08 21:53:27 +0000 +++ src/acl/Url.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/UrlPath.cc' --- src/acl/UrlPath.cc 2012-08-14 11:53:07 +0000 +++ src/acl/UrlPath.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/UrlPath.h' --- src/acl/UrlPath.h 2009-03-08 21:53:27 +0000 +++ src/acl/UrlPath.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/UrlPort.cc' --- src/acl/UrlPort.cc 2012-08-28 13:00:30 +0000 +++ src/acl/UrlPort.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/UrlPort.h' --- src/acl/UrlPort.h 2009-03-08 21:53:27 +0000 +++ src/acl/UrlPort.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/acl/UserData.cc' --- src/acl/UserData.cc 2012-08-28 13:00:30 +0000 +++ src/acl/UserData.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/acl/UserData.h' --- src/acl/UserData.h 2009-03-31 12:39:30 +0000 +++ src/acl/UserData.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/Config.cc' --- src/adaptation/Config.cc 2012-08-28 13:00:30 +0000 +++ src/adaptation/Config.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/adaptation/History.cc' --- src/adaptation/History.cc 2012-08-28 13:00:30 +0000 +++ src/adaptation/History.cc 2012-09-03 08:58:40 +0000 @@ -2,8 +2,8 @@ #include "adaptation/Config.h" #include "adaptation/History.h" #include "base/TextException.h" +#include "Debug.h" #include "globals.h" -#include "protos.h" #include "SquidTime.h" /// impossible services value to identify unset theNextServices === modified file 'src/adaptation/ServiceGroups.cc' --- src/adaptation/ServiceGroups.cc 2012-08-28 13:00:30 +0000 +++ src/adaptation/ServiceGroups.cc 2012-08-31 16:57:39 +0000 @@ -7,7 +7,7 @@ #include "adaptation/ServiceGroups.h" #include "ConfigParser.h" #include "Debug.h" -#include "protos.h" +#include "StrList.h" #include "wordlist.h" Adaptation::ServiceGroup::ServiceGroup(const String &aKind, bool allSame): === modified file 'src/adaptation/ecap/MessageRep.cc' --- src/adaptation/ecap/MessageRep.cc 2012-08-28 19:12:13 +0000 +++ src/adaptation/ecap/MessageRep.cc 2012-08-31 16:57:39 +0000 @@ -5,7 +5,6 @@ #include "HttpRequest.h" #include "HttpReply.h" #include "BodyPipe.h" -#include "protos.h" #include #include #include === modified file 'src/adaptation/icap/Client.h' --- src/adaptation/icap/Client.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/Client.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/Config.cc' --- src/adaptation/icap/Config.cc 2012-08-24 09:57:00 +0000 +++ src/adaptation/icap/Config.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/adaptation/icap/Config.h' --- src/adaptation/icap/Config.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/Config.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/Elements.h' --- src/adaptation/icap/Elements.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/Elements.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/InOut.h' --- src/adaptation/icap/InOut.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/InOut.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/Launcher.h' --- src/adaptation/icap/Launcher.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/Launcher.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/ModXact.cc' --- src/adaptation/icap/ModXact.cc 2012-08-28 19:12:13 +0000 +++ src/adaptation/icap/ModXact.cc 2012-08-31 16:57:39 +0000 @@ -24,7 +24,6 @@ #include "HttpMsg.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "protos.h" #include "SquidTime.h" #include "URL.h" === modified file 'src/adaptation/icap/ModXact.h' --- src/adaptation/icap/ModXact.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/ModXact.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/OptXact.cc' --- src/adaptation/icap/OptXact.cc 2012-08-28 19:12:13 +0000 +++ src/adaptation/icap/OptXact.cc 2012-08-31 16:57:39 +0000 @@ -12,7 +12,6 @@ #include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "protos.h" #include "SquidTime.h" CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, OptXact); === modified file 'src/adaptation/icap/OptXact.h' --- src/adaptation/icap/OptXact.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/OptXact.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/Options.cc' --- src/adaptation/icap/Options.cc 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/Options.cc 2012-08-31 16:57:39 +0000 @@ -3,8 +3,8 @@ #include "adaptation/icap/Options.h" #include "base/TextException.h" #include "HttpReply.h" -#include "protos.h" #include "SquidTime.h" +#include "StrList.h" #include "wordlist.h" Adaptation::Icap::Options::Options(): error("unconfigured"), === modified file 'src/adaptation/icap/Options.h' --- src/adaptation/icap/Options.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/Options.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/ServiceRep.cc' --- src/adaptation/icap/ServiceRep.cc 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/ServiceRep.cc 2012-08-31 16:57:39 +0000 @@ -14,9 +14,9 @@ #include "ConfigParser.h" #include "Debug.h" #include "fde.h" +#include "globals.h" #include "HttpReply.h" #include "ip/tools.h" -#include "protos.h" #include "SquidTime.h" CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ServiceRep); === modified file 'src/adaptation/icap/ServiceRep.h' --- src/adaptation/icap/ServiceRep.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/ServiceRep.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/adaptation/icap/Xaction.cc' --- src/adaptation/icap/Xaction.cc 2012-08-28 19:12:13 +0000 +++ src/adaptation/icap/Xaction.cc 2012-08-31 16:57:39 +0000 @@ -15,6 +15,7 @@ #include "CommCalls.h" #include "err_detail_type.h" #include "fde.h" +#include "forward.h" #include "globals.h" #include "HttpMsg.h" #include "HttpReply.h" @@ -23,7 +24,6 @@ #include "ipcache.h" #include "Mem.h" #include "pconn.h" -#include "protos.h" #include "SquidTime.h" //CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, Xaction); === modified file 'src/adaptation/icap/Xaction.h' --- src/adaptation/icap/Xaction.h 2012-08-28 13:00:30 +0000 +++ src/adaptation/icap/Xaction.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/AclMaxUserIp.cc' --- src/auth/AclMaxUserIp.cc 2012-08-28 19:12:13 +0000 +++ src/auth/AclMaxUserIp.cc 2012-08-31 16:57:39 +0000 @@ -9,7 +9,6 @@ #include "auth/AclMaxUserIp.h" #include "auth/UserRequest.h" #include "Debug.h" -#include "protos.h" #include "wordlist.h" #include "ConfigParser.h" #include "Parsing.h" === modified file 'src/auth/Config.cc' --- src/auth/Config.cc 2012-08-14 11:53:07 +0000 +++ src/auth/Config.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins * === modified file 'src/auth/Config.h' --- src/auth/Config.h 2011-12-30 01:24:57 +0000 +++ src/auth/Config.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/Gadgets.cc' --- src/auth/Gadgets.cc 2012-08-14 11:53:07 +0000 +++ src/auth/Gadgets.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins * === modified file 'src/auth/Gadgets.h' --- src/auth/Gadgets.h 2011-04-11 14:08:54 +0000 +++ src/auth/Gadgets.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/Scheme.cc' --- src/auth/Scheme.cc 2012-08-14 11:53:07 +0000 +++ src/auth/Scheme.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins * === modified file 'src/auth/Scheme.h' --- src/auth/Scheme.h 2011-04-09 04:25:23 +0000 +++ src/auth/Scheme.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/User.cc' --- src/auth/User.cc 2012-08-28 13:00:30 +0000 +++ src/auth/User.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins * === modified file 'src/auth/User.cci' --- src/auth/User.cci 2011-04-11 14:08:54 +0000 +++ src/auth/User.cci 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins * === modified file 'src/auth/User.h' --- src/auth/User.h 2011-05-13 08:13:01 +0000 +++ src/auth/User.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/UserRequest.cc' --- src/auth/UserRequest.cc 2012-08-28 13:00:30 +0000 +++ src/auth/UserRequest.cc 2012-09-01 14:42:17 +0000 @@ -1,9 +1,4 @@ /* - * $Id$ - * - * DO NOT MODIFY NEXT 2 LINES: - * arch-tag: 6803fde1-d5a2-4c29-9034-1c0c9f650eb4 - * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins * === modified file 'src/auth/UserRequest.h' --- src/auth/UserRequest.h 2012-06-19 23:16:13 +0000 +++ src/auth/UserRequest.h 2012-09-01 14:42:17 +0000 @@ -1,9 +1,4 @@ /* - * $Id$ - * - * DO NOT MODIFY NEXT 2 LINES: - * arch-tag: 674533af-8b21-4641-b71a-74c4639072a0 - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/auth/basic/Scheme.cc' --- src/auth/basic/Scheme.cc 2012-08-14 11:53:07 +0000 +++ src/auth/basic/Scheme.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/basic/Scheme.h' --- src/auth/basic/Scheme.h 2011-04-09 04:25:23 +0000 +++ src/auth/basic/Scheme.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/basic/auth_basic.cc' --- src/auth/basic/auth_basic.cc 2012-08-28 19:12:13 +0000 +++ src/auth/basic/auth_basic.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels * @@ -49,7 +47,6 @@ #include "Store.h" #include "HttpHeaderTools.h" #include "HttpReply.h" -#include "protos.h" #include "rfc1738.h" #include "uudecode.h" #include "wordlist.h" === modified file 'src/auth/digest/Scheme.cc' --- src/auth/digest/Scheme.cc 2012-08-14 11:53:07 +0000 +++ src/auth/digest/Scheme.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/digest/Scheme.h' --- src/auth/digest/Scheme.h 2011-04-09 04:25:23 +0000 +++ src/auth/digest/Scheme.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/digest/UserRequest.cc' --- src/auth/digest/UserRequest.cc 2012-08-28 19:12:13 +0000 +++ src/auth/digest/UserRequest.cc 2012-08-31 16:57:39 +0000 @@ -7,7 +7,6 @@ #include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "protos.h" #include "SquidTime.h" Auth::Digest::UserRequest::UserRequest() : === modified file 'src/auth/digest/auth_digest.cc' --- src/auth/digest/auth_digest.cc 2012-08-28 19:12:13 +0000 +++ src/auth/digest/auth_digest.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins * @@ -53,9 +51,9 @@ #include "Store.h" #include "HttpRequest.h" #include "HttpReply.h" -#include "protos.h" #include "wordlist.h" #include "SquidTime.h" +#include "StrList.h" /* Digest Scheme */ === modified file 'src/auth/negotiate/Scheme.cc' --- src/auth/negotiate/Scheme.cc 2012-08-14 11:53:07 +0000 +++ src/auth/negotiate/Scheme.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/negotiate/Scheme.h' --- src/auth/negotiate/Scheme.h 2011-04-09 04:25:23 +0000 +++ src/auth/negotiate/Scheme.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/negotiate/UserRequest.cc' --- src/auth/negotiate/UserRequest.cc 2012-08-28 19:12:13 +0000 +++ src/auth/negotiate/UserRequest.cc 2012-08-31 16:57:39 +0000 @@ -9,7 +9,6 @@ #include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "protos.h" #include "SquidTime.h" Auth::Negotiate::UserRequest::UserRequest() === modified file 'src/auth/negotiate/auth_negotiate.cc' --- src/auth/negotiate/auth_negotiate.cc 2012-08-28 19:12:13 +0000 +++ src/auth/negotiate/auth_negotiate.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 Negotiate Authenticator * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli * @@ -47,7 +45,6 @@ #include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "protos.h" #include "SquidTime.h" #include "auth/negotiate/Scheme.h" #include "auth/negotiate/User.h" === modified file 'src/auth/ntlm/Scheme.cc' --- src/auth/ntlm/Scheme.cc 2012-08-14 11:53:07 +0000 +++ src/auth/ntlm/Scheme.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/ntlm/Scheme.h' --- src/auth/ntlm/Scheme.h 2011-04-09 04:25:23 +0000 +++ src/auth/ntlm/Scheme.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/auth/ntlm/auth_ntlm.cc' --- src/auth/ntlm/auth_ntlm.cc 2012-08-28 19:12:13 +0000 +++ src/auth/ntlm/auth_ntlm.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 29 NTLM Authenticator * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli * @@ -50,7 +48,6 @@ #include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "protos.h" #include "wordlist.h" #include "SquidTime.h" === modified file 'src/base/AsyncCallQueue.cc' --- src/base/AsyncCallQueue.cc 2012-08-28 13:00:30 +0000 +++ src/base/AsyncCallQueue.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 41 Event Processing * */ === modified file 'src/cache_cf.cc' --- src/cache_cf.cc 2012-08-28 19:12:13 +0000 +++ src/cache_cf.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration File Parsing * AUTHOR: Harvest Derived * @@ -37,6 +35,7 @@ #include "acl/Gadgets.h" #include "acl/MethodData.h" #include "anyp/PortCfg.h" +#include "AuthReg.h" #include "base/RunnersRegistry.h" #include "cache_cf.h" #include "ConfigParser.h" @@ -59,8 +58,8 @@ #include "mgr/Registration.h" #include "Parsing.h" #include "PeerDigest.h" -#include "protos.h" #include "rfc1738.h" +#include "SquidString.h" #include "Store.h" #include "StoreFileSystem.h" #include "structs.h" @@ -147,6 +146,8 @@ static void free_ecap_service_type(Adaptation::Ecap::Config *); #endif +static peer_t parseNeighborType(const char *s); + CBDATA_TYPE(peer); static const char *const T_MILLISECOND_STR = "millisecond"; === modified file 'src/cache_cf.h' --- src/cache_cf.h 2012-08-29 00:12:28 +0000 +++ src/cache_cf.h 2012-08-31 13:33:06 +0000 @@ -46,5 +46,6 @@ extern void parse_wordlist(wordlist ** list); extern void requirePathnameExists(const char *name, const char *path); extern void parse_time_t(time_t * var); +extern char *strtokFile(void); #endif /* SQUID_CACHE_CF_H_ */ === modified file 'src/cache_diff.cc' --- src/cache_diff.cc 2012-08-28 13:00:30 +0000 +++ src/cache_diff.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Alex Rousskov * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/cache_manager.cc' --- src/cache_manager.cc 2012-08-28 13:00:30 +0000 +++ src/cache_manager.cc 2012-09-03 08:42:58 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 16 Cache Manager Objects * AUTHOR: Duane Wessels * @@ -50,10 +47,12 @@ #include "mgr/Forwarder.h" #include "mgr/FunAction.h" #include "mgr/QueryParams.h" -#include "protos.h" /* rotate_logs() */ +#include "protos.h" +#include "tools.h" #include "SquidTime.h" #include "Store.h" #include "wordlist.h" + #include /// \ingroup CacheManagerInternal === modified file 'src/carp.cc' --- src/carp.cc 2012-08-28 19:12:13 +0000 +++ src/carp.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 39 Cache Array Routing Protocol * AUTHOR: Henrik Nordstrom * BASED ON: carp.c by Eric Stern and draft-vinod-carp-v1-03.txt @@ -38,7 +36,6 @@ #include "HttpRequest.h" #include "mgr/Registration.h" #include "neighbors.h" -#include "protos.h" #include "Store.h" #include "URL.h" #include "URLScheme.h" === modified file 'src/cbdata.cc' --- src/cbdata.cc 2012-08-28 13:00:30 +0000 +++ src/cbdata.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 45 Callback Data Registry * ORIGINAL AUTHOR: Duane Wessels * Modified by Moez Mahfoudh (08/12/2000) === modified file 'src/cbdata.h' --- src/cbdata.h 2012-08-28 13:00:30 +0000 +++ src/cbdata.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/clientStream.cc' --- src/clientStream.cc 2012-08-28 13:00:30 +0000 +++ src/clientStream.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 87 Client-side Stream routines. * AUTHOR: Robert Collins * === modified file 'src/clientStream.h' --- src/clientStream.h 2012-08-14 11:53:07 +0000 +++ src/clientStream.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/client_db.cc' --- src/client_db.cc 2012-08-28 19:12:13 +0000 +++ src/client_db.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 00 Client Database * AUTHOR: Duane Wessels * @@ -42,13 +40,16 @@ #include "log/access_log.h" #include "Mem.h" #include "mgr/Registration.h" -#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" #include "tools.h" +#if SQUID_SNMP +#include "snmp_core.h" +#endif + static hash_table *client_table = NULL; static ClientInfo *clientdbAdd(const Ip::Address &addr); === modified file 'src/client_db.h' --- src/client_db.h 2012-08-29 00:12:28 +0000 +++ src/client_db.h 2012-08-31 15:45:51 +0000 @@ -52,4 +52,8 @@ extern ClientInfo * clientdbGetInfo(const Ip::Address &addr); #endif +#if SQUID_SNMP +extern Ip::Address *client_entry(Ip::Address *current); +#endif + #endif /* SQUID_CLIENT_DB_H_ */ === modified file 'src/client_side.cc' --- src/client_side.cc 2012-09-06 13:12:26 +0000 +++ src/client_side.cc 2012-09-09 17:13:42 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels * @@ -29,7 +27,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * */ /** @@ -105,6 +102,7 @@ #include "fde.h" #include "forward.h" #include "fqdncache.h" +#include "globals.h" #include "http.h" #include "HttpHdrContRange.h" #include "HttpHeaderTools.h" @@ -119,8 +117,8 @@ #include "Mem.h" #include "MemBuf.h" #include "MemObject.h" +#include "mime_header.h" #include "profiler/Profiler.h" -#include "protos.h" #include "rfc1738.h" #include "SquidTime.h" #include "StatCounters.h" === modified file 'src/client_side_reply.cc' --- src/client_side_reply.cc 2012-09-10 22:38:09 +0000 +++ src/client_side_reply.cc 2012-09-13 06:56:05 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 88 Client-side Reply Routines * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c) * @@ -53,12 +51,13 @@ #include "ipcache.h" #include "log/access_log.h" #include "MemObject.h" +#include "mime_header.h" #include "neighbors.h" -#include "protos.h" #include "refresh.h" #include "SquidTime.h" #include "Store.h" #include "StoreClient.h" +#include "StrList.h" #include "tools.h" #include "URL.h" #if USE_AUTH === modified file 'src/client_side_request.cc' --- src/client_side_request.cc 2012-08-28 19:12:13 +0000 +++ src/client_side_request.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 85 Client-side Request Routines * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c) * @@ -69,9 +67,9 @@ #include "MemObject.h" #include "Parsing.h" #include "profiler/Profiler.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" +#include "StrList.h" #include "tools.h" #include "URL.h" #include "wordlist.h" === modified file 'src/client_side_request.cci' --- src/client_side_request.cci 2012-08-24 09:57:00 +0000 +++ src/client_side_request.cci 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 85 Client-side Request Routines * AUTHOR: Robert Collins * === modified file 'src/comm.cc' --- src/comm.cc 2012-08-28 19:12:13 +0000 +++ src/comm.cc 2012-08-31 16:57:39 +0000 @@ -58,7 +58,6 @@ #include "ip/tools.h" #include "MemBuf.h" #include "pconn.h" -#include "protos.h" #include "profiler/Profiler.h" #include "SquidTime.h" #include "StatCounters.h" === modified file 'src/comm/ConnOpener.cc' --- src/comm/ConnOpener.cc 2012-08-28 19:12:13 +0000 +++ src/comm/ConnOpener.cc 2012-08-31 16:57:39 +0000 @@ -13,7 +13,6 @@ #include "icmp/net_db.h" #include "ipcache.h" #include "SquidTime.h" -#include "protos.h" #if HAVE_ERRNO_H #include === modified file 'src/comm/ModDevPoll.cc' --- src/comm/ModDevPoll.cc 2012-08-28 13:00:30 +0000 +++ src/comm/ModDevPoll.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Socket Functions * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/comm/ModEpoll.cc' --- src/comm/ModEpoll.cc 2012-08-28 13:00:30 +0000 +++ src/comm/ModEpoll.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Socket Functions * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/comm/ModKqueue.cc' --- src/comm/ModKqueue.cc 2012-08-28 13:00:30 +0000 +++ src/comm/ModKqueue.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Socket Functions * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/comm/ModPoll.cc' --- src/comm/ModPoll.cc 2012-08-28 19:12:13 +0000 +++ src/comm/ModPoll.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Socket Functions * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -42,7 +40,6 @@ #include "ICP.h" #include "mgr/Registration.h" #include "profiler/Profiler.h" -#include "protos.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" === modified file 'src/comm/ModSelect.cc' --- src/comm/ModSelect.cc 2012-08-28 13:00:30 +0000 +++ src/comm/ModSelect.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Socket Functions * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/comm/ModSelectWin32.cc' --- src/comm/ModSelectWin32.cc 2012-08-28 13:00:30 +0000 +++ src/comm/ModSelectWin32.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 05 Socket Functions * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/comm/TcpAcceptor.cc' --- src/comm/TcpAcceptor.cc 2012-08-28 19:12:13 +0000 +++ src/comm/TcpAcceptor.cc 2012-08-31 16:57:39 +0000 @@ -43,9 +43,9 @@ #include "comm/TcpAcceptor.h" #include "fd.h" #include "fde.h" +#include "globals.h" #include "ip/Intercept.h" #include "profiler/Profiler.h" -#include "protos.h" #include "SquidTime.h" #include "StatCounters.h" === modified file 'src/comm/Write.cc' --- src/comm/Write.cc 2012-08-28 19:12:13 +0000 +++ src/comm/Write.cc 2012-08-31 16:57:39 +0000 @@ -7,7 +7,6 @@ #include "globals.h" #include "MemBuf.h" #include "profiler/Profiler.h" -#include "protos.h" #include "SquidTime.h" #include "StatCounters.h" === modified file 'src/comm_poll.h' --- src/comm_poll.h 2012-08-28 13:00:30 +0000 +++ src/comm_poll.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/debug.cc' --- src/debug.cc 2012-08-28 13:00:30 +0000 +++ src/debug.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 00 Debug Routines * AUTHOR: Harvest Derived * === modified file 'src/defines.h' --- src/defines.h 2012-04-25 05:29:20 +0000 +++ src/defines.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/disk.cc' --- src/disk.cc 2012-08-28 19:12:13 +0000 +++ src/disk.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 06 Disk I/O Routines * AUTHOR: Harvest Derived * @@ -36,10 +34,10 @@ #include "comm/Loops.h" #include "fd.h" #include "fde.h" +#include "globals.h" #include "Mem.h" #include "MemBuf.h" #include "profiler/Profiler.h" -#include "protos.h" #include "StatCounters.h" #if HAVE_ERRNO_H === modified file 'src/disk.h' --- src/disk.h 2012-08-29 00:12:28 +0000 +++ src/disk.h 2012-08-31 11:19:34 +0000 @@ -53,5 +53,7 @@ extern void file_write_mbuf(int fd, off_t, MemBuf mb, DWCB * handler, void *handler_data); extern void file_read(int, char *, int, off_t, DRCB *, void *); extern void disk_init(void); +extern void safeunlink(const char *path, int quiet); +extern int xrename(const char *from, const char *to); //disk.cc #endif /* SQUID_DISK_H_ */ === modified file 'src/dlink.h' --- src/dlink.h 2010-11-21 04:40:05 +0000 +++ src/dlink.h 2012-09-03 08:42:58 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -48,11 +46,8 @@ dlink_node *tail; }; -/* mported form globals.h */ extern dlink_list ClientActiveRequests; -/* imported directly from protos.h */ - SQUIDCEXTERN void dlinkAdd(void *data, dlink_node *, dlink_list *); SQUIDCEXTERN void dlinkAddAfter(void *, dlink_node *, dlink_node *, dlink_list *); SQUIDCEXTERN void dlinkAddTail(void *data, dlink_node *, dlink_list *); === modified file 'src/dns.cc' --- src/dns.cc 2012-08-14 11:53:07 +0000 +++ src/dns.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 34 Dnsserver interface * AUTHOR: Harvest Derived * === modified file 'src/dns_internal.cc' --- src/dns_internal.cc 2012-08-28 19:12:13 +0000 +++ src/dns_internal.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c * AUTHOR: Duane Wessels * @@ -46,13 +44,17 @@ #include "Mem.h" #include "MemBuf.h" #include "mgr/Registration.h" -#include "protos.h" #include "rfc3596.h" #include "SquidTime.h" #include "Store.h" +#include "tools.h" #include "util.h" #include "wordlist.h" +#if SQUID_SNMP +#include "snmp_core.h" +#endif + #if HAVE_ARPA_NAMESER_H #include #endif === modified file 'src/enums.h' --- src/enums.h 2012-08-28 13:00:30 +0000 +++ src/enums.h 2012-09-03 08:42:58 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -330,8 +328,7 @@ #if USE_HTCP /* - * This should be in htcp.h but because neighborsHtcpClear is defined in - * protos.h it has to be here. + * TODO: This should be in htcp.h */ typedef enum { HTCP_CLR_PURGE, === modified file 'src/errorpage.cc' --- src/errorpage.cc 2012-08-28 19:12:13 +0000 +++ src/errorpage.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 04 Error Generation * AUTHOR: Duane Wessels * @@ -47,7 +45,6 @@ #include "MemObject.h" #include "fde.h" #include "MemBuf.h" -#include "protos.h" #include "rfc1738.h" #include "URL.h" #include "URLScheme.h" === modified file 'src/esi/Assign.cc' --- src/esi/Assign.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Assign.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Assign.h' --- src/esi/Assign.h 2012-08-14 11:53:07 +0000 +++ src/esi/Assign.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Attempt.h' --- src/esi/Attempt.h 2012-08-14 11:53:07 +0000 +++ src/esi/Attempt.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Context.cc' --- src/esi/Context.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Context.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Context.h' --- src/esi/Context.h 2012-08-14 11:53:07 +0000 +++ src/esi/Context.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/esi/CustomParser.cc' --- src/esi/CustomParser.cc 2012-08-14 11:53:07 +0000 +++ src/esi/CustomParser.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/CustomParser.h' --- src/esi/CustomParser.h 2009-03-17 15:29:06 +0000 +++ src/esi/CustomParser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/esi/Element.h' --- src/esi/Element.h 2012-08-14 11:53:07 +0000 +++ src/esi/Element.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/esi/ElementList.h' --- src/esi/ElementList.h 2012-08-28 13:00:30 +0000 +++ src/esi/ElementList.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Esi.cc' --- src/esi/Esi.cc 2012-08-28 19:12:13 +0000 +++ src/esi/Esi.cc 2012-08-31 16:57:39 +0000 @@ -60,7 +60,6 @@ #include "Mem.h" #include "MemBuf.h" #include "profiler/Profiler.h" -#include "protos.h" /* quick reference on behaviour here. * The ESI specification 1.0 requires the ESI processor to be able to === modified file 'src/esi/Esi.h' --- src/esi/Esi.h 2009-03-10 20:52:45 +0000 +++ src/esi/Esi.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/esi/Except.h' --- src/esi/Except.h 2012-08-14 11:53:07 +0000 +++ src/esi/Except.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/ExpatParser.cc' --- src/esi/ExpatParser.cc 2012-08-14 11:53:07 +0000 +++ src/esi/ExpatParser.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/ExpatParser.h' --- src/esi/ExpatParser.h 2010-11-21 04:40:05 +0000 +++ src/esi/ExpatParser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/esi/Expression.cc' --- src/esi/Expression.cc 2012-08-28 13:00:30 +0000 +++ src/esi/Expression.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Expression.h' --- src/esi/Expression.h 2012-08-14 11:53:07 +0000 +++ src/esi/Expression.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Include.cc' --- src/esi/Include.cc 2012-08-28 19:12:13 +0000 +++ src/esi/Include.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * @@ -47,7 +45,6 @@ #include "esi/VarState.h" #include "HttpReply.h" #include "log/access_log.h" -#include "protos.h" CBDATA_CLASS_INIT (ESIStreamContext); === modified file 'src/esi/Include.h' --- src/esi/Include.h 2012-08-14 11:53:07 +0000 +++ src/esi/Include.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Libxml2Parser.cc' --- src/esi/Libxml2Parser.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Libxml2Parser.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Joachim Bauch (mail@joachim-bauch.de) * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/esi/Libxml2Parser.h' --- src/esi/Libxml2Parser.h 2010-11-21 04:40:05 +0000 +++ src/esi/Libxml2Parser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Joachim Bauch (mail@joachim-bauch.de) * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/esi/Literal.h' --- src/esi/Literal.h 2012-08-14 11:53:07 +0000 +++ src/esi/Literal.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Parser.cc' --- src/esi/Parser.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Parser.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Parser.h' --- src/esi/Parser.h 2012-08-28 13:00:30 +0000 +++ src/esi/Parser.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/esi/Segment.cc' --- src/esi/Segment.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Segment.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Segment.h' --- src/esi/Segment.h 2012-08-28 13:00:30 +0000 +++ src/esi/Segment.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/esi/Sequence.cc' --- src/esi/Sequence.cc 2012-08-28 13:00:30 +0000 +++ src/esi/Sequence.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Sequence.h' --- src/esi/Sequence.h 2012-08-14 11:53:07 +0000 +++ src/esi/Sequence.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/Var.h' --- src/esi/Var.h 2012-08-14 11:53:07 +0000 +++ src/esi/Var.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * === modified file 'src/esi/VarState.cc' --- src/esi/VarState.cc 2012-08-28 19:12:13 +0000 +++ src/esi/VarState.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins * @@ -38,7 +36,6 @@ #include "esi/VarState.h" #include "HttpReply.h" #include "Mem.h" -#include "protos.h" CBDATA_TYPE (ESIVarState); FREE ESIVarStateFree; === modified file 'src/esi/VarState.h' --- src/esi/VarState.h 2012-08-28 13:00:30 +0000 +++ src/esi/VarState.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/event.cc' --- src/event.cc 2012-08-28 13:00:30 +0000 +++ src/event.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 41 Event Processing * AUTHOR: Henrik Nordstrom * @@ -39,7 +37,7 @@ #include "Store.h" #include "SquidTime.h" #include "profiler/Profiler.h" -#include "protos.h" +#include "tools.h" /* The list of event processes */ === modified file 'src/event.h' --- src/event.h 2012-08-14 11:53:07 +0000 +++ src/event.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/external_acl.cc' --- src/external_acl.cc 2012-08-28 19:12:13 +0000 +++ src/external_acl.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 82 External ACL * AUTHOR: Henrik Nordstrom, MARA Systems AB * @@ -46,8 +44,8 @@ #include "cache_cf.h" #include "client_side.h" #include "comm/Connection.h" +#include "ExternalACL.h" #include "ExternalACLEntry.h" -#include "ExternalACL.h" #include "fde.h" #include "helper.h" #include "HttpHeaderTools.h" @@ -56,13 +54,13 @@ #include "ip/tools.h" #include "MemBuf.h" #include "mgr/Registration.h" -#include "protos.h" #include "rfc1738.h" +#include "SquidString.h" #include "SquidTime.h" #include "Store.h" -#include "URLScheme.h" #include "tools.h" #include "URL.h" +#include "URLScheme.h" #include "wordlist.h" #if USE_SSL #include "ssl/support.h" === modified file 'src/fd.cc' --- src/fd.cc 2012-08-28 19:12:13 +0000 +++ src/fd.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 51 Filedescriptor Functions * AUTHOR: Duane Wessels * === modified file 'src/fde.cc' --- src/fde.cc 2012-08-14 11:53:07 +0000 +++ src/fde.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: none FDE * AUTHOR: Robert Collins * @@ -37,7 +35,6 @@ #include "comm.h" #include "fde.h" #include "globals.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" === modified file 'src/format/Config.cc' --- src/format/Config.cc 2012-08-28 19:12:13 +0000 +++ src/format/Config.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,7 @@ #include "squid.h" #include "cache_cf.h" +#include "Debug.h" #include "format/Config.h" -#include "protos.h" #include Format::FmtConfig Format::TheConfig; === modified file 'src/format/Format.cc' --- src/format/Format.cc 2012-08-28 19:12:13 +0000 +++ src/format/Format.cc 2012-08-31 16:57:39 +0000 @@ -11,7 +11,6 @@ #include "fqdncache.h" #include "HttpRequest.h" #include "MemBuf.h" -#include "protos.h" #include "rfc1738.h" #include "SquidTime.h" #include "Store.h" === modified file 'src/forward.cc' --- src/forward.cc 2012-09-10 23:07:01 +0000 +++ src/forward.cc 2012-09-13 06:56:05 +0000 @@ -63,9 +63,10 @@ #include "neighbors.h" #include "pconn.h" #include "PeerSelectState.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" +#include "StoreClient.h" +#include "urn.h" #include "whois.h" #if USE_SSL #include "ssl/support.h" === modified file 'src/forward.h' --- src/forward.h 2012-08-28 13:00:30 +0000 +++ src/forward.h 2012-08-29 14:27:18 +0000 @@ -123,4 +123,6 @@ CBDATA_CLASS2(FwdState); }; +extern void getOutgoingAddress(HttpRequest * request, Comm::ConnectionPointer conn); + #endif /* SQUID_FORWARD_H */ === modified file 'src/fqdncache.cc' --- src/fqdncache.cc 2012-08-29 00:12:28 +0000 +++ src/fqdncache.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 35 FQDN Cache * AUTHOR: Harvest Derived * @@ -38,13 +36,16 @@ #include "event.h" #include "Mem.h" #include "mgr/Registration.h" -#include "protos.h" #include "SquidDns.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" #include "wordlist.h" +#if SQUID_SNMP +#include "snmp_core.h" +#endif + /** \defgroup FQDNCacheAPI FQDN Cache API \ingroup Components === modified file 'src/fs/aufs/StoreFSaufs.cc' --- src/fs/aufs/StoreFSaufs.cc 2012-08-14 11:53:07 +0000 +++ src/fs/aufs/StoreFSaufs.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * === modified file 'src/fs/coss/StoreFScoss.cc' --- src/fs/coss/StoreFScoss.cc 2012-01-20 18:55:04 +0000 +++ src/fs/coss/StoreFScoss.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * === modified file 'src/fs/coss/StoreFScoss.h' --- src/fs/coss/StoreFScoss.h 2012-08-28 13:00:30 +0000 +++ src/fs/coss/StoreFScoss.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/fs/coss/store_dir_coss.cc' --- src/fs/coss/store_dir_coss.cc 2012-08-28 19:12:13 +0000 +++ src/fs/coss/store_dir_coss.cc 2012-08-30 08:30:12 +0000 @@ -51,6 +51,7 @@ #include "Parsing.h" #include "store_key_md5.h" #include "swap_log_op.h" +#include "store_rebuild.h" #include "SquidMath.h" #if HAVE_ERRNO_H === modified file 'src/fs/coss/store_io_coss.cc' --- src/fs/coss/store_io_coss.cc 2012-08-28 13:00:30 +0000 +++ src/fs/coss/store_io_coss.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 79 Storage Manager COSS Interface * AUTHOR: Eric Stern * === modified file 'src/fs/diskd/StoreFSdiskd.cc' --- src/fs/diskd/StoreFSdiskd.cc 2012-08-24 09:57:00 +0000 +++ src/fs/diskd/StoreFSdiskd.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * === modified file 'src/fs/rock/RockIoRequests.cc' --- src/fs/rock/RockIoRequests.cc 2012-01-20 18:55:04 +0000 +++ src/fs/rock/RockIoRequests.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Disk IO Routines */ === modified file 'src/fs/rock/RockIoState.cc' --- src/fs/rock/RockIoState.cc 2012-08-28 13:00:30 +0000 +++ src/fs/rock/RockIoState.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Disk IO Routines */ === modified file 'src/fs/rock/RockRebuild.cc' --- src/fs/rock/RockRebuild.cc 2012-08-28 19:12:13 +0000 +++ src/fs/rock/RockRebuild.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 79 Disk IO Routines */ @@ -9,10 +7,12 @@ #include "fs/rock/RockRebuild.h" #include "fs/rock/RockSwapDir.h" #include "fs/rock/RockDbCell.h" +#include "globals.h" #include "md5.h" -#include "protos.h" +#include "tools.h" #include "typedefs.h" #include "SquidTime.h" +#include "store_rebuild.h" #if HAVE_ERRNO_H #include === modified file 'src/fs/rock/RockStoreFileSystem.cc' --- src/fs/rock/RockStoreFileSystem.cc 2012-08-28 13:00:30 +0000 +++ src/fs/rock/RockStoreFileSystem.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 92 Storage File System */ === modified file 'src/fs/rock/RockSwapDir.cc' --- src/fs/rock/RockSwapDir.cc 2012-08-28 19:12:13 +0000 +++ src/fs/rock/RockSwapDir.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines */ @@ -15,11 +13,13 @@ #include "fs/rock/RockIoState.h" #include "fs/rock/RockIoRequests.h" #include "fs/rock/RockRebuild.h" +#include "globals.h" #include "ipc/mem/Pages.h" #include "MemObject.h" #include "Parsing.h" -#include "protos.h" #include "SquidMath.h" +#include "tools.h" + #include #include === modified file 'src/fs/ufs/RebuildState.cc' --- src/fs/ufs/RebuildState.cc 2012-08-28 19:12:13 +0000 +++ src/fs/ufs/RebuildState.cc 2012-08-31 16:57:39 +0000 @@ -1,5 +1,4 @@ /* - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Robert Collins * @@ -33,11 +32,13 @@ #include "squid.h" #include "disk.h" -#include "protos.h" +#include "globals.h" #include "RebuildState.h" #include "SquidTime.h" #include "store_key_md5.h" +#include "store_rebuild.h" #include "StoreSwapLogData.h" +#include "tools.h" #include "UFSSwapLogParser.h" #if HAVE_MATH_H === modified file 'src/fs/ufs/StoreFSufs.h' --- src/fs/ufs/StoreFSufs.h 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/StoreFSufs.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * === modified file 'src/fs/ufs/UFSStoreState.cc' --- src/fs/ufs/UFSStoreState.cc 2012-08-28 13:00:30 +0000 +++ src/fs/ufs/UFSStoreState.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 79 Storage Manager UFS Interface * AUTHOR: Duane Wessels * @@ -40,7 +38,7 @@ #include "DiskIO/DiskIOStrategy.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" -#include "protos.h" +#include "SquidList.h" #include "SwapDir.h" #include "UFSStrategy.h" #include "UFSStoreState.h" === modified file 'src/fs/ufs/UFSStoreState.h' --- src/fs/ufs/UFSStoreState.h 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/UFSStoreState.h 2012-08-31 08:48:38 +0000 @@ -31,6 +31,7 @@ #define SQUID_FS_UFS_UFSSTORESTATE_H #include "DiskIO/IORequestor.h" +#include "SquidList.h" #include "StoreIOState.h" namespace Fs === modified file 'src/fs/ufs/UFSSwapDir.cc' --- src/fs/ufs/UFSSwapDir.cc 2012-08-28 19:12:13 +0000 +++ src/fs/ufs/UFSSwapDir.cc 2012-08-31 16:57:39 +0000 @@ -38,8 +38,8 @@ #include "DiskIO/DiskIOModule.h" #include "FileMap.h" #include "fde.h" +#include "globals.h" #include "Parsing.h" -#include "protos.h" #include "RebuildState.h" #include "SquidMath.h" #include "DiskIO/DiskIOStrategy.h" @@ -48,6 +48,7 @@ #include "StoreSwapLogData.h" #include "SquidTime.h" #include "StatCounters.h" +#include "tools.h" #include "UFSSwapDir.h" #if HAVE_MATH_H === modified file 'src/ftp.cc' --- src/ftp.cc 2012-08-28 19:12:13 +0000 +++ src/ftp.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 09 File Transfer Protocol (FTP) * AUTHOR: Harvest Derived * @@ -52,7 +50,7 @@ #include "ip/tools.h" #include "Mem.h" #include "MemBuf.h" -#include "protos.h" +#include "mime.h" #include "rfc1738.h" #include "Server.h" #include "SquidString.h" === modified file 'src/globals.h' --- src/globals.h 2012-08-28 13:00:30 +0000 +++ src/globals.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/gopher.cc' --- src/gopher.cc 2012-08-28 19:12:13 +0000 +++ src/gopher.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 10 Gopher * AUTHOR: Harvest Derived * @@ -30,7 +27,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * */ #include "squid.h" @@ -39,12 +35,13 @@ #include "errorpage.h" #include "fd.h" #include "forward.h" +#include "globals.h" #include "html_quote.h" #include "HttpReply.h" #include "HttpRequest.h" #include "Mem.h" #include "MemBuf.h" -#include "protos.h" +#include "mime.h" #include "rfc1738.h" #include "SquidTime.h" #include "StatCounters.h" === modified file 'src/helper.cc' --- src/helper.cc 2012-08-28 19:12:13 +0000 +++ src/helper.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 84 Helper process maintenance * AUTHOR: Harvest Derived? * @@ -42,7 +40,7 @@ #include "helper.h" #include "Mem.h" #include "MemBuf.h" -#include "protos.h" +#include "SquidIpc.h" #include "SquidMath.h" #include "SquidTime.h" #include "Store.h" === modified file 'src/htcp.cc' --- src/htcp.cc 2012-08-28 19:12:13 +0000 +++ src/htcp.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 31 Hypertext Caching Protocol * AUTHOR: Duane Wesssels * @@ -50,13 +48,13 @@ #include "ip/tools.h" #include "md5.h" #include "MemBuf.h" -#include "protos.h" #include "refresh.h" #include "SquidTime.h" #include "StatCounters.h" #include "store_key_md5.h" #include "Store.h" #include "StoreClient.h" +#include "tools.h" #include "URL.h" typedef struct _Countstr Countstr; === modified file 'src/http.cc' --- src/http.cc 2012-08-29 14:35:29 +0000 +++ src/http.cc 2012-09-03 07:16:45 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived * @@ -30,7 +27,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * */ /* @@ -50,6 +46,7 @@ #include "errorpage.h" #include "fd.h" #include "fde.h" +#include "globals.h" #include "HttpControlMsg.h" #include "http.h" #include "HttpHdrCc.h" @@ -62,14 +59,16 @@ #include "log/access_log.h" #include "MemBuf.h" #include "MemObject.h" +#include "mime_header.h" #include "neighbors.h" +#include "peer_proxy_negotiate_auth.h" #include "profiler/Profiler.h" -#include "protos.h" #include "refresh.h" #include "rfc1738.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" +#include "StrList.h" #include "tools.h" #include "URL.h" === modified file 'src/http.h' --- src/http.h 2012-08-29 00:12:28 +0000 +++ src/http.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/icmp/Icmp.cc' --- src/icmp/Icmp.cc 2012-08-14 11:53:07 +0000 +++ src/icmp/Icmp.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels, Amos Jeffries * === modified file 'src/icmp/Icmp4.cc' --- src/icmp/Icmp4.cc 2012-08-14 11:53:07 +0000 +++ src/icmp/Icmp4.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 42 ICMP Pinger program * AUTHOR: Duane Wessels, Amos Jeffries * === modified file 'src/icmp/Icmp4.h' --- src/icmp/Icmp4.h 2012-08-28 13:00:30 +0000 +++ src/icmp/Icmp4.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels, Amos Jeffries * === modified file 'src/icmp/Icmp6.cc' --- src/icmp/Icmp6.cc 2012-08-28 13:00:30 +0000 +++ src/icmp/Icmp6.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 42 ICMP Pinger program * AUTHOR: Duane Wessels, Amos Jeffries * === modified file 'src/icmp/IcmpConfig.h' --- src/icmp/IcmpConfig.h 2010-11-21 04:40:05 +0000 +++ src/icmp/IcmpConfig.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration Settings * AUTHOR: Amos Jeffries * === modified file 'src/icmp/IcmpPinger.cc' --- src/icmp/IcmpPinger.cc 2012-08-15 15:17:32 +0000 +++ src/icmp/IcmpPinger.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 42 ICMP Pinger program * AUTHOR: Duane Wessels * === modified file 'src/icmp/IcmpPinger.h' --- src/icmp/IcmpPinger.h 2010-11-21 04:40:05 +0000 +++ src/icmp/IcmpPinger.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels, Amos Jeffries * === modified file 'src/icmp/IcmpSquid.cc' --- src/icmp/IcmpSquid.cc 2012-08-28 19:12:13 +0000 +++ src/icmp/IcmpSquid.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels, Amos Jeffries * @@ -39,7 +37,7 @@ #include "icmp/IcmpSquid.h" #include "icmp/net_db.h" #include "ip/tools.h" -#include "protos.h" +#include "SquidIpc.h" #include "SquidTime.h" #if HAVE_ERRNO_H === modified file 'src/icmp/net_db.cc' --- src/icmp/net_db.cc 2012-08-29 00:12:28 +0000 +++ src/icmp/net_db.cc 2012-08-31 16:57:39 +0000 @@ -39,27 +39,29 @@ */ #include "squid.h" -#include "icmp/net_db.h" -#include "log/File.h" #include "cbdata.h" +#include "disk.h" #include "event.h" -#include "mgr/Registration.h" -#include "Store.h" -#include "SwapDir.h" -#include "HttpRequest.h" -#include "HttpReply.h" -#include "MemObject.h" #include "fde.h" #include "forward.h" +#include "HttpReply.h" +#include "HttpRequest.h" +#include "icmp/net_db.h" #include "internal.h" -#include "protos.h" -#include "SquidTime.h" -#include "wordlist.h" #include "ip/Address.h" +#include "log/File.h" +#include "Mem.h" +#include "MemObject.h" +#include "mgr/Registration.h" +#include "mime_header.h" #include "neighbors.h" +#include "SquidTime.h" +#include "Store.h" +#include "StoreClient.h" +#include "SwapDir.h" +#include "tools.h" #include "URL.h" -#include "Mem.h" -#include "disk.h" +#include "wordlist.h" #if HAVE_SYS_STAT_H #include === modified file 'src/icmp/pinger.cc' --- src/icmp/pinger.cc 2012-08-14 11:53:07 +0000 +++ src/icmp/pinger.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 42 ICMP Pinger program * AUTHOR: Duane Wessels * === modified file 'src/icp_v2.cc' --- src/icp_v2.cc 2012-08-28 19:12:13 +0000 +++ src/icp_v2.cc 2012-08-31 16:57:39 +0000 @@ -52,8 +52,8 @@ #include "ip/tools.h" #include "ipcache.h" #include "md5.h" +#include "multicast.h" #include "neighbors.h" -#include "protos.h" #include "refresh.h" #include "rfc1738.h" #include "SquidTime.h" === modified file 'src/icp_v3.cc' --- src/icp_v3.cc 2012-08-28 13:00:30 +0000 +++ src/icp_v3.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 12 Internet Cache Protocol (ICP) * AUTHOR: Duane Wessels * === modified file 'src/ident/AclIdent.cc' --- src/ident/AclIdent.cc 2012-08-28 13:00:30 +0000 +++ src/ident/AclIdent.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * === modified file 'src/ident/AclIdent.h' --- src/ident/AclIdent.h 2012-08-28 13:00:30 +0000 +++ src/ident/AclIdent.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/ident/Ident.cc' --- src/ident/Ident.cc 2012-08-14 11:53:07 +0000 +++ src/ident/Ident.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 30 Ident (RFC 931) * AUTHOR: Duane Wessels * === modified file 'src/int.cc' --- src/int.cc 2012-08-14 11:53:07 +0000 +++ src/int.cc 2012-08-31 11:19:34 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 21 Integer functions * AUTHOR: Harvest Derived * === added file 'src/int.h' --- src/int.h 1970-01-01 00:00:00 +0000 +++ src/int.h 2012-08-31 11:19:34 +0000 @@ -0,0 +1,37 @@ +#ifndef SQUID_INT_H_ +#define SQUID_INT_H_ +/* + * DEBUG: section 21 Integer functions + * AUTHOR: Harvest Derived + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +extern int isPowTen(int); //int.cc + +#endif /* SQUID_INT_H_ */ === modified file 'src/internal.cc' --- src/internal.cc 2012-08-28 19:12:13 +0000 +++ src/internal.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 76 Internal Squid Object handling * AUTHOR: Duane, Alex, Henrik * @@ -42,7 +40,6 @@ #include "HttpRequest.h" #include "HttpReply.h" #include "MemBuf.h" -#include "protos.h" #include "SquidTime.h" #include "tools.h" #include "URL.h" === modified file 'src/ip/QosConfig.cc' --- src/ip/QosConfig.cc 2012-08-28 19:12:13 +0000 +++ src/ip/QosConfig.cc 2012-08-31 16:57:39 +0000 @@ -10,7 +10,6 @@ #include "ip/tools.h" #include "ip/QosConfig.h" #include "Parsing.h" -#include "protos.h" #if HAVE_ERRNO_H #include === modified file 'src/ipc.cc' --- src/ipc.cc 2012-08-28 19:12:13 +0000 +++ src/ipc.cc 2012-08-31 16:57:39 +0000 @@ -36,7 +36,8 @@ #include "fde.h" #include "globals.h" #include "ip/Address.h" -#include "protos.h" +#include "SquidIpc.h" +#include "tools.h" #include "rfc1738.h" static const char *hello_string = "hi there\n"; === modified file 'src/ipc/AtomicWord.cc' --- src/ipc/AtomicWord.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/AtomicWord.cc 2012-08-31 12:03:13 +0000 @@ -1,13 +1,10 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication - * */ #include "squid.h" #include "ipc/AtomicWord.h" -#include "protos.h" +#include "tools.h" bool Ipc::Atomic::Enabled() { === modified file 'src/ipc/AtomicWord.h' --- src/ipc/AtomicWord.h 2011-10-28 01:11:23 +0000 +++ src/ipc/AtomicWord.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_ATOMIC_WORD_H === modified file 'src/ipc/Coordinator.cc' --- src/ipc/Coordinator.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/Coordinator.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ @@ -16,7 +14,7 @@ #include "mgr/Inquirer.h" #include "mgr/Request.h" #include "mgr/Response.h" -#include "protos.h" +#include "tools.h" #if SQUID_SNMP #include "snmp/Inquirer.h" #include "snmp/Request.h" === modified file 'src/ipc/Coordinator.h' --- src/ipc/Coordinator.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Coordinator.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/FdNotes.cc' --- src/ipc/FdNotes.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/FdNotes.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/FdNotes.h' --- src/ipc/FdNotes.h 2012-08-28 13:00:30 +0000 +++ src/ipc/FdNotes.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Forwarder.cc' --- src/ipc/Forwarder.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/Forwarder.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Forwarder.h' --- src/ipc/Forwarder.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Forwarder.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Inquirer.cc' --- src/ipc/Inquirer.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/Inquirer.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Inquirer.h' --- src/ipc/Inquirer.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Inquirer.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Kid.cc' --- src/ipc/Kid.cc 2012-07-13 10:48:12 +0000 +++ src/ipc/Kid.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Kid.h' --- src/ipc/Kid.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Kid.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_KID_H === modified file 'src/ipc/Kids.cc' --- src/ipc/Kids.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/Kids.cc 2012-08-31 16:57:39 +0000 @@ -1,14 +1,13 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication - * */ #include "squid.h" #include "base/TextException.h" +#include "globals.h" #include "ipc/Kids.h" -#include "protos.h" +#include "tools.h" +#include "structs.h" Kids TheKids; KidName TheKidName; === modified file 'src/ipc/Kids.h' --- src/ipc/Kids.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Kids.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_KIDS_H === modified file 'src/ipc/Messages.h' --- src/ipc/Messages.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Messages.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Port.cc' --- src/ipc/Port.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/Port.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Port.h' --- src/ipc/Port.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Port.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Queue.cc' --- src/ipc/Queue.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/Queue.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Queue.h' --- src/ipc/Queue.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Queue.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_QUEUE_H === modified file 'src/ipc/ReadWriteLock.cc' --- src/ipc/ReadWriteLock.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/ReadWriteLock.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication */ === modified file 'src/ipc/Request.h' --- src/ipc/Request.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Request.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Response.h' --- src/ipc/Response.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Response.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/SharedListen.cc' --- src/ipc/SharedListen.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/SharedListen.cc 2012-08-31 16:57:39 +0000 @@ -1,8 +1,5 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication - * */ #include "squid.h" @@ -16,7 +13,7 @@ #include "ipc/TypedMsgHdr.h" #include "ipc/StartListening.h" #include "ipc/SharedListen.h" -#include "protos.h" +#include "tools.h" #include === modified file 'src/ipc/SharedListen.h' --- src/ipc/SharedListen.h 2012-08-28 13:00:30 +0000 +++ src/ipc/SharedListen.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/StartListening.cc' --- src/ipc/StartListening.cc 2012-08-15 15:17:32 +0000 +++ src/ipc/StartListening.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ @@ -11,7 +9,7 @@ #include "comm/Connection.h" #include "ipc/SharedListen.h" #include "ipc/StartListening.h" -#include "protos.h" +#include "tools.h" #if HAVE_ERRNO_H #include === modified file 'src/ipc/StartListening.h' --- src/ipc/StartListening.h 2012-08-28 13:00:30 +0000 +++ src/ipc/StartListening.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/StoreMap.cc' --- src/ipc/StoreMap.cc 2012-08-28 19:12:13 +0000 +++ src/ipc/StoreMap.cc 2012-08-31 16:57:39 +0000 @@ -1,14 +1,12 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication */ #include "squid.h" -#include "protos.h" +#include "ipc/StoreMap.h" +#include "store_key_md5.h" #include "Store.h" -#include "store_key_md5.h" -#include "ipc/StoreMap.h" +#include "tools.h" Ipc::StoreMap::Owner * Ipc::StoreMap::Init(const char *const path, const int limit, const size_t extrasSize) === modified file 'src/ipc/Strand.cc' --- src/ipc/Strand.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/Strand.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/Strand.h' --- src/ipc/Strand.h 2012-08-28 13:00:30 +0000 +++ src/ipc/Strand.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/StrandCoord.cc' --- src/ipc/StrandCoord.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/StrandCoord.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/StrandCoord.h' --- src/ipc/StrandCoord.h 2012-08-28 13:00:30 +0000 +++ src/ipc/StrandCoord.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_STRAND_COORD_H === modified file 'src/ipc/StrandCoords.h' --- src/ipc/StrandCoords.h 2010-11-27 01:58:38 +0000 +++ src/ipc/StrandCoords.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_STRAND_COORDS_H === modified file 'src/ipc/StrandSearch.cc' --- src/ipc/StrandSearch.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/StrandSearch.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/StrandSearch.h' --- src/ipc/StrandSearch.h 2011-09-11 21:52:19 +0000 +++ src/ipc/StrandSearch.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_STRAND_SEARCH_H === modified file 'src/ipc/TypedMsgHdr.cc' --- src/ipc/TypedMsgHdr.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/TypedMsgHdr.cc 2012-09-01 14:38:36 +0000 @@ -1,14 +1,12 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ #include "squid.h" -#include "protos.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" +#include "tools.h" #include === modified file 'src/ipc/TypedMsgHdr.h' --- src/ipc/TypedMsgHdr.h 2012-05-29 18:58:03 +0000 +++ src/ipc/TypedMsgHdr.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/UdsOp.cc' --- src/ipc/UdsOp.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/UdsOp.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/UdsOp.h' --- src/ipc/UdsOp.h 2012-08-28 13:00:30 +0000 +++ src/ipc/UdsOp.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/forward.h' --- src/ipc/forward.h 2011-04-14 16:58:28 +0000 +++ src/ipc/forward.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/mem/Page.cc' --- src/ipc/mem/Page.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/mem/Page.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/mem/Page.h' --- src/ipc/mem/Page.h 2011-09-06 22:32:30 +0000 +++ src/ipc/mem/Page.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_MEM_PAGE_H === modified file 'src/ipc/mem/PagePool.cc' --- src/ipc/mem/PagePool.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/mem/PagePool.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/mem/PagePool.h' --- src/ipc/mem/PagePool.h 2011-10-28 01:01:41 +0000 +++ src/ipc/mem/PagePool.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_MEM_PAGE_POOL_H === modified file 'src/ipc/mem/PageStack.cc' --- src/ipc/mem/PageStack.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/mem/PageStack.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ === modified file 'src/ipc/mem/PageStack.h' --- src/ipc/mem/PageStack.h 2012-08-06 15:38:12 +0000 +++ src/ipc/mem/PageStack.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_MEM_PAGE_STACK_H === modified file 'src/ipc/mem/Pages.cc' --- src/ipc/mem/Pages.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/mem/Pages.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ @@ -10,9 +8,9 @@ #include "base/RunnersRegistry.h" #include "ipc/mem/PagePool.h" #include "ipc/mem/Pages.h" -#include "protos.h" #include "structs.h" #include "SwapDir.h" +#include "tools.h" // Uses a single PagePool instance, for now. // Eventually, we may have pools dedicated to memory caching, disk I/O, etc. === modified file 'src/ipc/mem/Pages.h' --- src/ipc/mem/Pages.h 2012-08-28 13:00:30 +0000 +++ src/ipc/mem/Pages.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_MEM_PAGES_H === modified file 'src/ipc/mem/Pointer.h' --- src/ipc/mem/Pointer.h 2011-09-14 16:31:00 +0000 +++ src/ipc/mem/Pointer.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_MEM_POINTER_H === modified file 'src/ipc/mem/Segment.cc' --- src/ipc/mem/Segment.cc 2012-08-28 13:00:30 +0000 +++ src/ipc/mem/Segment.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Interprocess Communication * */ @@ -8,8 +6,10 @@ #include "squid.h" #include "base/TextException.h" #include "compat/shm.h" +#include "Debug.h" +#include "fatal.h" #include "ipc/mem/Segment.h" -#include "protos.h" +#include "tools.h" #include #include === modified file 'src/ipc/mem/Segment.h' --- src/ipc/mem/Segment.h 2011-10-26 16:33:46 +0000 +++ src/ipc/mem/Segment.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * */ #ifndef SQUID_IPC_MEM_SEGMENT_H === modified file 'src/ipc_win32.cc' --- src/ipc_win32.cc 2012-08-28 19:12:13 +0000 +++ src/ipc_win32.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 54 Windows Interprocess Communication * AUTHOR: Andrey Shorin * AUTHOR: Guido Serassio @@ -40,7 +38,9 @@ #include "fde.h" #include "ip/Address.h" #include "rfc1738.h" +#include "SquidIpc.h" #include "SquidTime.h" +#include "tools.h" #ifndef _MSWSOCK_ #include === modified file 'src/ipcache.cc' --- src/ipcache.cc 2012-08-28 19:12:13 +0000 +++ src/ipcache.cc 2012-08-31 16:57:39 +0000 @@ -40,7 +40,6 @@ #include "ipcache.h" #include "Mem.h" #include "mgr/Registration.h" -#include "protos.h" #include "rfc3596.h" #include "SquidDns.h" #include "SquidTime.h" @@ -48,6 +47,10 @@ #include "Store.h" #include "wordlist.h" +#if SQUID_SNMP +#include "snmp_core.h" +#endif + /** \defgroup IPCacheAPI IP Cache API \ingroup Components === modified file 'src/log/Config.cc' --- src/log/Config.cc 2012-08-28 19:12:13 +0000 +++ src/log/Config.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,7 @@ #include "squid.h" #include "cache_cf.h" +#include "Debug.h" #include "log/Config.h" -#include "protos.h" Log::LogConfig Log::TheConfig; === modified file 'src/log/File.cc' --- src/log/File.cc 2012-08-14 11:53:07 +0000 +++ src/log/File.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 50 Log file handling * AUTHOR: Duane Wessels * === modified file 'src/log/FormatHttpdCombined.cc' --- src/log/FormatHttpdCombined.cc 2012-08-14 11:53:07 +0000 +++ src/log/FormatHttpdCombined.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log - Apache combined format * AUTHOR: Amos Jeffries * === modified file 'src/log/FormatHttpdCommon.cc' --- src/log/FormatHttpdCommon.cc 2012-08-14 11:53:07 +0000 +++ src/log/FormatHttpdCommon.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log - Apache common format * AUTHOR: Duane Wessels * === modified file 'src/log/FormatSquidCustom.cc' --- src/log/FormatSquidCustom.cc 2012-07-17 14:11:24 +0000 +++ src/log/FormatSquidCustom.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log - Squid Custom format * AUTHOR: Duane Wessels * === modified file 'src/log/FormatSquidIcap.cc' --- src/log/FormatSquidIcap.cc 2012-08-28 19:12:13 +0000 +++ src/log/FormatSquidIcap.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log - Squid ICAP Logging * AUTHOR: Alex Rousskov * @@ -42,7 +40,6 @@ #include "HttpRequest.h" #include "log/File.h" #include "log/Formats.h" -#include "protos.h" #include "SquidTime.h" void === modified file 'src/log/FormatSquidNative.cc' --- src/log/FormatSquidNative.cc 2012-08-14 11:53:07 +0000 +++ src/log/FormatSquidNative.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log - Squid format * AUTHOR: Duane Wessels * === modified file 'src/log/FormatSquidReferer.cc' --- src/log/FormatSquidReferer.cc 2012-07-17 14:11:24 +0000 +++ src/log/FormatSquidReferer.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log - Squid referer format * AUTHOR: Joe Ramey (useragent) * Jens-S. V?ckler (mod 4 referer) === modified file 'src/log/FormatSquidUseragent.cc' --- src/log/FormatSquidUseragent.cc 2012-07-17 14:11:24 +0000 +++ src/log/FormatSquidUseragent.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log - Squid useragent format * AUTHOR: Joe Ramey * AUTHOR: Amos Jeffries === modified file 'src/log/ModDaemon.cc' --- src/log/ModDaemon.cc 2012-08-28 13:00:30 +0000 +++ src/log/ModDaemon.cc 2012-08-31 16:57:39 +0000 @@ -38,7 +38,7 @@ #include "log/Config.h" #include "log/File.h" #include "log/ModDaemon.h" -#include "protos.h" +#include "SquidIpc.h" #include "SquidTime.h" #if HAVE_ERRNO_H === modified file 'src/log/ModStdio.cc' --- src/log/ModStdio.cc 2012-08-28 19:12:13 +0000 +++ src/log/ModStdio.cc 2012-08-31 16:57:39 +0000 @@ -37,7 +37,6 @@ #include "globals.h" #include "log/File.h" #include "log/ModStdio.h" -#include "protos.h" #if HAVE_ERRNO_H #include === modified file 'src/log/ModStdio.h' --- src/log/ModStdio.h 2010-11-21 04:40:05 +0000 +++ src/log/ModStdio.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 50 Log file handling * AUTHOR: Duane Wessels * === modified file 'src/log/ModSyslog.h' --- src/log/ModSyslog.h 2010-11-21 04:40:05 +0000 +++ src/log/ModSyslog.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 50 Log file handling * AUTHOR: Duane Wessels * === modified file 'src/log/ModTcp.cc' --- src/log/ModTcp.cc 2012-08-28 19:12:13 +0000 +++ src/log/ModTcp.cc 2012-08-31 16:57:39 +0000 @@ -39,7 +39,6 @@ #include "log/File.h" #include "log/ModTcp.h" #include "Parsing.h" -#include "protos.h" #include "structs.h" #if HAVE_ERRNO_H === modified file 'src/log/ModTcp.h' --- src/log/ModTcp.h 2010-11-21 04:40:05 +0000 +++ src/log/ModTcp.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 50 Log file handling * AUTHOR: Dhaval Varia * Developed based on ModUdp.* by Adrian Chadd === modified file 'src/log/ModUdp.cc' --- src/log/ModUdp.cc 2012-08-28 19:12:13 +0000 +++ src/log/ModUdp.cc 2012-08-31 16:57:39 +0000 @@ -38,7 +38,6 @@ #include "log/File.h" #include "log/ModUdp.h" #include "Parsing.h" -#include "protos.h" #include "structs.h" #if HAVE_ERRNO_H === modified file 'src/log/ModUdp.h' --- src/log/ModUdp.h 2010-11-21 04:40:05 +0000 +++ src/log/ModUdp.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 50 Log file handling * AUTHOR: Adrian Chadd * === modified file 'src/log/access_log.cc' --- src/log/access_log.cc 2012-08-28 19:12:13 +0000 +++ src/log/access_log.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 46 Access Log * AUTHOR: Duane Wessels * === modified file 'src/main.cc' --- src/main.cc 2012-08-28 19:12:13 +0000 +++ src/main.cc 2012-09-01 10:40:00 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 01 Startup and Main Loop * AUTHOR: Harvest Derived * @@ -36,6 +34,7 @@ #include "AccessLogEntry.h" #include "acl/Acl.h" #include "acl/Asn.h" +#include "AuthReg.h" #include "base/RunnersRegistry.h" #include "base/Subscription.h" #include "base/TextException.h" @@ -57,6 +56,7 @@ #include "forward.h" #include "fs/Module.h" #include "fqdncache.h" +#include "globals.h" #include "htcp.h" #include "HttpHeader.h" #include "HttpReply.h" @@ -64,20 +64,24 @@ #include "icmp/net_db.h" #include "ICP.h" #include "ident/Ident.h" +#include "ipcache.h" #include "ipc/Coordinator.h" #include "ipc/Kids.h" #include "ipc/Strand.h" #include "ip/tools.h" #include "Mem.h" #include "MemPool.h" +#include "mime.h" #include "neighbors.h" #include "pconn.h" #include "PeerSelectState.h" #include "peer_sourcehash.h" #include "peer_userhash.h" #include "profiler/Profiler.h" -#include "protos.h" +#include "redirect.h" #include "refresh.h" +#include "send-announce.h" +#include "store_log.h" #include "tools.h" #include "SquidDns.h" #include "SquidTime.h" @@ -86,9 +90,11 @@ #include "StoreFileSystem.h" #include "Store.h" #include "SwapDir.h" +#include "unlinkd.h" #include "URL.h" #include "wccp.h" #include "wccp2.h" +#include "WinSvc.h" #if USE_ADAPTATION #include "adaptation/Config.h" @@ -131,6 +137,9 @@ #if USE_SQUID_ESI #include "esi/Module.h" #endif +#if SQUID_SNMP +#include "snmp_core.h" +#endif #if HAVE_PATHS_H #include @@ -866,10 +875,8 @@ mimeInit(Config.mimeTablePathname); -#if USE_UNLINKD if (unlinkdNeeded()) unlinkdInit(); -#endif #if USE_DELAY_POOLS Config.ClientDelay.finalize(); @@ -1073,10 +1080,8 @@ #endif if (!configured_once) { -#if USE_UNLINKD if (unlinkdNeeded()) unlinkdInit(); -#endif urlInitialize(); statInit(); @@ -1275,12 +1280,7 @@ { ConfigureCurrentKid(argv[0]); -#if _SQUID_WINDOWS_ - int WIN32_init_err; -#endif - #if HAVE_SBRK - sbrk_start = sbrk(0); #endif @@ -1294,10 +1294,10 @@ #endif -#if _SQUID_WINDOWS_ + /* NOP under non-windows */ + int WIN32_init_err=0; if ((WIN32_init_err = WIN32_Subsystem_Init(&argc, &argv))) return WIN32_init_err; -#endif /* call mallopt() before anything else */ #if HAVE_MALLOPT @@ -1382,9 +1382,7 @@ /* we may want the parsing process to set this up in the future */ Store::Root(new StoreController); -#if USE_AUTH - Auth::Init(); /* required for config parsing */ -#endif + Auth::Init(); /* required for config parsing. NOP if !USE_AUTH */ Ip::ProbeTransport(); // determine IPv4 or IPv6 capabilities before parsing. Format::Token::Init(); // XXX: temporary. Use a runners registry of pre-parse runners instead. @@ -1543,24 +1541,18 @@ if (pid > 1) { #if USE_WIN32_SERVICE - if (opt_signal_service) { WIN32_sendSignal(opt_send_signal); exit(0); - } else -#if _SQUID_MSWIN_ - { + } else { fprintf(stderr, "%s: ERROR: Could not send ", APP_SHORTNAME); fprintf(stderr, "signal to Squid Service:\n"); fprintf(stderr, "missing -n command line switch.\n"); exit(1); } - /* NOTREACHED */ #endif -#endif - if (kill(pid, opt_send_signal) && /* ignore permissions if just running check */ !(opt_send_signal == 0 && errno == EPERM)) { @@ -1884,10 +1876,8 @@ #endif Store::Root().sync(); /* Flush pending object writes/unlinks */ -#if USE_UNLINKD - unlinkdClose(); /* after sync/flush */ -#endif + unlinkdClose(); /* after sync/flush. NOP if !USE_UNLINKD */ storeDirWriteCleanLogs(0); PrintRusage(); === modified file 'src/mem.cc' --- src/mem.cc 2012-08-28 19:12:13 +0000 +++ src/mem.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 13 High Level Memory Pool Management * AUTHOR: Harvest Derived * @@ -40,7 +38,7 @@ #include "MemBuf.h" #include "memMeter.h" #include "mgr/Registration.h" -#include "protos.h" +#include "SquidList.h" #include "SquidTime.h" #include "Store.h" #include "StoreEntryStream.h" === modified file 'src/mem_node.cc' --- src/mem_node.cc 2012-08-14 11:53:07 +0000 +++ src/mem_node.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Robert Collins * @@ -35,7 +33,6 @@ #include "squid.h" #include "mem_node.h" -#include "protos.h" static ptrdiff_t makeMemNodeDataOffset(); === modified file 'src/mem_node.h' --- src/mem_node.h 2012-08-14 11:53:07 +0000 +++ src/mem_node.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/mgr/Action.cc' --- src/mgr/Action.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/Action.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Action.h' --- src/mgr/Action.h 2012-08-28 13:00:30 +0000 +++ src/mgr/Action.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/ActionCreator.h' --- src/mgr/ActionCreator.h 2010-10-28 18:52:59 +0000 +++ src/mgr/ActionCreator.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/ActionParams.cc' --- src/mgr/ActionParams.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/ActionParams.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/ActionParams.h' --- src/mgr/ActionParams.h 2011-12-30 03:42:50 +0000 +++ src/mgr/ActionParams.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/ActionProfile.h' --- src/mgr/ActionProfile.h 2010-10-29 00:12:28 +0000 +++ src/mgr/ActionProfile.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/ActionWriter.cc' --- src/mgr/ActionWriter.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/ActionWriter.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/ActionWriter.h' --- src/mgr/ActionWriter.h 2012-08-28 13:00:30 +0000 +++ src/mgr/ActionWriter.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/BasicActions.cc' --- src/mgr/BasicActions.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/BasicActions.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/BasicActions.h' --- src/mgr/BasicActions.h 2012-08-28 13:00:30 +0000 +++ src/mgr/BasicActions.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Command.cc' --- src/mgr/Command.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/Command.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Command.h' --- src/mgr/Command.h 2010-10-29 00:12:28 +0000 +++ src/mgr/Command.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/CountersAction.cc' --- src/mgr/CountersAction.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/CountersAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -10,9 +8,9 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/CountersAction.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" +#include "tools.h" extern void GetCountersStats(Mgr::CountersActionData& stats); extern void DumpCountersStats(Mgr::CountersActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/CountersAction.h' --- src/mgr/CountersAction.h 2012-08-28 13:00:30 +0000 +++ src/mgr/CountersAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Filler.cc' --- src/mgr/Filler.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/Filler.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Filler.h' --- src/mgr/Filler.h 2010-11-26 09:55:11 +0000 +++ src/mgr/Filler.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Forwarder.cc' --- src/mgr/Forwarder.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/Forwarder.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Forwarder.h' --- src/mgr/Forwarder.h 2012-08-28 13:00:30 +0000 +++ src/mgr/Forwarder.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/FunAction.cc' --- src/mgr/FunAction.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/FunAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -14,8 +12,8 @@ #include "mgr/Filler.h" #include "mgr/FunAction.h" #include "mgr/Request.h" -#include "protos.h" #include "Store.h" +#include "tools.h" Mgr::FunAction::Pointer Mgr::FunAction::Create(const Command::Pointer &aCmd, OBJH* aHandler) === modified file 'src/mgr/FunAction.h' --- src/mgr/FunAction.h 2012-08-28 13:00:30 +0000 +++ src/mgr/FunAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/InfoAction.cc' --- src/mgr/InfoAction.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/InfoAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -17,9 +15,9 @@ #include "mgr/InfoAction.h" #include "mgr/Request.h" #include "mgr/Response.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" +#include "tools.h" extern void GetInfo(Mgr::InfoActionData& stats); extern void DumpInfo(Mgr::InfoActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/InfoAction.h' --- src/mgr/InfoAction.h 2012-08-28 13:00:30 +0000 +++ src/mgr/InfoAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Inquirer.cc' --- src/mgr/Inquirer.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/Inquirer.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Inquirer.h' --- src/mgr/Inquirer.h 2011-05-13 08:13:01 +0000 +++ src/mgr/Inquirer.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/IntParam.cc' --- src/mgr/IntParam.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/IntParam.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/IntParam.h' --- src/mgr/IntParam.h 2012-08-28 13:00:30 +0000 +++ src/mgr/IntParam.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/IntervalAction.cc' --- src/mgr/IntervalAction.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/IntervalAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -10,9 +8,9 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/IntervalAction.h" -#include "protos.h" #include "SquidMath.h" #include "Store.h" +#include "tools.h" extern void GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours); extern void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/IntervalAction.h' --- src/mgr/IntervalAction.h 2012-08-28 13:00:30 +0000 +++ src/mgr/IntervalAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/IoAction.cc' --- src/mgr/IoAction.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/IoAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -10,9 +8,9 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/IoAction.h" -#include "protos.h" #include "SquidMath.h" #include "Store.h" +#include "tools.h" extern void GetIoStats(Mgr::IoActionData& stats); extern void DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/IoAction.h' --- src/mgr/IoAction.h 2010-10-28 18:52:59 +0000 +++ src/mgr/IoAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/QueryParam.h' --- src/mgr/QueryParam.h 2012-08-28 13:00:30 +0000 +++ src/mgr/QueryParam.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/QueryParams.cc' --- src/mgr/QueryParams.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/QueryParams.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/QueryParams.h' --- src/mgr/QueryParams.h 2012-08-28 13:00:30 +0000 +++ src/mgr/QueryParams.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Registration.cc' --- src/mgr/Registration.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/Registration.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Registration.h' --- src/mgr/Registration.h 2010-10-29 00:12:28 +0000 +++ src/mgr/Registration.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Request.cc' --- src/mgr/Request.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/Request.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Request.h' --- src/mgr/Request.h 2012-08-28 13:00:30 +0000 +++ src/mgr/Request.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Response.cc' --- src/mgr/Response.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/Response.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/Response.h' --- src/mgr/Response.h 2012-08-28 13:00:30 +0000 +++ src/mgr/Response.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/ServiceTimesAction.cc' --- src/mgr/ServiceTimesAction.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/ServiceTimesAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -10,8 +8,8 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/ServiceTimesAction.h" -#include "protos.h" #include "Store.h" +#include "tools.h" extern void GetServiceTimesStats(Mgr::ServiceTimesActionData& stats); extern void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/ServiceTimesAction.h' --- src/mgr/ServiceTimesAction.h 2012-08-28 13:00:30 +0000 +++ src/mgr/ServiceTimesAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/StoreIoAction.cc' --- src/mgr/StoreIoAction.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/StoreIoAction.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -10,8 +8,8 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/StoreIoAction.h" -#include "protos.h" #include "Store.h" +#include "tools.h" Mgr::StoreIoActionData::StoreIoActionData() { === modified file 'src/mgr/StoreIoAction.h' --- src/mgr/StoreIoAction.h 2012-08-28 13:00:30 +0000 +++ src/mgr/StoreIoAction.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/StoreToCommWriter.cc' --- src/mgr/StoreToCommWriter.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/StoreToCommWriter.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ @@ -12,7 +10,6 @@ #include "comm/Write.h" #include "ipc/FdNotes.h" #include "mgr/StoreToCommWriter.h" -#include "protos.h" #include "StoreClient.h" #include "Store.h" === modified file 'src/mgr/StoreToCommWriter.h' --- src/mgr/StoreToCommWriter.h 2012-08-28 13:00:30 +0000 +++ src/mgr/StoreToCommWriter.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/StringParam.cc' --- src/mgr/StringParam.cc 2012-08-28 13:00:30 +0000 +++ src/mgr/StringParam.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/StringParam.h' --- src/mgr/StringParam.h 2012-08-28 13:00:30 +0000 +++ src/mgr/StringParam.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mgr/forward.h' --- src/mgr/forward.h 2011-01-24 17:24:59 +0000 +++ src/mgr/forward.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 16 Cache Manager API * */ === modified file 'src/mime.cc' --- src/mime.cc 2012-08-28 19:12:13 +0000 +++ src/mime.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 25 MIME Parsing and Internal Icons * AUTHOR: Harvest Derived * @@ -43,8 +41,8 @@ #include "internal.h" #include "Mem.h" #include "MemBuf.h" +#include "mime.h" #include "MemObject.h" -#include "protos.h" #include "Store.h" #include "StoreClient.h" @@ -54,6 +52,10 @@ #define GET_HDR_SZ 1024 +/* forward declarations */ +static void mimeFreeMemory(void); +static char const *mimeGetIcon(const char *fn); + class MimeIcon : public StoreClient { === added file 'src/mime.h' --- src/mime.h 1970-01-01 00:00:00 +0000 +++ src/mime.h 2012-08-29 12:56:25 +0000 @@ -0,0 +1,44 @@ +/* + * DEBUG: section + * AUTHOR: + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef SQUID_MIME_H_ +#define SQUID_MIME_H_ + +extern void mimeInit(char *filename); +extern char *mimeGetContentEncoding(const char *fn); +extern char *mimeGetContentType(const char *fn); +extern const char *mimeGetIconURL(const char *fn); +extern char mimeGetTransferMode(const char *fn); +extern int mimeGetDownloadOption(const char *fn); +extern int mimeGetViewOption(const char *fn); + +#endif /* SQUID_MIME_H_ */ === modified file 'src/mime_header.cc' --- src/mime_header.cc 2012-08-28 13:00:30 +0000 +++ src/mime_header.cc 2012-08-29 12:36:10 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 25 MiME Header Parsing * AUTHOR: Harvest Derived * === added file 'src/mime_header.h' --- src/mime_header.h 1970-01-01 00:00:00 +0000 +++ src/mime_header.h 2012-08-29 12:36:10 +0000 @@ -0,0 +1,40 @@ +/* + * DEBUG: section 25 MiME Header Parsing + * AUTHOR: Harvest Derived + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef SQUID_MIME_HEADER_H_ +#define SQUID_MIME_HEADER_H_ + +extern char *mime_get_header(const char *mime, const char *header); +extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix); +extern size_t headersEnd(const char *, size_t); + +#endif /* SQUID_MIME_HEADER_H_ */ === modified file 'src/multicast.cc' --- src/multicast.cc 2012-08-14 11:53:07 +0000 +++ src/multicast.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 07 Multicast * AUTHOR: Martin Hamilton * @@ -39,6 +37,7 @@ // XXX: for icpIncomingConn - need to pass it as a generic parameter. #include "ICP.h" #include "ipcache.h" +#include "multicast.h" int mcastSetTtl(int fd, int mcast_ttl) === added file 'src/multicast.h' --- src/multicast.h 1970-01-01 00:00:00 +0000 +++ src/multicast.h 2012-08-29 14:08:06 +0000 @@ -0,0 +1,41 @@ +/* + * DEBUG: section + * AUTHOR: + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef SQUID_MULTICAST_H_ +#define SQUID_MULTICAST_H_ + +#include "ipcache.h" + +extern int mcastSetTtl(int, int); +extern IPH mcastJoinGroups; + +#endif /* SQUID_MULTICAST_H_ */ === modified file 'src/neighbors.cc' --- src/neighbors.cc 2012-08-30 14:39:04 +0000 +++ src/neighbors.cc 2012-09-03 07:16:45 +0000 @@ -37,25 +37,28 @@ #include "comm/Connection.h" #include "comm/ConnOpener.h" #include "event.h" +#include "forward.h" #include "globals.h" #include "htcp.h" #include "HttpRequest.h" #include "icmp/net_db.h" #include "ICP.h" +#include "int.h" #include "ip/Address.h" #include "ip/tools.h" #include "ipcache.h" #include "MemObject.h" #include "mgr/Registration.h" +#include "multicast.h" #include "neighbors.h" #include "PeerDigest.h" #include "PeerSelectState.h" -#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" #include "stat.h" #include "Store.h" #include "store_key_md5.h" +#include "tools.h" #include "URL.h" /* count mcast group peers every 15 minutes */ === modified file 'src/pconn.cc' --- src/pconn.cc 2012-08-28 19:12:13 +0000 +++ src/pconn.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 48 Persistent Connections * AUTHOR: Duane Wessels * @@ -40,7 +38,6 @@ #include "globals.h" #include "mgr/Registration.h" #include "pconn.h" -#include "protos.h" #include "Store.h" #define PCONN_FDS_SZ 8 /* pconn set size, increase for better memcache hit rate */ === modified file 'src/peer_digest.cc' --- src/peer_digest.cc 2012-08-28 19:12:13 +0000 +++ src/peer_digest.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 72 Peer Digest Routines * AUTHOR: Alex Rousskov * @@ -38,13 +36,14 @@ #include "CacheDigest.h" #include "event.h" #include "forward.h" +#include "globals.h" #include "HttpReply.h" #include "HttpRequest.h" #include "internal.h" #include "MemObject.h" #include "neighbors.h" +#include "mime_header.h" #include "PeerDigest.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" #include "store_key_md5.h" === modified file 'src/peer_proxy_negotiate_auth.cc' --- src/peer_proxy_negotiate_auth.cc 2012-08-28 13:00:30 +0000 +++ src/peer_proxy_negotiate_auth.cc 2012-09-01 08:17:17 +0000 @@ -26,10 +26,13 @@ */ #include "squid.h" + +#if HAVE_KRB5 && HAVE_GSSAPI + #include "base64.h" #include "Debug.h" +#include "peer_proxy_negotiate_auth.h" -#if HAVE_KRB5 && HAVE_GSSAPI #ifdef __cplusplus extern "C" { #endif === added file 'src/peer_proxy_negotiate_auth.h' --- src/peer_proxy_negotiate_auth.h 1970-01-01 00:00:00 +0000 +++ src/peer_proxy_negotiate_auth.h 2012-09-03 09:02:20 +0000 @@ -0,0 +1,40 @@ +#ifndef SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ +#define SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ +/* + * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) + * AUTHOR: Markus Moeller (markus_moeller at compuserve.com) + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI + /* upstream proxy authentication */ +SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy); +#endif + +#endif /* SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ */ === modified file 'src/peer_select.cc' --- src/peer_select.cc 2012-08-28 19:12:13 +0000 +++ src/peer_select.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 44 Peer Selection Algorithm * AUTHOR: Duane Wessels * @@ -40,6 +38,7 @@ #include "errorpage.h" #include "event.h" #include "forward.h" +#include "globals.h" #include "hier_code.h" #include "htcp.h" #include "HttpRequest.h" @@ -51,7 +50,6 @@ #include "peer_sourcehash.h" #include "peer_userhash.h" #include "PeerSelectState.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" === modified file 'src/peer_sourcehash.cc' --- src/peer_sourcehash.cc 2012-08-28 19:12:13 +0000 +++ src/peer_sourcehash.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 39 Peer source hash based selection * AUTHOR: Henrik Nordstrom * BASED ON: carp.cc @@ -38,7 +36,6 @@ #include "HttpRequest.h" #include "mgr/Registration.h" #include "neighbors.h" -#include "protos.h" #include "Store.h" #if HAVE_MATH_H === modified file 'src/peer_userhash.cc' --- src/peer_userhash.cc 2012-08-28 19:12:13 +0000 +++ src/peer_userhash.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 39 Peer user hash based selection * AUTHOR: Henrik Nordstrom * BASED ON: carp.cc @@ -43,7 +41,6 @@ #include "HttpRequest.h" #include "mgr/Registration.h" #include "neighbors.h" -#include "protos.h" #include "Store.h" #if HAVE_MATH_H === modified file 'src/protos.h' --- src/protos.h 2012-08-29 00:12:28 +0000 +++ src/protos.h 2012-09-03 08:44:53 +0000 @@ -29,304 +29,8 @@ #ifndef SQUID_PROTOS_H #define SQUID_PROTOS_H -/* included for routines that have not moved out to their proper homes - * yet. - */ -#include "Packer.h" -/* for routines still in this file that take CacheManager parameters */ -#include "ip/Address.h" -/* for parameters that still need these */ -#include "enums.h" -/* some parameters stil need this */ -#include "wordlist.h" -#include "anyp/ProtocolType.h" -#include "Debug.h" -#include "HttpHeader.h" -#include "HttpStatusCode.h" -#include "lookup_t.h" - -class HttpRequestMethod; -#if USE_DELAY_POOLS -class ClientInfo; -#endif - -class FwdState; - -class HttpRequest; -class HttpReply; - -/* TODO: move to StrList.h */ -SQUIDCEXTERN void strListAdd(String * str, const char *item, char del); -SQUIDCEXTERN int strListIsMember(const String * str, const char *item, char del); -SQUIDCEXTERN int strListIsSubstr(const String * list, const char *s, char del); -SQUIDCEXTERN int strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos); - -extern const char *getStringPrefix(const char *str, const char *end); - -/* store report about current header usage and other stats */ -void httpHeaderStoreReport(StoreEntry * e); -SQUIDCEXTERN void httpHdrMangleList(HttpHeader *, HttpRequest *, int req_or_rep); - -#if SQUID_SNMP -SQUIDCEXTERN PF snmpHandleUdp; -SQUIDCEXTERN void snmpInit(void); -SQUIDCEXTERN void snmpOpenPorts(void); -SQUIDCEXTERN void snmpClosePorts(void); -SQUIDCEXTERN const char * snmpDebugOid(oid * Name, snint Len, MemBuf &outbuf); - -SQUIDCEXTERN void addr2oid(Ip::Address &addr, oid *Dest); -SQUIDCEXTERN void oid2addr(oid *Dest, Ip::Address &addr, u_int code); - -SQUIDCEXTERN Ip::Address *client_entry(Ip::Address *current); -extern variable_list *snmp_basicFn(variable_list *, snint *); -extern variable_list *snmp_confFn(variable_list *, snint *); -extern variable_list *snmp_sysFn(variable_list *, snint *); -extern variable_list *snmp_prfSysFn(variable_list *, snint *); -extern variable_list *snmp_prfProtoFn(variable_list *, snint *); -extern variable_list *snmp_prfPeerFn(variable_list *, snint *); -extern variable_list *snmp_netIpFn(variable_list *, snint *); -extern variable_list *snmp_netFqdnFn(variable_list *, snint *); -extern variable_list *snmp_netDnsFn(variable_list *, snint *); -extern variable_list *snmp_meshPtblFn(variable_list *, snint *); -extern variable_list *snmp_meshCtblFn(variable_list *, snint *); -#endif /* SQUID_SNMP */ - -extern char *mime_get_header(const char *mime, const char *header); -extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix); -extern size_t headersEnd(const char *, size_t); - -extern void mimeInit(char *filename); -extern void mimeFreeMemory(void); -extern char *mimeGetContentEncoding(const char *fn); -extern char *mimeGetContentType(const char *fn); -extern char const *mimeGetIcon(const char *fn); -extern const char *mimeGetIconURL(const char *fn); -extern char mimeGetTransferMode(const char *fn); -extern int mimeGetDownloadOption(const char *fn); -extern int mimeGetViewOption(const char *fn); - -#include "ipcache.h" -extern int mcastSetTtl(int, int); -extern IPH mcastJoinGroups; - -#include "comm/forward.h" -extern void getOutgoingAddress(HttpRequest * request, Comm::ConnectionPointer conn); -extern Ip::Address getOutgoingAddr(HttpRequest * request, struct peer *dst_peer); - -SQUIDCEXTERN void urnStart(HttpRequest *, StoreEntry *); - -SQUIDCEXTERN void redirectInit(void); -SQUIDCEXTERN void redirectShutdown(void); - extern void shut_down(int); extern void rotate_logs(int); extern void reconfigure(int); -extern void start_announce(void *unused); -extern void waisStart(FwdState *); - -/* ----------------------------------------------------------------- */ - -/* repl_modules.c */ -extern void storeReplSetup(void); - -/* - * store_log.c - */ -extern void storeLog(int tag, const StoreEntry * e); -extern void storeLogRotate(void); -extern void storeLogClose(void); -extern void storeLogOpen(void); - -/* - * store_digest.c - */ -extern void storeDigestInit(void); -extern void storeDigestNoteStoreReady(void); -extern void storeDigestScheduleRebuild(void); -extern void storeDigestDel(const StoreEntry * entry); -extern void storeDigestReport(StoreEntry *); - -/* - * store_rebuild.c - */ -SQUIDCEXTERN void storeRebuildStart(void); - -SQUIDCEXTERN void storeRebuildComplete(struct _store_rebuild_data *); -SQUIDCEXTERN void storeRebuildProgress(int sd_index, int total, int sofar); - -/// loads entry from disk; fills supplied memory buffer on success -extern bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, struct _store_rebuild_data &counts); -/// parses entry buffer and validates entry metadata; fills e on success -extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, struct _store_rebuild_data &counts, uint64_t expectedSize); -/// checks whether the loaded entry should be kept; updates counters -extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts); - -/* - * store_swapin.c - */ -class store_client; -extern void storeSwapInStart(store_client *); - -/* - * store_client.c - */ -SQUIDCEXTERN store_client *storeClientListAdd(StoreEntry * e, void *data); -SQUIDCEXTERN int storeClientCopyPending(store_client *, StoreEntry * e, void *data); -SQUIDCEXTERN int storeUnregister(store_client * sc, StoreEntry * e, void *data) -; -SQUIDCEXTERN int storePendingNClients(const StoreEntry * e); -SQUIDCEXTERN int storeClientIsThisAClient(store_client * sc, void *someClient); - -SQUIDCEXTERN const char *getMyHostname(void); -SQUIDCEXTERN const char *uniqueHostname(void); -SQUIDCEXTERN void safeunlink(const char *path, int quiet); - -#include "fatal.h" -extern void death(int sig); -extern void sigusr2_handle(int sig); -extern void sig_child(int sig); -extern void sig_shutdown(int sig); ///< handles shutdown notifications from kids -SQUIDCEXTERN void leave_suid(void); -SQUIDCEXTERN void enter_suid(void); -SQUIDCEXTERN void no_suid(void); -SQUIDCEXTERN void writePidFile(void); -SQUIDCEXTERN void setSocketShutdownLifetimes(int); -SQUIDCEXTERN void setMaxFD(void); -SQUIDCEXTERN void setSystemLimits(void); -extern void squid_signal(int sig, SIGHDLR *, int flags); -SQUIDCEXTERN pid_t readPidFile(void); -SQUIDCEXTERN void keepCapabilities(void); -SQUIDCEXTERN void BroadcastSignalIfAny(int& sig); -/// whether the current process is the parent of all other Squid processes -SQUIDCEXTERN bool IamMasterProcess(); -/** - whether the current process is dedicated to doing things that only - a single process should do, such as PID file maintenance and WCCP -*/ -SQUIDCEXTERN bool IamPrimaryProcess(); -/// whether the current process coordinates worker processes -SQUIDCEXTERN bool IamCoordinatorProcess(); -/// whether the current process handles HTTP transactions and such -SQUIDCEXTERN bool IamWorkerProcess(); -/// whether the current process is dedicated to managing a cache_dir -extern bool IamDiskProcess(); -/// Whether we are running in daemon mode -SQUIDCEXTERN bool InDaemonMode(); // try using specific Iam*() checks above first -/// Whether there should be more than one worker process running -SQUIDCEXTERN bool UsingSmp(); // try using specific Iam*() checks above first -/// number of Kid processes as defined in src/ipc/Kid.h -SQUIDCEXTERN int NumberOfKids(); -/// a string describing this process roles such as worker or coordinator -extern String ProcessRoles(); -SQUIDCEXTERN int DebugSignal; - -/* AYJ debugs function to show locations being reset with memset() */ -SQUIDCEXTERN void *xmemset(void *dst, int, size_t); - -SQUIDCEXTERN void debug_trap(const char *); -SQUIDCEXTERN void logsFlush(void); -SQUIDCEXTERN const char *checkNullString(const char *p); - -SQUIDCEXTERN void squid_getrusage(struct rusage *r); - -SQUIDCEXTERN double rusage_cputime(struct rusage *r); - -SQUIDCEXTERN int rusage_maxrss(struct rusage *r); - -SQUIDCEXTERN int rusage_pagefaults(struct rusage *r); -SQUIDCEXTERN void releaseServerSockets(void); -SQUIDCEXTERN void PrintRusage(void); -SQUIDCEXTERN void dumpMallocStats(void); - -#if USE_UNLINKD -SQUIDCEXTERN bool unlinkdNeeded(void); -SQUIDCEXTERN void unlinkdInit(void); -SQUIDCEXTERN void unlinkdClose(void); -SQUIDCEXTERN void unlinkdUnlink(const char *); -#endif - -SQUIDCEXTERN peer_t parseNeighborType(const char *s); - -SQUIDCEXTERN int stringHasWhitespace(const char *); //String.cc -SQUIDCEXTERN int stringHasCntl(const char *); //String.cc -SQUIDCEXTERN void linklistPush(link_list **, void *); //list.cc -SQUIDCEXTERN void *linklistShift(link_list **); //list.cc -SQUIDCEXTERN int xrename(const char *from, const char *to); //disk.cc -extern int isPowTen(int); //int.cc - -SQUIDCEXTERN char *strwordtok(char *buf, char **t); //String.cc - -/* - * ipc.c - */ -SQUIDCEXTERN pid_t ipcCreate(int type, - const char *prog, - const char *const args[], - const char *name, - Ip::Address &local_addr, - int *rfd, - int *wfd, - void **hIpc); - -/* - * prototypes for system functions missing from system includes - */ - -#if _SQUID_SOLARIS_ - -SQUIDCEXTERN int getrusage(int, struct rusage *); -SQUIDCEXTERN int getpagesize(void); -#if !defined(_XPG4_2) && !(defined(__EXTENSIONS__) || \ -(!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE))) -SQUIDCEXTERN int gethostname(char *, int); -#endif -#endif - -/* - * hack to allow snmp access to the statistics counters - */ -class StatCounters; - SQUIDCEXTERN StatCounters *snmpStatGet(int); - - /* CygWin & Windows NT Port */ - /* win32.c */ -#if _SQUID_WINDOWS_ - SQUIDCEXTERN int WIN32_Subsystem_Init(int *, char ***); - SQUIDCEXTERN void WIN32_sendSignal(int); - SQUIDCEXTERN void WIN32_Abort(int); - SQUIDCEXTERN void WIN32_Exit(void); - SQUIDCEXTERN void WIN32_SetServiceCommandLine(void); - SQUIDCEXTERN void WIN32_InstallService(void); - SQUIDCEXTERN void WIN32_RemoveService(void); - SQUIDCEXTERN int SquidMain(int, char **); -#endif /* _SQUID_WINDOWS_ */ -#if _SQUID_MSWIN_ - - SQUIDCEXTERN int WIN32_pipe(int[2]); - - SQUIDCEXTERN int WIN32_getrusage(int, struct rusage *); - SQUIDCEXTERN void WIN32_ExceptionHandlerInit(void); - - SQUIDCEXTERN int Win32__WSAFDIsSet(int fd, fd_set* set); - SQUIDCEXTERN DWORD WIN32_IpAddrChangeMonitorInit(); - -#endif - - extern char *strtokFile(void); - -#if USE_AUTH - -#if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI - /* upstream proxy authentication */ - SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy); -#endif - - namespace Auth { - /* call to ensure the auth component schemes exist. */ - extern void Init(void); - } // namespace Auth - -#endif /* USE_AUTH */ - #endif /* SQUID_PROTOS_H */ === modified file 'src/recv-announce.cc' --- src/recv-announce.cc 2012-08-28 13:00:30 +0000 +++ src/recv-announce.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 00 Announcement Server * AUTHOR: Harvest Derived * === modified file 'src/redirect.cc' --- src/redirect.cc 2012-08-28 19:12:13 +0000 +++ src/redirect.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 61 Redirector * AUTHOR: Duane Wessels * @@ -45,7 +42,7 @@ #include "HttpRequest.h" #include "helper.h" #include "mgr/Registration.h" -#include "protos.h" +#include "redirect.h" #include "rfc1738.h" #include "Store.h" #if USE_AUTH === added file 'src/redirect.h' --- src/redirect.h 1970-01-01 00:00:00 +0000 +++ src/redirect.h 2012-08-29 14:51:57 +0000 @@ -0,0 +1,39 @@ +#ifndef SQUID_REDIRECT_H_ +#define SQUID_REDIRECT_H_ + +/* + * DEBUG: section 61 Redirector + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +extern void redirectInit(void); +extern void redirectShutdown(void); + +#endif /* SQUID_REDIRECT_H_ */ === modified file 'src/refresh.cc' --- src/refresh.cc 2012-08-28 19:12:13 +0000 +++ src/refresh.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 22 Refresh Calculation * AUTHOR: Harvest Derived * @@ -43,7 +41,6 @@ #include "HttpRequest.h" #include "HttpReply.h" #include "MemObject.h" -#include "protos.h" #include "SquidTime.h" #include "Store.h" #include "URL.h" === modified file 'src/repl/heap/store_heap_replacement.cc' --- src/repl/heap/store_heap_replacement.cc 2012-08-28 13:00:30 +0000 +++ src/repl/heap/store_heap_replacement.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Heap-based replacement * AUTHOR: John Dilley * === modified file 'src/repl/heap/store_repl_heap.cc' --- src/repl/heap/store_repl_heap.cc 2012-08-14 11:53:07 +0000 +++ src/repl/heap/store_repl_heap.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 81 Store HEAP Removal Policies * AUTHOR: Henrik Nordstrom * @@ -43,8 +41,8 @@ #include "squid.h" #include "heap.h" -#include "protos.h" #include "store_heap_replacement.h" +#include "SquidList.h" #include "Store.h" #include "MemObject.h" #include "wordlist.h" === modified file 'src/repl/lru/store_repl_lru.cc' --- src/repl/lru/store_repl_lru.cc 2012-08-14 11:53:07 +0000 +++ src/repl/lru/store_repl_lru.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: none LRU Removal Policy * AUTHOR: Henrik Nordstrom * === added file 'src/repl_modules.h' --- src/repl_modules.h 1970-01-01 00:00:00 +0000 +++ src/repl_modules.h 2012-08-29 15:48:14 +0000 @@ -0,0 +1,38 @@ +#ifndef SQUID_REPL_MODULES_H_ +#define SQUID_REPL_MODULES_H_ +/* + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +/* + * Note: repl_modules.cc will be autogenerated. + */ + +extern void storeReplSetup(void); + +#endif /* SQUID_REPL_MODULES_H_ */ === modified file 'src/send-announce.cc' --- src/send-announce.cc 2012-08-28 19:12:13 +0000 +++ src/send-announce.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 27 Cache Announcer * AUTHOR: Duane Wessels * @@ -42,7 +39,6 @@ #include "globals.h" #include "ICP.h" #include "ipcache.h" -#include "protos.h" #include "SquidTime.h" #include "tools.h" === added file 'src/send-announce.h' --- src/send-announce.h 1970-01-01 00:00:00 +0000 +++ src/send-announce.h 2012-08-29 15:14:00 +0000 @@ -0,0 +1,37 @@ +#ifndef SQUID_SEND_ANNOUNCE_H_ +#define SQUID_SEND_ANNOUNCE_H_ +/* + * DEBUG: section 27 Cache Announcer + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +extern void start_announce(void *unused); + +#endif /* SQUID_SEND_ANNOUNCE_H_ */ === modified file 'src/snmp/Forwarder.cc' --- src/snmp/Forwarder.cc 2012-08-28 13:00:30 +0000 +++ src/snmp/Forwarder.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Forwarder.h' --- src/snmp/Forwarder.h 2012-08-28 13:00:30 +0000 +++ src/snmp/Forwarder.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Inquirer.cc' --- src/snmp/Inquirer.cc 2012-08-28 13:00:30 +0000 +++ src/snmp/Inquirer.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Inquirer.h' --- src/snmp/Inquirer.h 2012-08-28 13:00:30 +0000 +++ src/snmp/Inquirer.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Pdu.cc' --- src/snmp/Pdu.cc 2012-08-28 13:00:30 +0000 +++ src/snmp/Pdu.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ @@ -8,10 +6,10 @@ #include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" -#include "protos.h" #include "snmp_core.h" #include "snmp/Pdu.h" #include "snmp/Var.h" +#include "tools.h" #if HAVE_ALGORITHM #include #endif === modified file 'src/snmp/Pdu.h' --- src/snmp/Pdu.h 2012-08-28 13:00:30 +0000 +++ src/snmp/Pdu.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Request.cc' --- src/snmp/Request.cc 2012-08-28 13:00:30 +0000 +++ src/snmp/Request.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Request.h' --- src/snmp/Request.h 2012-08-28 13:00:30 +0000 +++ src/snmp/Request.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Response.cc' --- src/snmp/Response.cc 2012-08-28 13:00:30 +0000 +++ src/snmp/Response.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Response.h' --- src/snmp/Response.h 2011-02-03 08:02:28 +0000 +++ src/snmp/Response.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Session.cc' --- src/snmp/Session.cc 2012-08-28 13:00:30 +0000 +++ src/snmp/Session.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ @@ -8,8 +6,8 @@ #include "squid.h" #include "base/TextException.h" #include "ipc/TypedMsgHdr.h" -#include "protos.h" #include "snmp/Session.h" +#include "tools.h" Snmp::Session::Session() { === modified file 'src/snmp/Session.h' --- src/snmp/Session.h 2012-08-28 13:00:30 +0000 +++ src/snmp/Session.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/Var.cc' --- src/snmp/Var.cc 2012-08-28 13:00:30 +0000 +++ src/snmp/Var.cc 2012-09-03 08:58:40 +0000 @@ -1,15 +1,14 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ #include "squid.h" #include "base/TextException.h" +#include "Debug.h" #include "ipc/TypedMsgHdr.h" -#include "protos.h" #include "snmp/Var.h" +#include "tools.h" #if HAVE_ALGORITHM #include #endif === modified file 'src/snmp/Var.h' --- src/snmp/Var.h 2012-08-28 13:00:30 +0000 +++ src/snmp/Var.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp/forward.h' --- src/snmp/forward.h 2011-05-30 06:02:25 +0000 +++ src/snmp/forward.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ === modified file 'src/snmp_agent.cc' --- src/snmp_agent.cc 2012-08-28 19:12:13 +0000 +++ src/snmp_agent.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * AUTHOR: Kostas Anagnostakis * @@ -37,13 +35,15 @@ #include "globals.h" #include "mem_node.h" #include "neighbors.h" -#include "protos.h" +#include "snmp_agent.h" +#include "snmp_core.h" #include "StatCounters.h" #include "StatHist.h" #include "SquidMath.h" #include "SquidTime.h" #include "stat.h" #include "Store.h" +#include "tools.h" /************************************************************************ === added file 'src/snmp_agent.h' --- src/snmp_agent.h 1970-01-01 00:00:00 +0000 +++ src/snmp_agent.h 2012-08-31 15:45:51 +0000 @@ -0,0 +1,50 @@ +#ifndef SQUID_SNMP_AGENT_H_ +#define SQUID_SNMP_AGENT_H_ +/* + * DEBUG: section + * AUTHOR: + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#if SQUID_SNMP + +#include "snmp_vars.h" + +extern variable_list *snmp_confFn(variable_list *, snint *); +extern variable_list *snmp_sysFn(variable_list *, snint *); +extern variable_list *snmp_prfSysFn(variable_list *, snint *); +extern variable_list *snmp_prfProtoFn(variable_list *, snint *); +extern variable_list *snmp_netIpFn(variable_list *, snint *); +extern variable_list *snmp_netFqdnFn(variable_list *, snint *); +extern variable_list *snmp_netDnsFn(variable_list *, snint *); +extern variable_list *snmp_meshPtblFn(variable_list *, snint *); +extern variable_list *snmp_meshCtblFn(variable_list *, snint *); + +#endif /* SQUID_SNMP */ +#endif /* SQUID_SNMP_AGENT_H_ */ === modified file 'src/snmp_core.cc' --- src/snmp_core.cc 2012-08-28 13:00:30 +0000 +++ src/snmp_core.cc 2012-08-31 16:57:39 +0000 @@ -32,15 +32,17 @@ #include "squid.h" #include "acl/FilledChecklist.h" #include "base/CbcPointer.h" +#include "client_db.h" #include "comm.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "comm/UdpOpenDialer.h" #include "ip/Address.h" #include "ip/tools.h" -#include "protos.h" +#include "snmp_agent.h" #include "snmp_core.h" #include "snmp/Forwarder.h" +#include "tools.h" static void snmpPortOpened(const Comm::ConnectionPointer &conn, int errNo); === modified file 'src/snmp_core.h' --- src/snmp_core.h 2012-08-28 13:00:30 +0000 +++ src/snmp_core.h 2012-09-03 09:02:20 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 49 SNMP Interface * */ @@ -10,6 +8,12 @@ #include "cache_snmp.h" #include "comm/forward.h" +#include "typedefs.h" + +namespace Ip { + class Address; +} +class MemBuf; #define SNMP_REQUEST_SIZE 4096 #define MAX_PROTOSTAT 5 @@ -36,4 +40,12 @@ extern Comm::ConnectionPointer snmpOutgoingConn; +extern PF snmpHandleUdp; +extern void snmpInit(void); +extern void snmpOpenPorts(void); +extern void snmpClosePorts(void); +extern const char * snmpDebugOid(oid * Name, snint Len, MemBuf &outbuf); +extern void addr2oid(Ip::Address &addr, oid *Dest); +extern void oid2addr(oid *Dest, Ip::Address &addr, u_int code); + #endif /* SQUID_SNMP_CORE_H */ === modified file 'src/ssl/ErrorDetailManager.cc' --- src/ssl/ErrorDetailManager.cc 2012-08-28 13:00:30 +0000 +++ src/ssl/ErrorDetailManager.cc 2012-08-31 16:57:39 +0000 @@ -2,7 +2,7 @@ #include "ErrorDetail.h" #include "errorpage.h" #include "ErrorDetailManager.h" -#include "protos.h" +#include "mime_header.h" void Ssl::errorDetailInitialize() { === modified file 'src/ssl/ServerBump.cc' --- src/ssl/ServerBump.cc 2012-08-28 19:12:13 +0000 +++ src/ssl/ServerBump.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 33 Client-side Routines * */ @@ -9,9 +7,9 @@ #include "client_side.h" #include "forward.h" -#include "protos.h" #include "ssl/ServerBump.h" #include "Store.h" +#include "StoreClient.h" #include "URL.h" CBDATA_NAMESPACED_CLASS_INIT(Ssl, ServerBump); === modified file 'src/ssl/helper.cc' --- src/ssl/helper.cc 2012-08-28 19:12:13 +0000 +++ src/ssl/helper.cc 2012-08-31 16:57:39 +0000 @@ -4,13 +4,12 @@ #include "squid.h" #include "anyp/PortCfg.h" -#include "protos.h" #include "ssl/Config.h" #include "ssl/helper.h" +#include "SquidString.h" #include "SquidTime.h" #include "SwapDir.h" #include "wordlist.h" -#include "protos.h" Ssl::Helper * Ssl::Helper::GetInstance() { === modified file 'src/ssl/support.cc' --- src/ssl/support.cc 2012-09-06 13:12:26 +0000 +++ src/ssl/support.cc 2012-09-09 17:13:42 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Benno Rice * DEBUG: section 83 SSL accelerator support * @@ -44,7 +42,6 @@ #include "anyp/PortCfg.h" #include "fde.h" #include "globals.h" -#include "protos.h" #include "ssl/ErrorDetail.h" #include "ssl/support.h" #include "ssl/gadgets.h" === modified file 'src/ssl/support.h' --- src/ssl/support.h 2012-09-06 13:12:26 +0000 +++ src/ssl/support.h 2012-09-09 17:13:42 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Benno Rice * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ === modified file 'src/stat.cc' --- src/stat.cc 2012-08-28 19:12:13 +0000 +++ src/stat.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived * @@ -55,13 +53,14 @@ #include "mgr/ServiceTimesAction.h" #include "neighbors.h" #include "PeerDigest.h" -#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" #include "StatCounters.h" #include "stat.h" #include "StoreClient.h" #include "Store.h" +#include "store_digest.h" +#include "tools.h" #if USE_AUTH #include "auth/UserRequest.h" #endif === modified file 'src/stat.h' --- src/stat.h 2012-08-28 19:12:13 +0000 +++ src/stat.h 2012-08-31 13:33:06 +0000 @@ -44,4 +44,7 @@ extern double statRequestHitDiskRatio(int minutes); extern double statByteHitRatio(int minutes); +class StatCounters; +extern StatCounters *snmpStatGet(int); + #endif /* SQUID_STAT_H_ */ === modified file 'src/stmem.cc' --- src/stmem.cc 2012-08-28 13:00:30 +0000 +++ src/stmem.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Harvest Derived * === modified file 'src/stmem.h' --- src/stmem.h 2009-01-21 03:47:47 +0000 +++ src/stmem.h 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'src/store.cc' --- src/store.cc 2012-08-28 19:12:13 +0000 +++ src/store.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived * @@ -40,6 +38,7 @@ #include "ETag.h" #include "event.h" #include "fde.h" +#include "globals.h" #include "http.h" #include "HttpReply.h" #include "HttpRequest.h" @@ -48,19 +47,24 @@ #include "mgr/Registration.h" #include "mgr/StoreIoAction.h" #include "profiler/Profiler.h" -#include "protos.h" +#include "repl_modules.h" #include "SquidTime.h" #include "Stack.h" #include "StatCounters.h" #include "stmem.h" +#include "store_digest.h" +#include "store_key_md5.h" +#include "store_key_md5.h" +#include "store_log.h" +#include "store_rebuild.h" +#include "Store.h" #include "StoreClient.h" -#include "Store.h" -#include "store_key_md5.h" #include "StoreIOState.h" #include "StoreMeta.h" -#include "store_key_md5.h" +#include "StrList.h" +#include "swap_log_op.h" #include "SwapDir.h" -#include "swap_log_op.h" +#include "tools.h" #if USE_DELAY_POOLS #include "DelayPools.h" #endif === modified file 'src/store_client.cc' --- src/store_client.cc 2012-08-14 11:53:07 +0000 +++ src/store_client.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 90 Storage Manager Client-Side Interface * AUTHOR: Duane Wessels * @@ -40,11 +38,12 @@ #include "HttpRequest.h" #include "MemBuf.h" #include "MemObject.h" +#include "mime_header.h" #include "profiler/Profiler.h" -#include "protos.h" #include "StatCounters.h" #include "StoreClient.h" #include "Store.h" +#include "store_swapin.h" #include "StoreMeta.h" #include "StoreMetaUnpacker.h" #if USE_DELAY_POOLS === modified file 'src/store_digest.cc' --- src/store_digest.cc 2012-08-28 19:12:13 +0000 +++ src/store_digest.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 71 Store Digest Manager * AUTHOR: Alex Rousskov * @@ -44,7 +41,7 @@ #include "event.h" #include "globals.h" #include "mgr/Registration.h" -#include "protos.h" +#include "store_digest.h" #if USE_CACHE_DIGESTS #include "CacheDigest.h" @@ -139,7 +136,6 @@ memset(&sd_state, 0, sizeof(sd_state)); #else - store_digest = NULL; debugs(71, 3, "Local cache digest is 'off'"); #endif @@ -159,6 +155,7 @@ #endif } +//TODO: this seems to be dead code. Is it needed? void storeDigestDel(const StoreEntry * entry) { @@ -181,8 +178,7 @@ debugs(71, 6, "storeDigestDel: deled entry, key: " << entry->getMD5Text()); } } - -#endif +#endif //USE_CACHE_DIGESTS } void @@ -208,7 +204,7 @@ storeAppendPrintf(e, "store digest: disabled.\n"); } -#endif +#endif //USE_CACHE_DIGESTS } /* === added file 'src/store_digest.h' --- src/store_digest.h 1970-01-01 00:00:00 +0000 +++ src/store_digest.h 2012-08-29 16:26:55 +0000 @@ -0,0 +1,42 @@ +#ifndef SQUID_STORE_DIGEST_H_ +#define SQUID_STORE_DIGEST_H_ +/* + * DEBUG: section 71 Store Digest Manager + * AUTHOR: Alex Rousskov + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +class StoreEntry; + +extern void storeDigestInit(void); +extern void storeDigestNoteStoreReady(void); +extern void storeDigestDel(const StoreEntry * entry); +extern void storeDigestReport(StoreEntry *); + +#endif /* SQUID_STORE_DIGEST_H_ */ === modified file 'src/store_dir.cc' --- src/store_dir.cc 2012-08-28 19:12:13 +0000 +++ src/store_dir.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels * @@ -39,7 +37,6 @@ #include "MemObject.h" #include "MemStore.h" #include "profiler/Profiler.h" -#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" #include "Store.h" @@ -47,6 +44,7 @@ #include "StoreHashIndex.h" #include "SwapDir.h" #include "swap_log_op.h" +#include "tools.h" #if HAVE_STATVFS #if HAVE_SYS_STATVFS_H === modified file 'src/store_key_md5.cc' --- src/store_key_md5.cc 2012-08-28 19:12:13 +0000 +++ src/store_key_md5.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager MD5 Cache Keys * AUTHOR: Duane Wessels * === modified file 'src/store_log.cc' --- src/store_log.cc 2012-08-14 11:53:07 +0000 +++ src/store_log.cc 2012-08-29 16:01:32 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Logging Functions * AUTHOR: Duane Wessels * @@ -39,6 +37,7 @@ #include "MemObject.h" #include "mgr/Registration.h" #include "Store.h" +#include "store_log.h" #include "SquidTime.h" static const char *storeLogTags[] = { === added file 'src/store_log.h' --- src/store_log.h 1970-01-01 00:00:00 +0000 +++ src/store_log.h 2012-08-29 16:01:32 +0000 @@ -0,0 +1,42 @@ +#ifndef SQUID_STORE_LOG_H_ +#define SQUID_STORE_LOG_H_ +/* + * DEBUG: section 20 Storage Manager Logging Functions + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +class StoreEntry; + +extern void storeLog(int tag, const StoreEntry * e); +extern void storeLogRotate(void); +extern void storeLogClose(void); +extern void storeLogOpen(void); + +#endif /* SQUID_STORE_LOG_H_ */ === modified file 'src/store_rebuild.cc' --- src/store_rebuild.cc 2012-08-28 19:12:13 +0000 +++ src/store_rebuild.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 20 Store Rebuild Routines * AUTHOR: Duane Wessels * @@ -37,11 +34,12 @@ #include "event.h" #include "globals.h" #include "md5.h" -#include "protos.h" #include "StatCounters.h" #include "Store.h" #include "store_key_md5.h" #include "SwapDir.h" +#include "store_digest.h" +#include "store_rebuild.h" #include "StoreSearch.h" #include "SquidTime.h" === added file 'src/store_rebuild.h' --- src/store_rebuild.h 1970-01-01 00:00:00 +0000 +++ src/store_rebuild.h 2012-09-03 09:02:20 +0000 @@ -0,0 +1,46 @@ +#ifndef SQUID_STORE_REBUILD_H_ +#define SQUID_STORE_REBUILD_H_ +/* + * DEBUG: section 20 Store Rebuild Routines + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +extern void storeRebuildStart(void); +extern void storeRebuildComplete(struct _store_rebuild_data *); +extern void storeRebuildProgress(int sd_index, int total, int sofar); + +/// loads entry from disk; fills supplied memory buffer on success +extern bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, struct _store_rebuild_data &counts); +/// parses entry buffer and validates entry metadata; fills e on success +extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, struct _store_rebuild_data &counts, uint64_t expectedSize); +/// checks whether the loaded entry should be kept; updates counters +extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts); + +#endif /* SQUID_STORE_REBUILD_H_ */ === modified file 'src/store_swapin.cc' --- src/store_swapin.cc 2012-08-14 11:53:07 +0000 +++ src/store_swapin.cc 2012-08-30 08:41:13 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapin Functions * AUTHOR: Duane Wessels * @@ -38,6 +35,7 @@ #include "StatCounters.h" #include "StoreClient.h" #include "Store.h" +#include "store_swapin.h" static StoreIOState::STIOCB storeSwapInFileClosed; static StoreIOState::STFNCB storeSwapInFileNotify; === added file 'src/store_swapin.h' --- src/store_swapin.h 1970-01-01 00:00:00 +0000 +++ src/store_swapin.h 2012-08-30 08:41:13 +0000 @@ -0,0 +1,38 @@ +#ifndef SQUID_STORE_SWAPIN_H_ +#define SQUID_STORE_SWAPIN_H_ +/* + * DEBUG: section 20 Storage Manager Swapin Functions + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +class store_client; +extern void storeSwapInStart(store_client *); + +#endif /* SQUID_STORE_SWAPIN_H_ */ === modified file 'src/store_swapmeta.cc' --- src/store_swapmeta.cc 2012-08-28 13:00:30 +0000 +++ src/store_swapmeta.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapfile Metadata * AUTHOR: Kostas Anagnostakis * === modified file 'src/store_swapout.cc' --- src/store_swapout.cc 2012-08-28 13:00:30 +0000 +++ src/store_swapout.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager Swapout Functions * AUTHOR: Duane Wessels * @@ -36,13 +34,14 @@ #include "squid.h" #include "cbdata.h" #include "StoreClient.h" +#include "globals.h" #include "Store.h" /* FIXME: Abstract the use of this more */ #include "mem_node.h" #include "MemObject.h" -#include "protos.h" #include "SwapDir.h" #include "StatCounters.h" +#include "store_log.h" #include "swap_log_op.h" static void storeSwapOutStart(StoreEntry * e); === modified file 'src/structs.h' --- src/structs.h 2012-08-28 13:00:30 +0000 +++ src/structs.h 2012-09-03 09:02:20 +0000 @@ -1030,12 +1030,6 @@ unsigned int destinationIPLookedUp_:1; }; -struct _link_list { - void *ptr; - - struct _link_list *next; -}; - struct _cachemgr_passwd { char *passwd; wordlist *actions; === modified file 'src/test_cache_digest.cc' --- src/test_cache_digest.cc 2012-08-28 19:12:13 +0000 +++ src/test_cache_digest.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Alex Rousskov * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/tests/stub_DelayId.cc' --- src/tests/stub_DelayId.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_DelayId.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 20 Storage Manager * AUTHOR: Robert Collins * === modified file 'src/tests/stub_MemStore.cc' --- src/tests/stub_MemStore.cc 2012-07-13 22:04:57 +0000 +++ src/tests/stub_MemStore.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 84 Helper process maintenance * */ === modified file 'src/tests/stub_acl.cc' --- src/tests/stub_acl.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_acl.cc 2012-09-01 14:42:17 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Robert Collins * @@ -33,8 +31,3 @@ */ #include "squid.h" - -/* - * DO NOT MODIFY: - * arch-tag: 09fd4b9f-d9f5-4566-9ec2-c72a57e116dd - */ === modified file 'src/tests/stub_cache_cf.cc' --- src/tests/stub_cache_cf.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_cache_cf.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration File Parsing * AUTHOR: Robert Collins * @@ -34,7 +32,6 @@ #include "squid.h" #include "ConfigParser.h" -#include "protos.h" #include "wordlist.h" #define STUB_API "cache_cf.cc" === modified file 'src/tests/stub_client_db.cc' --- src/tests/stub_client_db.cc 2012-01-20 18:55:04 +0000 +++ src/tests/stub_client_db.cc 2012-08-31 16:57:39 +0000 @@ -1,10 +1,11 @@ #include "squid.h" -/* because the clientdb API is defined in protos.h still */ -#include "protos.h" +#include "client_db.h" #define STUB_API "client_db.cc" #include "tests/STUB.h" +class ClientInfo; + void clientdbInit(void) STUB void clientdbUpdate(const Ip::Address &, log_type, AnyP::ProtocolType, size_t) STUB int clientdbCutoffDenied(const Ip::Address &) STUB_RETVAL(-1) === modified file 'src/tests/stub_client_side_request.cc' --- src/tests/stub_client_side_request.cc 2012-08-07 15:58:08 +0000 +++ src/tests/stub_client_side_request.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/tests/stub_comm.cc' --- src/tests/stub_comm.cc 2012-01-20 18:55:04 +0000 +++ src/tests/stub_comm.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 84 Helper process maintenance * AUTHOR: Robert Collins * === modified file 'src/tests/stub_errorpage.cc' --- src/tests/stub_errorpage.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_errorpage.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,5 @@ #include "squid.h" #include "errorpage.h" -#include "protos.h" #define STUB_API "errorpage.cc" #include "tests/STUB.h" === modified file 'src/tests/stub_fd.cc' --- src/tests/stub_fd.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_fd.cc 2012-08-31 16:57:39 +0000 @@ -1,6 +1,5 @@ #include "squid.h" #include "fde.h" -#include "protos.h" #define STUB_API "fd.cc" #include "tests/STUB.h" === modified file 'src/tests/stub_internal.cc' --- src/tests/stub_internal.cc 2012-01-20 18:55:04 +0000 +++ src/tests/stub_internal.cc 2012-08-31 16:57:39 +0000 @@ -1,5 +1,4 @@ #include "squid.h" -#include "protos.h" #define STUB_API "internal.cc" #include "tests/STUB.h" === modified file 'src/tests/stub_ipc.cc' --- src/tests/stub_ipc.cc 2012-01-20 18:55:04 +0000 +++ src/tests/stub_ipc.cc 2012-09-03 09:02:20 +0000 @@ -1,6 +1,5 @@ #include "squid.h" -// because ipcCreate is defined in protos.h still -#include "protos.h" +#include "SquidIpc.h" #define STUB_API "ipc.cc" #include "tests/STUB.h" === modified file 'src/tests/stub_main_cc.cc' --- src/tests/stub_main_cc.cc 2012-08-08 09:24:40 +0000 +++ src/tests/stub_main_cc.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Francesco Chemolli * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'src/tests/stub_mime.cc' --- src/tests/stub_mime.cc 2012-01-20 18:55:04 +0000 +++ src/tests/stub_mime.cc 2012-08-31 16:57:39 +0000 @@ -1,5 +1,4 @@ #include "squid.h" -#include "protos.h" #define STUB_API "mime.cc" #include "tests/STUB.h" === modified file 'src/tests/stub_stat.cc' --- src/tests/stub_stat.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_stat.cc 2012-09-01 14:42:17 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Robert Collins * @@ -34,7 +32,3 @@ #include "squid.h" -/* - * DO NOT MODIFY: - * arch-tag: 910d285d-c514-4592-adac-1f079ca734ab - */ === modified file 'src/tests/stub_store_client.cc' --- src/tests/stub_store_client.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_store_client.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,6 @@ #include "squid.h" #include "StoreClient.h" #include "Store.h" -#include "protos.h" #define STUB_API "store_client.cc" #include "tests/STUB.h" === modified file 'src/tests/stub_store_rebuild.cc' --- src/tests/stub_store_rebuild.cc 2012-08-14 11:53:07 +0000 +++ src/tests/stub_store_rebuild.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 84 Helper process maintenance * AUTHOR: Robert Collins * @@ -34,7 +32,6 @@ #include "squid.h" #include "MemBuf.h" -#include "protos.h" #define STUB_API "stub_store_rebuild.cc" #include "tests/STUB.h" === modified file 'src/tests/stub_tools.cc' --- src/tests/stub_tools.cc 2012-08-08 12:14:34 +0000 +++ src/tests/stub_tools.cc 2012-09-03 08:42:58 +0000 @@ -1,6 +1,5 @@ #include "squid.h" -// tool functions still defined in protos.h - TODO extract -#include "protos.h" +#include "tools.h" #define STUB_API "tools.cc" #include "tests/STUB.h" === modified file 'src/tests/testEvent.cc' --- src/tests/testEvent.cc 2012-08-28 19:12:13 +0000 +++ src/tests/testEvent.cc 2012-08-31 16:57:39 +0000 @@ -7,7 +7,6 @@ #include "CapturingStoreEntry.h" #include "event.h" #include "Mem.h" -#include "protos.h" #include "stat.h" #include "testEvent.h" === modified file 'src/tests/testEventLoop.cc' --- src/tests/testEventLoop.cc 2012-08-28 19:12:13 +0000 +++ src/tests/testEventLoop.cc 2012-08-31 16:57:39 +0000 @@ -6,7 +6,6 @@ #include "testEventLoop.h" #include "EventLoop.h" #include "Mem.h" -#include "protos.h" #include "stat.h" CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop ); === modified file 'src/tests/testHttpReply.cc' --- src/tests/testHttpReply.cc 2012-08-28 19:12:13 +0000 +++ src/tests/testHttpReply.cc 2012-08-31 16:57:39 +0000 @@ -6,7 +6,7 @@ #include "HttpHeader.h" #include "HttpReply.h" #include "Mem.h" -#include "protos.h" +#include "mime_header.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply ); === modified file 'src/tests/testHttpRequest.cc' --- src/tests/testHttpRequest.cc 2012-08-28 19:12:13 +0000 +++ src/tests/testHttpRequest.cc 2012-08-31 16:57:39 +0000 @@ -7,7 +7,7 @@ #include "HttpHeader.h" #include "HttpRequest.h" #include "Mem.h" -#include "protos.h" +#include "mime_header.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest ); === modified file 'src/tests/testRock.cc' --- src/tests/testRock.cc 2012-08-14 11:53:07 +0000 +++ src/tests/testRock.cc 2012-08-31 16:57:39 +0000 @@ -8,7 +8,6 @@ #include "HttpReply.h" #include "Mem.h" #include "MemObject.h" -#include "protos.h" #include "Store.h" #include "StoreFileSystem.h" #include "StoreSearch.h" === modified file 'src/tests/testUfs.cc' --- src/tests/testUfs.cc 2012-08-28 13:00:30 +0000 +++ src/tests/testUfs.cc 2012-08-31 16:57:39 +0000 @@ -8,7 +8,6 @@ #include "HttpReply.h" #include "Mem.h" #include "MemObject.h" -#include "protos.h" #include "Store.h" #include "SwapDir.h" #include "testStoreSupport.h" === modified file 'src/tests/test_http_range.cc' --- src/tests/test_http_range.cc 2012-01-20 18:55:04 +0000 +++ src/tests/test_http_range.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 64 HTTP Range Header * AUTHOR: Alex Rousskov * === modified file 'src/time.cc' --- src/time.cc 2012-01-20 18:55:04 +0000 +++ src/time.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 21 Time Functions * AUTHOR: Harvest Derived * === modified file 'src/tools.cc' --- src/tools.cc 2012-08-28 19:12:13 +0000 +++ src/tools.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 21 Misc Functions * AUTHOR: Harvest Derived * @@ -49,7 +47,7 @@ #include "ipc/Kids.h" #include "ipc/Coordinator.h" #include "ipcache.h" -#include "protos.h" +#include "tools.h" #include "SwapDir.h" #include "wordlist.h" === modified file 'src/tools.h' --- src/tools.h 2012-08-29 00:12:28 +0000 +++ src/tools.h 2012-08-30 17:12:59 +0000 @@ -33,11 +33,14 @@ #ifndef SQUID_TOOLS_H_ #define SQUID_TOOLS_H_ -/* for kb_t */ +#include "Packer.h" +#include "SquidString.h" #include "typedefs.h" class MemBuf; +extern int DebugSignal; + extern void kb_incr(kb_t *, size_t); extern void parseEtcHosts(void); extern int getMyPort(void); @@ -47,4 +50,57 @@ /* packs, then prints an object using debugs() */ extern void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm); +extern const char *getMyHostname(void); +extern const char *uniqueHostname(void); + +extern void death(int sig); +extern void sigusr2_handle(int sig); +extern void sig_child(int sig); +extern void sig_shutdown(int sig); ///< handles shutdown notifications from kids +extern void leave_suid(void); +extern void enter_suid(void); +extern void no_suid(void); +extern void writePidFile(void); +extern void setMaxFD(void); +extern void setSystemLimits(void); +extern void squid_signal(int sig, SIGHDLR *, int flags); +extern pid_t readPidFile(void); +extern void keepCapabilities(void); +extern void BroadcastSignalIfAny(int& sig); + +/// whether the current process is the parent of all other Squid processes +extern bool IamMasterProcess(); +/** + * whether the current process is dedicated to doing things that only + * a single process should do, such as PID file maintenance and WCCP + */ +extern bool IamPrimaryProcess(); +/// whether the current process coordinates worker processes +extern bool IamCoordinatorProcess(); +/// whether the current process handles HTTP transactions and such +extern bool IamWorkerProcess(); +/// whether the current process is dedicated to managing a cache_dir +extern bool IamDiskProcess(); +/// Whether we are running in daemon mode +extern bool InDaemonMode(); // try using specific Iam*() checks above first +/// Whether there should be more than one worker process running +extern bool UsingSmp(); // try using specific Iam*() checks above first +/// number of Kid processes as defined in src/ipc/Kid.h +extern int NumberOfKids(); +/// a string describing this process roles such as worker or coordinator +extern String ProcessRoles(); + +extern void debug_trap(const char *); +extern void *xmemset(void *dst, int, size_t); + +extern void logsFlush(void); + +extern void squid_getrusage(struct rusage *r); +extern double rusage_cputime(struct rusage *r); +extern int rusage_maxrss(struct rusage *r); +extern int rusage_pagefaults(struct rusage *r); +extern void releaseServerSockets(void); +extern void PrintRusage(void); +extern void dumpMallocStats(void); + #endif /* SQUID_TOOLS_H_ */ === modified file 'src/tunnel.cc' --- src/tunnel.cc 2012-08-28 19:12:13 +0000 +++ src/tunnel.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 26 Secure Sockets Layer Proxy * AUTHOR: Duane Wessels * @@ -48,7 +46,6 @@ #include "MemBuf.h" #include "http.h" #include "PeerSelectState.h" -#include "protos.h" #include "StatCounters.h" #include "tools.h" === modified file 'src/typedefs.h' --- src/typedefs.h 2012-08-14 11:53:07 +0000 +++ src/typedefs.h 2012-09-03 09:02:20 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -88,8 +85,6 @@ typedef struct _Version Version; -typedef struct _link_list link_list; - typedef struct _customlog customlog; #if USE_SSL === modified file 'src/ufsdump.cc' --- src/ufsdump.cc 2012-08-28 19:12:13 +0000 +++ src/ufsdump.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 00 UFS Store Dump Tool * AUTHOR: Robert Collins * === modified file 'src/unlinkd.cc' --- src/unlinkd.cc 2012-08-28 19:12:13 +0000 +++ src/unlinkd.cc 2012-08-31 16:57:39 +0000 @@ -1,7 +1,4 @@ - /* - * $Id$ - * * DEBUG: section 02 Unlink Daemon * AUTHOR: Duane Wessels * @@ -34,15 +31,18 @@ */ #include "squid.h" + +#if USE_UNLINKD #include "disk.h" #include "fd.h" #include "fde.h" #include "globals.h" #include "xusleep.h" -#include "protos.h" +#include "SquidIpc.h" #include "SquidTime.h" #include "StatCounters.h" #include "SwapDir.h" +#include "tools.h" /* This code gets linked to Squid */ @@ -272,3 +272,4 @@ #endif } +#endif /* USE_UNLINKD */ === added file 'src/unlinkd.h' --- src/unlinkd.h 1970-01-01 00:00:00 +0000 +++ src/unlinkd.h 2012-08-30 21:01:30 +0000 @@ -0,0 +1,51 @@ +#ifndef SQUID_UNLINKD_H_ +#define SQUID_UNLINKD_H_ +/* + * DEBUG: section 02 Unlink Daemon + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#if USE_UNLINKD +extern bool unlinkdNeeded(void); +extern void unlinkdInit(void); +extern void unlinkdClose(void); +extern void unlinkdUnlink(const char *); +#else /* USE_UNLINKD */ + +#if HAVE_UNISTD_H +#include +#endif +inline bool unlinkdNeeded(void) { return false; } +inline void unlinkdInit(void) { return; } +inline void unlinkdClose(void) { return; } +inline void unlinkdUnlink(const char * path) { ::unlink(path); } +#endif /* USE_UNLINKD */ + +#endif /* SQUID_UNLINKD_H_ */ === modified file 'src/unlinkd_daemon.cc' --- src/unlinkd_daemon.cc 2012-01-20 18:55:04 +0000 +++ src/unlinkd_daemon.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section -- Unlink Daemon * AUTHOR: Duane Wessels * === modified file 'src/url.cc' --- src/url.cc 2012-08-28 13:00:30 +0000 +++ src/url.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 23 URL Parsing * AUTHOR: Duane Wessels * @@ -36,8 +34,8 @@ #include "squid.h" #include "globals.h" #include "HttpRequest.h" -#include "protos.h" #include "rfc1738.h" +#include "SquidString.h" #include "URL.h" #include "URLScheme.h" === modified file 'src/urn.cc' --- src/urn.cc 2012-08-28 19:12:13 +0000 +++ src/urn.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 52 URN Parsing * AUTHOR: Kostas Anagnostakis * @@ -35,17 +33,19 @@ #include "squid.h" #include "errorpage.h" -#include "StoreClient.h" -#include "Store.h" +#include "forward.h" +#include "globals.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "icmp/net_db.h" #include "MemBuf.h" -#include "forward.h" -#include "globals.h" +#include "mime_header.h" #include "SquidTime.h" -#include "icmp/net_db.h" -#include "protos.h" +#include "Store.h" +#include "StoreClient.h" +#include "tools.h" #include "URL.h" +#include "urn.h" #define URN_REQBUF_SZ 4096 === added file 'src/urn.h' --- src/urn.h 1970-01-01 00:00:00 +0000 +++ src/urn.h 2012-08-29 14:39:43 +0000 @@ -0,0 +1,41 @@ +/* + * DEBUG: section + * AUTHOR: + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef SQUID_URN_H_ +#define SQUID_URN_H_ + +class HttpRequest; +class StoreEntry; + +extern void urnStart(HttpRequest *, StoreEntry *); + +#endif /* SQUID_URN_H_ */ === modified file 'src/wccp.cc' --- src/wccp.cc 2012-08-28 13:00:30 +0000 +++ src/wccp.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 80 WCCP Support * AUTHOR: Glenn Chisholm * === modified file 'src/wccp2.cc' --- src/wccp2.cc 2012-08-28 19:12:13 +0000 +++ src/wccp2.cc 2012-08-31 16:57:39 +0000 @@ -43,7 +43,6 @@ #include "ip/Address.h" #include "md5.h" #include "Parsing.h" -#include "protos.h" #include "Store.h" #include "SwapDir.h" === modified file 'src/whois.cc' --- src/whois.cc 2012-08-28 19:12:13 +0000 +++ src/whois.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 75 WHOIS protocol * AUTHOR: Duane Wessels, Kostas Anagnostakis * @@ -41,7 +39,6 @@ #include "HttpRequest.h" #include "HttpRequest.h" #include "forward.h" -#include "protos.h" #include "StatCounters.h" #include "Store.h" #include "tools.h" === modified file 'src/win32.cc' --- src/win32.cc 2012-08-28 13:00:30 +0000 +++ src/win32.cc 2012-09-01 14:24:50 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Windows support * AUTHOR: Guido Serassio * inspired by previous work by Romeo Anghelache & Eric Stern. @@ -35,6 +33,7 @@ #include "squid.h" #include "squid_windows.h" +#include "win32.h" #if _SQUID_MSWIN_ #if HAVE_WIN32_PSAPI === added file 'src/win32.h' --- src/win32.h 1970-01-01 00:00:00 +0000 +++ src/win32.h 2012-09-03 09:02:20 +0000 @@ -0,0 +1,61 @@ +#ifndef SQUID_WIN32_H_ +#define SQUID_WIN32_H_ +/* + * Windows support + * AUTHOR: Guido Serassio + * inspired by previous work by Romeo Anghelache & Eric Stern. + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#if _SQUID_MSWIN_ + +#if HAVE_SYS_TIME_H +#include +#endif +#if HAVE_SYS_RESOURCE_H +#include +#endif +#if HAVE_SYS_SELECT_H +#include +#endif +#if HAVE_SYS_TYPES_H +#include +#endif + +extern int WIN32_pipe(int[2]); + +extern int WIN32_getrusage(int, struct rusage *); +extern void WIN32_ExceptionHandlerInit(void); + +extern int Win32__WSAFDIsSet(int fd, fd_set* set); +extern DWORD WIN32_IpAddrChangeMonitorInit(); + +#endif + +#endif /* SQUID_WIN32_H_ */ === modified file 'src/wordlist.cc' --- src/wordlist.cc 2012-01-20 18:55:04 +0000 +++ src/wordlist.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 03 Configuration File Parsing * AUTHOR: Harvest Derived * === modified file 'src/wordlist.h' --- src/wordlist.h 2012-08-28 19:12:13 +0000 +++ src/wordlist.h 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- === modified file 'test-suite/ESIExpressions.cc' --- test-suite/ESIExpressions.cc 2012-08-14 11:53:07 +0000 +++ test-suite/ESIExpressions.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 86 ESI Expressions * AUTHOR: Robert Collins * === modified file 'test-suite/MemPoolTest.cc' --- test-suite/MemPoolTest.cc 2012-08-14 11:53:07 +0000 +++ test-suite/MemPoolTest.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'test-suite/StackTest.cc' --- test-suite/StackTest.cc 2012-08-14 11:53:07 +0000 +++ test-suite/StackTest.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Robert Collins * === modified file 'test-suite/VirtualDeleteOperator.cc' --- test-suite/VirtualDeleteOperator.cc 2012-08-14 11:53:07 +0000 +++ test-suite/VirtualDeleteOperator.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'test-suite/buildtests/layer-02-maximus.opts' --- test-suite/buildtests/layer-02-maximus.opts 2010-12-10 09:59:02 +0000 +++ test-suite/buildtests/layer-02-maximus.opts 2012-08-17 15:29:58 +0000 @@ -108,6 +108,7 @@ --with-pic \ --with-pthreads \ --enable-build-info=squid\ test\ build \ + --enable-ssl-crtd \ " # Fix the distclean testing. === modified file 'test-suite/debug.cc' --- test-suite/debug.cc 2012-08-14 11:53:07 +0000 +++ test-suite/debug.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Robert Collins * === modified file 'test-suite/hash.c' --- test-suite/hash.c 2012-08-28 13:00:30 +0000 +++ test-suite/hash.c 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 00 Hash Tables * AUTHOR: Harvest Derived * === modified file 'test-suite/mem_hdr_test.cc' --- test-suite/mem_hdr_test.cc 2012-08-15 17:01:06 +0000 +++ test-suite/mem_hdr_test.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Robert Collins * === modified file 'test-suite/mem_node_test.cc' --- test-suite/mem_node_test.cc 2012-08-14 11:53:07 +0000 +++ test-suite/mem_node_test.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section 19 Store Memory Primitives * AUTHOR: Robert Collins * === modified file 'test-suite/refcount.cc' --- test-suite/refcount.cc 2012-08-14 11:53:07 +0000 +++ test-suite/refcount.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * DEBUG: section -- Refcount allocator * AUTHOR: Robert Collins * === modified file 'test-suite/splay.cc' --- test-suite/splay.cc 2012-07-19 13:49:54 +0000 +++ test-suite/splay.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * based on ftp://ftp.cs.cmu.edu/user/sleator/splaying/top-down-splay.c * http://bobo.link.cs.cmu.edu/cgi-bin/splay/splay-cgi.pl */ === modified file 'test-suite/syntheticoperators.cc' --- test-suite/syntheticoperators.cc 2012-08-14 11:53:07 +0000 +++ test-suite/syntheticoperators.cc 2012-09-01 14:38:36 +0000 @@ -1,7 +1,5 @@ /* - * $Id$ - * * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ === modified file 'tools/squidclient.cc' --- tools/squidclient.cc 2012-08-28 13:00:30 +0000 +++ tools/squidclient.cc 2012-09-01 14:38:36 +0000 @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section -- WWW Client * AUTHOR: Harvest Derived *