Merged from trunk

diff --cc configure.ac
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/comm/TcpAcceptor.cc
Simple merge

diff --cc src/dns_internal.cc
index 46536e7a8997984ff6909797339b270c543a068d,1135e0abcd2eac92926bf9777d4647f14325fe43..38a45189dacf51fa5b8962026c3fc59d8cd9c27b
--- 1/src/dns_internal.cc
--- 2/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@@ -60,8 -60,9 +60,8 @@@
     #ifndef to exclude the internal DNS code from compile process when
     using external DNS process.
   */
- #if !USE_DNSSERVERS
+ #if !USE_DNSHELPER
  #if _SQUID_WINDOWS_
 -#include "squid_windows.h"
  #define REG_TCPIP_PARA_INTERFACES "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces"
  #define REG_TCPIP_PARA "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"
  #define REG_VXD_MSTCP "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP"

diff --cc src/fs/coss/store_dir_coss.cc
Simple merge

diff --cc src/fs/ufs/store_dir_ufs.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/protos.h
index 43486510c032e5c9d7adbd86c24ba7101a31de6f,f8227bbb5f94cf28e223599f37aee0fb71bffeaf..f6b849cae6e30332af46b6898e85ce9802a06548
--- 1/src/protos.h
--- 2/src/protos.h
+++ b/src/protos.h
@@@ -706,76 -656,88 +655,88 @@@ SQUIDCEXTERN int gethostname(char *, in
  /*
   * hack to allow snmp access to the statistics counters
   */
 -        SQUIDCEXTERN StatCounters *snmpStatGet(int);
+ class StatCounters;
 +SQUIDCEXTERN StatCounters *snmpStatGet(int);
  
 -        /* Vary support functions */
 -        SQUIDCEXTERN int varyEvaluateMatch(StoreEntry * entry, HttpRequest * req);
 +/* Vary support functions */
 +SQUIDCEXTERN int varyEvaluateMatch(StoreEntry * entry, HttpRequest * req);
  
 -        /* CygWin & Windows NT Port */
 -        /* win32.c */
 +/* 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 **);
 +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_ */
 -        SQUIDCEXTERN int WIN32_pipe(int[2]);
+ #if _SQUID_MSWIN_
+ 
 -            SQUIDCEXTERN int WIN32_getrusage(int, struct rusage *);
 -    SQUIDCEXTERN void WIN32_ExceptionHandlerInit(void);
++SQUIDCEXTERN int WIN32_pipe(int[2]);
+ 
 -    SQUIDCEXTERN int Win32__WSAFDIsSet(int fd, fd_set* set);
 -    SQUIDCEXTERN DWORD WIN32_IpAddrChangeMonitorInit();
++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
  
 -    /* external_acl.c */
 -    class external_acl;
 -            SQUIDCEXTERN void parse_externalAclHelper(external_acl **);
 +/* external_acl.c */
 +class external_acl;
-         SQUIDCEXTERN void parse_externalAclHelper(external_acl **);
++SQUIDCEXTERN void parse_externalAclHelper(external_acl **);
  
-         SQUIDCEXTERN void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
 -            SQUIDCEXTERN void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
++SQUIDCEXTERN void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
  
-         SQUIDCEXTERN void free_externalAclHelper(external_acl **);
 -            SQUIDCEXTERN void free_externalAclHelper(external_acl **);
++SQUIDCEXTERN void free_externalAclHelper(external_acl **);
  
-         typedef void EAH(void *data, void *result);
-         class ACLChecklist;
-             SQUIDCEXTERN void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
 -            typedef void EAH(void *data, void *result);
 -            class ACLChecklist;
 -                SQUIDCEXTERN void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
++typedef void EAH(void *data, void *result);
++class ACLChecklist;
++SQUIDCEXTERN void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
  
-             SQUIDCEXTERN void externalAclInit(void);
 -                SQUIDCEXTERN void externalAclInit(void);
++SQUIDCEXTERN void externalAclInit(void);
  
-             SQUIDCEXTERN void externalAclShutdown(void);
 -                SQUIDCEXTERN void externalAclShutdown(void);
++SQUIDCEXTERN void externalAclShutdown(void);
  
-             SQUIDCEXTERN char *strtokFile(void);
 -                SQUIDCEXTERN char *strtokFile(void);
++SQUIDCEXTERN char *strtokFile(void);
  
  #if USE_WCCPv2
  
-             SQUIDCEXTERN void parse_wccp2_method(int *v);
-             SQUIDCEXTERN void free_wccp2_method(int *v);
-             SQUIDCEXTERN void dump_wccp2_method(StoreEntry * e, const char *label, int v);
-             SQUIDCEXTERN void parse_wccp2_amethod(int *v);
-             SQUIDCEXTERN void free_wccp2_amethod(int *v);
-             SQUIDCEXTERN void dump_wccp2_amethod(StoreEntry * e, const char *label, int v);
 -                SQUIDCEXTERN void parse_wccp2_method(int *v);
 -                SQUIDCEXTERN void free_wccp2_method(int *v);
 -                SQUIDCEXTERN void dump_wccp2_method(StoreEntry * e, const char *label, int v);
 -                SQUIDCEXTERN void parse_wccp2_amethod(int *v);
 -                SQUIDCEXTERN void free_wccp2_amethod(int *v);
 -                SQUIDCEXTERN void dump_wccp2_amethod(StoreEntry * e, const char *label, int v);
++SQUIDCEXTERN void parse_wccp2_method(int *v);
++SQUIDCEXTERN void free_wccp2_method(int *v);
++SQUIDCEXTERN void dump_wccp2_method(StoreEntry * e, const char *label, int v);
++SQUIDCEXTERN void parse_wccp2_amethod(int *v);
++SQUIDCEXTERN void free_wccp2_amethod(int *v);
++SQUIDCEXTERN void dump_wccp2_amethod(StoreEntry * e, const char *label, int v);
  
-             SQUIDCEXTERN void parse_wccp2_service(void *v);
-             SQUIDCEXTERN void free_wccp2_service(void *v);
-             SQUIDCEXTERN void dump_wccp2_service(StoreEntry * e, const char *label, void *v);
 -                SQUIDCEXTERN void parse_wccp2_service(void *v);
 -                SQUIDCEXTERN void free_wccp2_service(void *v);
 -                SQUIDCEXTERN void dump_wccp2_service(StoreEntry * e, const char *label, void *v);
++SQUIDCEXTERN void parse_wccp2_service(void *v);
++SQUIDCEXTERN void free_wccp2_service(void *v);
++SQUIDCEXTERN void dump_wccp2_service(StoreEntry * e, const char *label, void *v);
  
-             SQUIDCEXTERN int check_null_wccp2_service(void *v);
 -                SQUIDCEXTERN int check_null_wccp2_service(void *v);
++SQUIDCEXTERN int check_null_wccp2_service(void *v);
  
-             SQUIDCEXTERN void parse_wccp2_service_info(void *v);
 -                SQUIDCEXTERN void parse_wccp2_service_info(void *v);
++SQUIDCEXTERN void parse_wccp2_service_info(void *v);
  
-             SQUIDCEXTERN void free_wccp2_service_info(void *v);
 -                SQUIDCEXTERN void free_wccp2_service_info(void *v);
++SQUIDCEXTERN void free_wccp2_service_info(void *v);
  
-             SQUIDCEXTERN void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v);
 -                SQUIDCEXTERN void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v);
++SQUIDCEXTERN void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v);
  
  #endif
  
  #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);
 -                /* upstream proxy authentication */
 -                SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
++/* 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
 -                    namespace Auth {
 -            /* call to ensure the auth component schemes exist. */
 -            extern void Init(void);
 -            } // namespace Auth
++namespace Auth {
++    /* call to ensure the auth component schemes exist. */
++    extern void Init(void);
++} // namespace Auth
  
  #endif /* USE_AUTH */
  

diff --cc src/tools.cc
Simple merge