From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 12 Aug 2014 13:06:21 +0000 (-0700)
Subject: Fix unwrapped adaptation code in rev.13528
X-Git-Tag: SQUID_3_5_0_1~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02e1ed26125b25f3009636ea077bf876409a2052;p=thirdparty%2Fsquid.git

Fix unwrapped adaptation code in rev.13528
---

diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc
index b7e0e73b8b..3de0dbea1c 100644
--- a/src/servers/FtpServer.cc
+++ b/src/servers/FtpServer.cc
@@ -1013,6 +1013,7 @@ Ftp::Server::writeErrorReply(const HttpReply *reply, const int scode)
                   strerror(request->errDetail));
     }
 
+#if USE_ADAPTATION
     // XXX: Remove hard coded names. Use an error page template instead.
     const Adaptation::History::Pointer ah = request->adaptHistory();
     if (ah != NULL) { // XXX: add adapt::<all_h but use lastMeta here
@@ -1023,6 +1024,7 @@ Ftp::Server::writeErrorReply(const HttpReply *reply, const int scode)
         if (desc.size())
             mb.Printf("%i-Description: %s\r\n", scode, desc.termedBuf());
     }
+#endif
 
     assert(reply != NULL);
     const char *reason = reply->header.has(HDR_FTP_REASON) ?