---------------------
PatchSet 6580 
Date: 2008/01/20 10:35:46
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Remove NOTES-IPv6.

Empties IPv6 branch for development.
Barring bug fixes we are now done.

Members: 
	NOTES-IPv6:1.1.2.83->1.1.2.84(DEAD) 
	src/ftp.cc:1.26.2.54->1.26.2.55 

--- squid3/NOTES-IPv6	Mon Jan 21 01:25:05 2008
+++ /dev/null	Mon Jan 21 01:25:05 2008
@@ -1,24 +0,0 @@
-$Id: NOTES-IPv6,v 1.1.2.83 2008/01/08 02:25:45 amosjeffries Exp $
-
-NP: Any problems with this version of squid please contact
-	squid3@treenet.co.nz for assistance.
-
-TODO:
-
-1.0	Test for problems under Windows:
-	 *2k/NT	--disable-ipv6
-	 *Vista --with-ipv4-mapped
-	 *XP	--with-ipv6-split-stack
-
-4.3	Test new ICMP* engines
-	- Write unit tests for ICMPv*, ICMPSquid, ICMPPinger classes (really needed? given the dynamic startup tests)
-	- still requires Hop retrieval in ICMPv6 (v6 addresses always seen as 1 hops away :-)
-
-4.5	Give SNMP modules an OO flavour ( C++ )
-	- not part of squid3-ipv6 branch
-
-4.6	Write a Neighbour-Discovery auto-configuration component.
-	- SRV auto-discovery? based on resolv.conf domain setting SRV www-proxy records
-
-4.7	Dec 2007: check back with iptables/netfilter to see if getsockopt( *_ORIGINAL_DST)
-		will handle IPv4 traffic NAT'd to an IPv6 listener socket yet.
Index: squid3/src/ftp.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ftp.cc,v
retrieving revision 1.26.2.54
retrieving revision 1.26.2.55
diff -u -r1.26.2.54 -r1.26.2.55
--- squid3/src/ftp.cc	19 Jan 2008 06:42:26 -0000	1.26.2.54
+++ squid3/src/ftp.cc	20 Jan 2008 10:35:46 -0000	1.26.2.55
@@ -1,5 +1,5 @@
 /*
- * $Id: ftp.cc,v 1.26.2.54 2008/01/19 06:42:26 amosjeffries Exp $
+ * $Id: ftp.cc,v 1.26.2.55 2008/01/20 10:35:46 amosjeffries Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -32,7 +32,10 @@
  *
  */
 
-#include "squid.h"
+//#include "squid.h"
+
+#include "FTP.h"
+
 #include "Store.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"