------------------------------------------------------------
revno: 13653
revision-id: squid3@treenet.co.nz-20141031014316-dz2sxob08i362cw1
parent: squidadm@squid-cache.org-20141031005605-8eqt0tf2ocx6vaop
author: Christos Tsantilas <chtsanti@users.sourceforge.net>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2014-10-30 18:43:16 -0700
message:
  Fix: Unable to open FTP socket during reconfigure
  
  Squid does not close FTP listening ports on reconfigure.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141031014316-dz2sxob08i362cw1
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: d0f48381e53350f69f13a835e0d0003d50355df3
# timestamp: 2014-10-31 01:45:28 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squidadm@squid-cache.org-20141031005605-\
#   8eqt0tf2ocx6vaop
# 
# Begin patch
=== modified file 'src/servers/FtpServer.cc'
--- src/servers/FtpServer.cc	2014-09-29 05:13:17 +0000
+++ src/servers/FtpServer.cc	2014-10-31 01:43:16 +0000
@@ -274,7 +274,7 @@
 void
 Ftp::StopListening()
 {
-    for (AnyP::PortCfgPointer s = HttpPortList; s != NULL; s = s->next) {
+    for (AnyP::PortCfgPointer s = FtpPortList; s != NULL; s = s->next) {
         if (s->listenConn != NULL) {
             debugs(1, DBG_IMPORTANT, "Closing FTP port " << s->listenConn->local);
             s->listenConn->close();