Merged from trunk

diff --cc src/client_side.cc
index db6048a8fdb11d6995739bf0708c10d851d8514d,c7a4a953c9f3084bfe34d8027843872a9d581eb9..39e04283cc2c99b77bb95bcaaf2fed65e33556f7
--- 1/src/client_side.cc
--- 2/src/client_side.cc
+++ b/src/client_side.cc
@@@ -3698,12 -3698,10 +3698,12 @@@ ConnStateData::sslCrtdHandleReplyWrappe
  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;
+         Ssl::CrtdMessage reply_message(Ssl::CrtdMessage::REPLY);
          if (reply_message.parse(reply.other().content(), reply.other().contentSize()) != Ssl::CrtdMessage::OK) {
              debugs(33, 5, HERE << "Reply from ssl_crtd for " << sslConnectHostOrIp << " is incorrect");
          } else {