From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 14 Jan 2011 05:50:43 +0000 (-0700)
Subject: Bug 3089: FTP command output overrides directory listing
X-Git-Tag: take00~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a91d3505f6d7a6604b9937900de6662195081b57;p=thirdparty%2Fsquid.git

Bug 3089: FTP command output overrides directory listing
---

diff --git a/src/errorpage.cc b/src/errorpage.cc
index ccdbfccdb8..4d871059f0 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -681,12 +681,12 @@ ErrorState::Convert(char token, bool building_deny_info_url, bool allowRecursion
 
     case 'g':
         if (building_deny_info_url) break;
-        /* FTP SERVER MESSAGE */
-        if (ftp.server_msg)
-            wordlistCat(ftp.server_msg, &mb);
-        else if (ftp.listing) {
+        /* FTP SERVER RESPONSE */
+        if (ftp.listing) {
             mb.append(ftp.listing->content(), ftp.listing->contentSize());
             do_quote = 0;
+        } else if (ftp.server_msg) {
+            wordlistCat(ftp.server_msg, &mb);
         }
         break;