------------------------------------------------------------
revno: 13056
revision-id: squid3@treenet.co.nz-20131215050625-rqrlk4isk3o4lpej
parent: squid3@treenet.co.nz-20131209030316-dyzauccycp21ump7
author: Christos Tsantilas <chtsanti@users.sourceforge.net>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Sat 2013-12-14 22:06:25 -0700
message:
  Set sslcrtvalidator_children concurrency option default value to 1
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131215050625-rqrlk4isk3o4lpej
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: ee8634651445737ae4ff6ba625328daff118e3b5
# timestamp: 2013-12-15 05:07:41 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131209030316-\
#   dyzauccycp21ump7
# 
# Begin patch
=== modified file 'src/cf.data.pre'
--- src/cf.data.pre	2013-11-19 22:45:48 +0000
+++ src/cf.data.pre	2013-12-15 05:06:25 +0000
@@ -2661,8 +2661,8 @@
 		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

=== modified file 'src/ssl/Config.cc'
--- src/ssl/Config.cc	2013-02-03 10:45:53 +0000
+++ src/ssl/Config.cc	2013-12-15 05:06:25 +0000
@@ -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

=== modified file 'src/ssl/Config.h'
--- src/ssl/Config.h	2013-02-03 10:45:53 +0000
+++ src/ssl/Config.h	2013-12-15 05:06:25 +0000
@@ -16,12 +16,7 @@
 #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

=== modified file 'src/tests/stub_libsslsquid.cc'
--- src/tests/stub_libsslsquid.cc	2013-02-03 10:45:53 +0000
+++ src/tests/stub_libsslsquid.cc	2013-12-15 05:06:25 +0000
@@ -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;