From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 23 Aug 2013 21:28:11 +0000 (-0600)
Subject: When writing FTP errors to the client, omit ERR_NONE error name.
X-Git-Tag: SQUID_3_5_0_1~117^2~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cabb71673183cfc613e69daad66c661338f6e468;p=thirdparty%2Fsquid.git

When writing FTP errors to the client, omit ERR_NONE error name.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index df85e612f7..21e81b53b5 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -5298,7 +5298,8 @@ FtpWriteForwardedReply(ClientSocketContext *context, const HttpReply *reply, Asy
         const char *reason = reply->sline.reason();
         MemBuf mb;
         mb.init();
-        mb.Printf("%i-%s\r\n", status, errorPageName(request->errType));
+        if (request->errType != ERR_NONE)
+            mb.Printf("%i-%s\r\n", status, errorPageName(request->errType));
         if (request->errDetail > 0) {
             // XXX: > 0 may not always mean that this is an errno
             mb.Printf("%i-Error: (%d) %s\r\n", status,