Update ssl_crtd BH shortcut to use message=

diff --git a/src/client_side.cc b/src/client_side.cc
index dcd727da4621b1db4ab68d4868ca6334a753c404..e68acde271e3a6f1857c246d280d4b68c4f11e4a 100644 (file)
--- 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 323d41b61f5bda45a9f789f8f75869536c89b92c..b5b64e850bc6049704ce16b6b43bbc4088296728 100644 (file)
--- 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;
     }