From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 25 Jul 2014 01:46:09 +0000 (-0700)
Subject: Log PROXY errors to cache.log
X-Git-Tag: SQUID_3_5_0_1~75^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c082dbe95e628bdd403e9c9c7cdee189e88b019;p=thirdparty%2Fsquid.git

Log PROXY errors to cache.log
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 99b7b2a1ea..3c171e7e86 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2931,8 +2931,10 @@ ConnStateData::proxyProtocolValidateClient()
 bool
 ConnStateData::proxyProtocolError(const char *msg)
 {
-    if (msg)
+    if (msg) {
+        debugs(33, 2, msg << " from " << clientConnection);
         mustStop(msg);
+    }
     return false;
 }
 
@@ -2994,7 +2996,7 @@ ConnStateData::parseProxy10()
         // else, no LF found
 
         // protocol error only if there are more than 107 bytes prefix header
-        return proxyProtocolError(in.buf.length() > 107? "PROXY error: missing CRLF":NULL);
+        return proxyProtocolError(in.buf.length() > 107? "PROXY/1.0 error: missing CRLF":NULL);
 
     } else if (!tcpVersion.cmp("TCP",3)) {