From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 6 Mar 2010 00:12:22 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9d0bafa3b7bcf78aa17539bfbfdd22c84955ae7;p=thirdparty%2Fsquid.git

Merge from trunk
---

b9d0bafa3b7bcf78aa17539bfbfdd22c84955ae7
diff --cc src/auth/basic/auth_basic.cc
index 706ef1737a,da99ba2e52..550119e383
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@@ -211,13 -306,10 +211,13 @@@ AuthBasicConfig::dump(StoreEntry * entr
      storeAppendPrintf(entry, "%s basic casesensitive %s\n", name, casesensitive ? "on" : "off");
  }
  
 -AuthBasicConfig::AuthBasicConfig() : authenticateChildren(20)
 +AuthBasicConfig::AuthBasicConfig() :
-         authenticateChildren(20,0,1,1),
++        authenticateChildren(20),
 +        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
index c84280e385,2728cf4f90..29f9dc11f6
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@@ -88,8 -128,8 +88,8 @@@ public
      virtual void registerWithCacheManager(void);
      virtual const char * type() const;
      HelperChildConfig authenticateChildren;
--    char *basicAuthRealm;
      wordlist *authenticate;
++    char *basicAuthRealm;
      time_t credentialsTTL;
      int casesensitive;
      int utf8;
diff --cc src/auth/digest/auth_digest.cc
index 7f698d25c2,18c0c2ddc1..865a142d99
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@@ -643,10 -935,9 +676,9 @@@ AuthDigestConfig::done(
      safe_free(digestAuthRealm);
  }
  
- AuthDigestConfig::AuthDigestConfig() : authenticateChildren(20,0,1,1)
 -AuthDigestConfig::AuthDigestConfig() : authenticateChildren(20)
++AuthDigestConfig::AuthDigestConfig() : authenticateChildren(20), authenticate(NULL)
  {
      /* TODO: move into initialisation list */
-     authenticate = NULL;
      /* 5 minutes */
      nonceGCInterval = 5 * 60;
      /* 30 minutes */
diff --cc src/auth/negotiate/auth_negotiate.cc
index 14f638d634,d41e0feacd..b8ae8ed092
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@@ -116,7 -142,7 +116,7 @@@ AuthNegotiateConfig::dump(StoreEntry * 
  
  }
  
- AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(20,0,1,1), keep_alive(1), authenticate(NULL)
 -AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(20), keep_alive(1)
++AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(20), keep_alive(1), authenticate(NULL)
  { }
  
  void
diff --cc src/auth/ntlm/auth_ntlm.cc
index f2798d1f29,2546362da1..36eb0a5b39
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@@ -104,7 -124,7 +104,7 @@@ AuthNTLMConfig::dump(StoreEntry * entry
  
  }
  
- AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(20,0,1,1), keep_alive(1), authenticate(NULL)
 -AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(20), keep_alive(1)
++AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(20), keep_alive(1), authenticate(NULL)
  { }
  
  void