Set sslcrtvalidator_children concurrency option default value to 1

diff --git a/src/cf.data.pre b/src/cf.data.pre
index e2e138ed2b7e78ef416ff48946b3a4dcc48ef70c..7b981d15b66853c73ff53c4a6e24b2f47c72bcc9 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2661,8 +2661,8 @@ DOC_START
                concurrency=
        
        The number of requests each certificate validator helper can handle in
-       parallel. Defaults to 0 which indicates the certficate validator
-       is a old-style single threaded redirector.
+       parallel. A value of 0 indicates the certficate validator does not
+       support concurrency. Defaults to 1.
        
        When this directive is set to a value >= 1 then the protocol
        used to communicate with the helper is modified to include

diff --git a/src/ssl/Config.cc b/src/ssl/Config.cc
index 0060df8ab446b6453a560ed5684109423c980fcc..f730e03c82eeda8f7f81948a8aa20b2db0667a3a 100644 (file)
--- a/src/ssl/Config.cc
+++ b/src/ssl/Config.cc
@@ -3,6 +3,15 @@
 
 Ssl::Config Ssl::TheConfig;
 
+Ssl::Config::Config():
+#if USE_SSL_CRTD
+            ssl_crtd(NULL),
+#endif
+            ssl_crt_validator(NULL)
+{ 
+    ssl_crt_validator_Children.concurrency = 1;
+}
+
 Ssl::Config::~Config()
 {
 #if USE_SSL_CRTD

diff --git a/src/ssl/Config.h b/src/ssl/Config.h
index 24de8f64f9b1f0d029c7a976ca8cd50d7e096e93..6fa5daedd5ea21d388cad23d6c92037540f79c6a 100644 (file)
--- a/src/ssl/Config.h
+++ b/src/ssl/Config.h
@@ -16,12 +16,7 @@ public:
 #endif
     char *ssl_crt_validator;
     HelperChildConfig ssl_crt_validator_Children;
-    Config():
-#if USE_SSL_CRTD
-            ssl_crtd(NULL),
-#endif
-            ssl_crt_validator(NULL) {}
-
+    Config();
     ~Config();
 private:
     Config(const Config &); // not implemented

diff --git a/src/tests/stub_libsslsquid.cc b/src/tests/stub_libsslsquid.cc
index 6bec9464d552baa3d704ad55c5618e2bcc1c1cd7..85e871dae5ddcfae41fa2466aa995605c39ca713 100644 (file)
--- a/src/tests/stub_libsslsquid.cc
+++ b/src/tests/stub_libsslsquid.cc
@@ -10,6 +10,15 @@
 #include "tests/STUB.h"
 
 #include "ssl/Config.h"
+Ssl::Config::Config():
+#if USE_SSL_CRTD
+            ssl_crtd(NULL),
+#endif
+            ssl_crt_validator(NULL)
+{
+    ssl_crt_validator_Children.concurrency = 1;
+    STUB_NOP
+}
 Ssl::Config::~Config() STUB_NOP
 Ssl::Config Ssl::TheConfig;