------------------------------------------------------------
revno: 13532
revision-id: squid3@treenet.co.nz-20140812130621-pqr3rdwdw220imv0
parent: squidadm@squid-cache.org-20140812001456-064pbeqv3s8alobe
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Tue 2014-08-12 06:06:21 -0700
message:
  Fix unwrapped adaptation code in rev.13528
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140812130621-pqr3rdwdw220imv0
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 7808455a7170fd2db4e950193f59d8810da1311f
# timestamp: 2014-08-12 13:53:59 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squidadm@squid-cache.org-20140812001456-\
#   064pbeqv3s8alobe
# 
# Begin patch
=== modified file 'src/servers/FtpServer.cc'
--- src/servers/FtpServer.cc	2014-08-10 23:18:33 +0000
+++ src/servers/FtpServer.cc	2014-08-12 13:06:21 +0000
@@ -1013,6 +1013,7 @@
                   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 @@
         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) ?