From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 8 Nov 2012 10:49:58 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_4_0_1~471^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5924bf8203db473e8c71b3b4dd839d8f002ba38b;p=thirdparty%2Fsquid.git

Merged from trunk
---

5924bf8203db473e8c71b3b4dd839d8f002ba38b
diff --cc src/client_side.cc
index db6048a8fd,c7a4a953c9..39e04283cc
--- a/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 {