From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 22 Sep 2012 12:08:08 +0000 (+1200)
Subject: Update ssl_crtd BH shortcut to use message=
X-Git-Tag: SQUID_3_4_0_1~471^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5955f162895becf18d1eab72943b7abe6330c3ff;p=thirdparty%2Fsquid.git

Update ssl_crtd BH shortcut to use message=
---

diff --git a/src/client_side.cc b/src/client_side.cc
index dcd727da46..e68acde271 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3687,8 +3687,10 @@ ConnStateData::sslCrtdHandleReplyWrapper(void *data, const HelperReply &reply)
 void
 ConnStateData::sslCrtdHandleReply(const HelperReply &reply)
 {
-    if (!reply.other().hasContent()) {
-        debugs(1, DBG_IMPORTANT, HERE << "\"ssl_crtd\" helper return <NULL> reply");
+    if (reply.result == HelperReply::BrokenHelper) {
+        debugs(33, 5, HERE << "Certificate for " << sslConnectHostOrIp << " cannot be generated. ssl_crtd response: " << reply);
+    } else if (!reply.other().hasContent()) {
+        debugs(1, DBG_IMPORTANT, HERE << "\"ssl_crtd\" helper returned <NULL> reply.");
     } else {
         Ssl::CrtdMessage reply_message;
         if (reply_message.parse(reply.other().content(), reply.other().contentSize()) != Ssl::CrtdMessage::OK) {
diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index 323d41b61f..b5b64e850b 100644
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -96,7 +96,7 @@ void Ssl::Helper::sslSubmit(CrtdMessage const & message, HLPCB * callback, void
         if (squid_curtime - first_warn > 3 * 60)
             fatal("SSL servers not responding for 3 minutes");
         debugs(34, DBG_IMPORTANT, HERE << "Queue overload, rejecting");
-        const char *errMsg = "BH error 45 Temporary network problem, please retry later"; // XXX: upgrade to message=""
+        const char *errMsg = "BH message=\"error 45 Temporary network problem, please retry later\"";
         callback(data, HelperReply(errMsg,strlen(errMsg)));
         return;
     }