Merge from trunk

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/auth/basic/auth_basic.cc
index 9ff0a3ecebf3b2396bf404a0416b56bfb7f05269,d3bb42138d747b6f2e3e6048afcdb1a645e5bda0..9bffc1b1ecc11f4642418882c7617b6b136fcda0
--- 1/src/auth/basic/auth_basic.cc
--- 2/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@@ -198,14 -221,6 +198,15 @@@ AuthBasicConfig::fixHeader(AuthUserRequ
  void
  AuthBasicConfig::done()
  {
-         helperFree(basicauthenticators);
-         basicauthenticators = NULL;
 +    authbasic_initialised = 0;
 +
 +    if (basicauthenticators) {
 +        helperShutdown(basicauthenticators);
 +    }
 +
++    delete basicauthenticators;
++    basicauthenticators = NULL;
++
      if (authenticate)
          wordlistDestroy(&authenticate);
  
@@@ -292,14 -306,10 +292,14 @@@ AuthBasicConfig::dump(StoreEntry * entr
      storeAppendPrintf(entry, "%s basic casesensitive %s\n", name, casesensitive ? "on" : "off");
  }
  
 -AuthBasicConfig::AuthBasicConfig() : authenticateChildren(20,0,1,1)
 +AuthBasicConfig::AuthBasicConfig() :
-         authenticateChildren(5),
++        authenticateChildren(20,0,1,1),
 +        authenticateConcurrency(1),
 +        authenticate(NULL),
 +        credentialsTTL( 2*60*60 ),
 +        casesensitive(0),
 +        utf8(0)
  {
 -    /* TODO: move into initialisation list */
 -    credentialsTTL = 2 * 60 * 60;     /* two hours */
      basicAuthRealm = xstrdup("Squid proxy-caching web server");
  }
  

diff --cc src/auth/basic/auth_basic.h
Simple merge

diff --cc src/auth/digest/auth_digest.cc
index 3d91cf22c5093b466d64178128bd7fd8857cefe1,879a3c8e5e4f98252d5b5e1137b708bf9c373269..5378ce027f3bf37debfd946a72bc532ae4dd455c
--- 1/src/auth/digest/auth_digest.cc
--- 2/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@@ -903,12 -904,9 +901,10 @@@ AuthDigestConfig::done(
      safe_free(digestAuthRealm);
  }
  
- 
- AuthDigestConfig::AuthDigestConfig()
+ AuthDigestConfig::AuthDigestConfig() : authenticateChildren(20,0,1,1)
  {
      /* TODO: move into initialisation list */
-     authenticateChildren = 5;
 +    authenticate = NULL;
      /* 5 minutes */
      nonceGCInterval = 5 * 60;
      /* 30 minutes */

diff --cc src/auth/digest/auth_digest.h
Simple merge

diff --cc src/auth/negotiate/auth_negotiate.cc
index 014f87723e9176e3763d57a5c553098906c2e8a8,59da54ca0b96b355a1625320ddb19344e43c9387..d318b3ed049b02a610424586a9786cdbb1869df7
--- 1/src/auth/negotiate/auth_negotiate.cc
--- 2/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@@ -94,17 -94,33 +94,27 @@@ static hash_table *proxy_auth_cache = N
   *
   */
  
 -/**
 - \ingroup AuthNegotiateInternal
 - \todo move to negotiateScheme.cc
 - */
  void
 -negotiateScheme::done()
 +AuthNegotiateConfig::done()
  {
 -    /* TODO: this should be a Config call. */
 -    debugs(29, 2, "negotiateScheme::done: shutting down Negotiate authentication.");
 +    authnegotiate_initialised = 0;
  
 -    if (negotiateauthenticators)
 +    if (negotiateauthenticators) {
          helperStatefulShutdown(negotiateauthenticators);
-         helperStatefulFree(negotiateauthenticators);
-         negotiateauthenticators = NULL;
 -
 -    authnegotiate_initialised = 0;
 +    }
  
+     if (!shutting_down)
+         return;
+ 
+     delete negotiateauthenticators;
+     negotiateauthenticators = NULL;
+ 
+     debugs(29, 2, "negotiateScheme::done: Negotiate authentication Shutdown.");
+ }
+ 
+ void
+ AuthNegotiateConfig::done()
+ {
      if (authenticate)
          wordlistDestroy(&authenticate);
  }
@@@ -126,7 -142,7 +136,7 @@@ AuthNegotiateConfig::dump(StoreEntry * 
  
  }
  
- AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(5), keep_alive(1), authenticate(NULL)
 -AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(20,0,1,1), keep_alive(1)
++AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(20,0,1,1), keep_alive(1), authenticate(NULL)
  { }
  
  void

diff --cc src/auth/negotiate/auth_negotiate.h
Simple merge

diff --cc src/auth/ntlm/auth_ntlm.cc
index d3255e6cd306ddbe34eb27c67ca95b883020d492,c685dc0bdba967d3e67bd2fc3d16c7ceab7d243c..8e45709a11f5709d374bafbb8a8ffda549e2ac64
--- 1/src/auth/ntlm/auth_ntlm.cc
--- 2/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@@ -74,18 -78,31 +74,29 @@@ static hash_table *proxy_auth_cache = N
   *
   */
  
 -/* move to ntlmScheme.cc */
 +/* free any allocated configuration details */
  void
 -ntlmScheme::done()
 +AuthNTLMConfig::done()
  {
 -    /* TODO: this should be a Config call. */
 -    debugs(29, 2, "ntlmScheme::done: shutting down NTLM authentication.");
 +    authntlm_initialised = 0;
  
 -    if (ntlmauthenticators)
 +    if (ntlmauthenticators) {
          helperStatefulShutdown(ntlmauthenticators);
-         helperStatefulFree(ntlmauthenticators);
-         ntlmauthenticators = NULL;
 -
 -    authntlm_initialised = 0;
 +    }
  
+     if (!shutting_down)
+         return;
+ 
+     delete ntlmauthenticators;
+     ntlmauthenticators = NULL;
+ 
+     debugs(29, 2, "ntlmScheme::done: NTLM authentication Shutdown.");
+ }
+ 
+ /* free any allocated configuration details */
+ void
+ AuthNTLMConfig::done()
+ {
      if (authenticate)
          wordlistDestroy(&authenticate);
  }
@@@ -107,7 -124,7 +118,7 @@@ AuthNTLMConfig::dump(StoreEntry * entry
  
  }
  
- AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(5), keep_alive(1), authenticate(NULL)
 -AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(20,0,1,1), keep_alive(1)
++AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(20,0,1,1), keep_alive(1), authenticate(NULL)
  { }
  
  void

diff --cc src/auth/ntlm/auth_ntlm.h
Simple merge

diff --cc src/cache_cf.cc
Simple merge

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

diff --cc src/cf_gen.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
Simple merge

diff --cc src/enums.h
Simple merge

diff --cc src/external_acl.cc
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/protos.h
Simple merge

diff --cc src/redirect.cc
Simple merge

diff --cc src/structs.h
Simple merge