From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sat, 13 Feb 2010 09:16:30 +0000 (+0100)
Subject: helper protocol concurrency=0 is the old protocol, not =1
X-Git-Tag: SQUID_3_2_0_1~417
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b23c9d89de293f2a7607835d21054320b1c78ef8;p=thirdparty%2Fsquid.git

helper protocol concurrency=0 is the old protocol, not =1

part 2, auth helper settings defaults
---

diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc
index f42e8560af..09dd5a167e 100644
--- a/src/HelperChildConfig.cc
+++ b/src/HelperChildConfig.cc
@@ -4,15 +4,6 @@
 
 #include <string.h>
 
-HelperChildConfig::HelperChildConfig() :
-        n_max(0),
-        n_startup(1),
-        n_idle(1),
-        concurrency(0),
-        n_running(0),
-        n_active(0)
-{}
-
 HelperChildConfig::HelperChildConfig(const unsigned int m, const unsigned int s, const unsigned int i, const unsigned int cc) :
         n_max(m),
         n_startup(s),
diff --git a/src/HelperChildConfig.h b/src/HelperChildConfig.h
index 47c499d1d1..07af956db8 100644
--- a/src/HelperChildConfig.h
+++ b/src/HelperChildConfig.h
@@ -10,8 +10,7 @@
 class HelperChildConfig
 {
 public:
-    HelperChildConfig();
-    HelperChildConfig(const unsigned int m, const unsigned int s, const unsigned int i, const unsigned int cc);
+    HelperChildConfig(const unsigned int m=0, const unsigned int s=0, const unsigned int i=1, const unsigned int cc=0);
     ~HelperChildConfig();
     HelperChildConfig &operator =(const HelperChildConfig &rhs);
 
diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index d3bb42138d..da99ba2e52 100644
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -306,7 +306,7 @@ AuthBasicConfig::dump(StoreEntry * entry, const char *name, AuthConfig * scheme)
     storeAppendPrintf(entry, "%s basic casesensitive %s\n", name, casesensitive ? "on" : "off");
 }
 
-AuthBasicConfig::AuthBasicConfig() : authenticateChildren(20,0,1,1)
+AuthBasicConfig::AuthBasicConfig() : authenticateChildren(20)
 {
     /* TODO: move into initialisation list */
     credentialsTTL = 2 * 60 * 60;	/* two hours */
diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 879a3c8e5e..9d29d0de9c 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -904,7 +904,7 @@ AuthDigestConfig::done()
     safe_free(digestAuthRealm);
 }
 
-AuthDigestConfig::AuthDigestConfig() : authenticateChildren(20,0,1,1)
+AuthDigestConfig::AuthDigestConfig() : authenticateChildren(20)
 {
     /* TODO: move into initialisation list */
     /* 5 minutes */
@@ -1254,7 +1254,11 @@ AuthDigestConfig::decode(char const *proxy_auth)
     }
 
     /* we can't check the URI just yet. We'll check it in the
-     * authenticate phase */
+     * authenticate phase, but needs to be given */
+    if (!digest_request->uri) {
+        debugs(29, 4, "authenticateDigestDecode: Missing URI field");
+        return authDigestLogUsername(username, digest_request);
+    }
 
     /* is the response the correct length? */
 
diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index 59da54ca0b..d41e0feacd 100644
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -142,7 +142,7 @@ AuthNegotiateConfig::dump(StoreEntry * entry, const char *name, AuthConfig * sch
 
 }
 
-AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(20,0,1,1), keep_alive(1)
+AuthNegotiateConfig::AuthNegotiateConfig() : authenticateChildren(20), keep_alive(1)
 { }
 
 void
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index c685dc0bdb..2546362da1 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -124,7 +124,7 @@ AuthNTLMConfig::dump(StoreEntry * entry, const char *name, AuthConfig * scheme)
 
 }
 
-AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(20,0,1,1), keep_alive(1)
+AuthNTLMConfig::AuthNTLMConfig() : authenticateChildren(20), keep_alive(1)
 { }
 
 void
diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc
index b7a6153e6a..adb10851cc 100644
--- a/src/tests/stub_HelperChildConfig.cc
+++ b/src/tests/stub_HelperChildConfig.cc
@@ -4,15 +4,6 @@
 
 #include <string.h>
 
-HelperChildConfig::HelperChildConfig() :
-        n_max(0),
-        n_startup(1),
-        n_idle(1),
-        concurrency(1),
-        n_running(0),
-        n_active(0)
-{}
-
 HelperChildConfig::HelperChildConfig(const unsigned int m, const unsigned int s, const unsigned int i, const unsigned int cc) :
         n_max(m),
         n_startup(s),