diff -u -r -N squid-3.1.17/ChangeLog squid-3.1.18/ChangeLog
--- squid-3.1.17/ChangeLog	2011-12-03 03:29:23.000000000 +1300
+++ squid-3.1.18/ChangeLog	2011-12-03 19:18:46.000000000 +1300
@@ -1,3 +1,7 @@
+Changes to squid-3.1.18 (03 Dec 2011):
+
+	- Regression: compile error in FTP
+
 Changes to squid-3.1.17 (03 Dec 2011):
 
 	- Bug 3432: Crash logging FTP errors
diff -u -r -N squid-3.1.17/configure squid-3.1.18/configure
--- squid-3.1.17/configure	2011-12-03 03:34:00.000000000 +1300
+++ squid-3.1.18/configure	2011-12-03 19:21:25.000000000 +1300
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.1.17.
+# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.1.18.
 #
 # Report bugs to <http://www.squid-cache.org/bugs/>.
 #
@@ -575,8 +575,8 @@
 # Identity of this package.
 PACKAGE_NAME='Squid Web Proxy'
 PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.1.17'
-PACKAGE_STRING='Squid Web Proxy 3.1.17'
+PACKAGE_VERSION='3.1.18'
+PACKAGE_STRING='Squid Web Proxy 3.1.18'
 PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
 PACKAGE_URL=''
 
@@ -1540,7 +1540,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Squid Web Proxy 3.1.17 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.1.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1610,7 +1610,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Squid Web Proxy 3.1.17:";;
+     short | recursive ) echo "Configuration of Squid Web Proxy 3.1.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1941,7 +1941,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Squid Web Proxy configure 3.1.17
+Squid Web Proxy configure 3.1.18
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2952,7 +2952,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Squid Web Proxy $as_me 3.1.17, which was
+It was created by Squid Web Proxy $as_me 3.1.18, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3771,7 +3771,7 @@
 
 # Define the identity of the package.
  PACKAGE='squid'
- VERSION='3.1.17'
+ VERSION='3.1.18'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -28231,7 +28231,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Squid Web Proxy $as_me 3.1.17, which was
+This file was extended by Squid Web Proxy $as_me 3.1.18, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28297,7 +28297,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Squid Web Proxy config.status 3.1.17
+Squid Web Proxy config.status 3.1.18
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff -u -r -N squid-3.1.17/configure.ac squid-3.1.18/configure.ac
--- squid-3.1.17/configure.ac	2011-12-03 03:34:00.000000000 +1300
+++ squid-3.1.18/configure.ac	2011-12-03 19:21:24.000000000 +1300
@@ -2,7 +2,7 @@
 dnl
 dnl  $Id$
 dnl
-AC_INIT([Squid Web Proxy],[3.1.17],[http://www.squid-cache.org/bugs/],[squid])
+AC_INIT([Squid Web Proxy],[3.1.18],[http://www.squid-cache.org/bugs/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)
diff -u -r -N squid-3.1.17/include/version.h squid-3.1.18/include/version.h
--- squid-3.1.17/include/version.h	2011-12-03 03:34:00.000000000 +1300
+++ squid-3.1.18/include/version.h	2011-12-03 19:21:25.000000000 +1300
@@ -9,7 +9,7 @@
  */
 
 #ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1322836158
+#define SQUID_RELEASE_TIME 1322893123
 #endif
 
 #ifndef APP_SHORTNAME
diff -u -r -N squid-3.1.17/RELEASENOTES.html squid-3.1.18/RELEASENOTES.html
--- squid-3.1.17/RELEASENOTES.html	2011-12-03 04:23:10.000000000 +1300
+++ squid-3.1.18/RELEASENOTES.html	2011-12-03 20:05:31.000000000 +1300
@@ -2,10 +2,10 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.66">
- <TITLE>Squid 3.1.17 release notes</TITLE>
+ <TITLE>Squid 3.1.18 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 3.1.17 release notes</H1>
+<H1>Squid 3.1.18 release notes</H1>
 
 <H2>Squid Developers</H2>
 <HR>
@@ -71,7 +71,7 @@
 <HR>
 <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
 
-<P>The Squid Team are pleased to announce the release of Squid-3.1.17</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.1.18</P>
 <P>This new release is available for download from 
 <A HREF="http://www.squid-cache.org/Versions/v3/3.1/">http://www.squid-cache.org/Versions/v3/3.1/</A> or the 
 <A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P>
@@ -1302,7 +1302,7 @@
         %&lt;{Hdr:;member}   HTTP reply header list member using ; as
                           list separator. ; can be any non-alphanumeric
                           character.
-        %%                The percent symbol
+        %%                The percent symbol (available from 3.1.17)
         
 </PRE>
 </P>
diff -u -r -N squid-3.1.17/src/ftp.cc squid-3.1.18/src/ftp.cc
--- squid-3.1.17/src/ftp.cc	2011-12-03 03:29:23.000000000 +1300
+++ squid-3.1.18/src/ftp.cc	2011-12-03 19:18:46.000000000 +1300
@@ -3121,7 +3121,6 @@
     data.opened(io.nfd, dataCloser());
     data.port = io.details.peer.GetPort();
 
-    static char ntoapeer[MAX_IPSTRLEN];
     io.details.peer.NtoA(ntoapeer,sizeof(ntoapeer));
     data.host = xstrdup(ntoapeer);