Bug 3089: FTP command output overrides directory listing

diff --git a/src/errorpage.cc b/src/errorpage.cc
index ccdbfccdb82dcbb0243343a1eb2e43d02e26e88b..4d871059f07701ee9c99a8ace140bc80cbd73bf2 100644 (file)
--- 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;