From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 29 Feb 2012 21:16:06 +0000 (+0200)
Subject: Bug fix: The '%I' formating code in error page shows '[unknown]' in the case of SQUID... 
X-Git-Tag: BumpSslServerFirst.take06~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06b4e9c80e38e091aaee4d28ac1e62738929f539;p=thirdparty%2Fsquid.git

Bug fix: The '%I' formating code in error page shows '[unknown]' in the case of SQUID_X509_V_ERR_DOMAIN_MISMATCH error

Update the server ip address and server hostname in HttpRequest::hier object
in the case of SQUID_X509_V_ERR_DOMAIN_MISMATCH error to be used for %I field
of the generated error page
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 316ff3f8fb..f5e88637a5 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2510,6 +2510,8 @@ bool ConnStateData::serveDelayedError(ClientSocketContext *context)
                 clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
                 assert (repContext);
 
+                // Fill the server ip address and server hostname for use with ErrorState
+                request->hier.note(pinning.serverConnection, request->GetHost());
                 // Create an error object and fill it
                 ErrorState *err = new ErrorState(ERR_SECURE_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE, request);