Merge from trunk

diff --cc configure.in
Simple merge

diff --cc src/HttpRequest.cc
Simple merge

diff --cc src/HttpRequest.h
Simple merge

diff --cc src/adaptation/icap/ModXact.cc
Simple merge

diff --cc src/auth/basic/auth_basic.cc
index 706ef1737a398ce3524f21656fe7b891aecf0ebc,da99ba2e5232a6aa4819107d4d82c9dc2a073125..550119e38315e76c81bab17be4cfe16af15f2416
--- 1/src/auth/basic/auth_basic.cc
--- 2/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 c84280e3853eb86a5f9d8bd8962d15010bb44e89,2728cf4f90c85a247f781e28387e8a9824a1201e..29f9dc11f6b821ca4956264dde78f6ef0142958f
--- 1/src/auth/basic/auth_basic.h
--- 2/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 7f698d25c22edaf8dbc40dcc36573f14b021172e,18c0c2ddc1b28cc47c317005a2052a06d494b9b1..865a142d999dd012189d8cfcb385ecae1958f829
--- 1/src/auth/digest/auth_digest.cc
--- 2/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 14f638d634934b29814ab27041494772ec725b51,d41e0feacdc4f0df3efaf45b2243b710d6378892..b8ae8ed092e09dac6223e8c2e74210e57073d001
--- 1/src/auth/negotiate/auth_negotiate.cc
--- 2/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 f2798d1f29a4c258ed42cef8adf65640666addb3,2546362da1b8d1689dc3f4b44b590c4958a4ba80..36eb0a5b39b32094b4e1a66c13f5e15e25f5c696
--- 1/src/auth/ntlm/auth_ntlm.cc
--- 2/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

diff --cc src/cache_cf.cc
Simple merge

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

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/errorpage.cc
Simple merge

diff --cc src/external_acl.cc
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/structs.h
Simple merge