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 f42e8560aff4fc1d6e6bdbefca5604578b038414..09dd5a167e2333bf02823ad243807e9c6b2d48ed 100644 (file)
--- 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 47c499d1d1ecd471fdce76e69c926c52f9acf496..07af956db88a4a063abdba90a8fb0623132dcf66 100644 (file)
--- 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 d3bb42138d747b6f2e3e6048afcdb1a645e5bda0..da99ba2e5232a6aa4819107d4d82c9dc2a073125 100644 (file)
--- 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 879a3c8e5e4f98252d5b5e1137b708bf9c373269..9d29d0de9cb6950cd7af00af891b2e24c1643119 100644 (file)
--- 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 59da54ca0b96b355a1625320ddb19344e43c9387..d41e0feacdc4f0df3efaf45b2243b710d6378892 100644 (file)
--- 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 c685dc0bdba967d3e67bd2fc3d16c7ceab7d243c..2546362da1b8d1689dc3f4b44b590c4958a4ba80 100644 (file)
--- 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 b7a6153e6a715c310bbe71686ee8c972474bf78b..adb10851cccf8ca4147ee0bc50e6e0da13bba3bd 100644 (file)
--- 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),