From 46fa223c8d070bd55504361cfa8752282f11520b Mon Sep 17 00:00:00 2001 From: Christos Tsantilas Date: Sat, 14 Dec 2013 22:06:25 -0700 Subject: [PATCH] Set sslcrtvalidator_children concurrency option default value to 1 --- src/cf.data.pre | 4 ++-- src/ssl/Config.cc | 9 +++++++++ src/ssl/Config.h | 7 +------ src/tests/stub_libsslsquid.cc | 9 +++++++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/cf.data.pre b/src/cf.data.pre index e2e138ed2b..7b981d15b6 100644 --- 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 0060df8ab4..f730e03c82 100644 --- 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 24de8f64f9..6fa5daedd5 100644 --- 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 6bec9464d5..85e871dae5 100644 --- 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; -- 2.47.2