diff -ruNX excluded curl-7.19.5/tests/ftpserver.pl curl-7.19.5-updated/tests/ftpserver.pl
--- curl-7.19.5/tests/ftpserver.pl	2008-12-08 22:01:06.000000000 -0500
+++ curl-7.19.5-updated/tests/ftpserver.pl	2009-04-29 16:33:14.000000000 -0400
@@ -83,6 +83,7 @@
 my $grok_eprt;
 my $port = 8921; # just a default
 my $listenaddr = "127.0.0.1"; # just a default
+my $client;
 my $pidfile = ".ftpd.pid"; # a default, use --pidfile
 
 my $SERVERLOGS_LOCK="log/serverlogs.lock"; # server logs advisor read lock
@@ -117,6 +118,11 @@
 	$listenaddr =~ s/^\[(.*)\]$/\1/;
         shift @ARGV;
     }
+    elsif($ARGV[0] eq "--client") {
+        $client = $ARGV[1];
+        $client =~ s/^\[(.*)\]$/\1/;
+        shift @ARGV;
+    }
 } while(shift @ARGV);
 
 sub catch_zap {
@@ -705,7 +711,7 @@
 
     # We fire up a new sockfilt to do the data transfer for us.
     # FIX: make it use IPv6 if need be
-    my $filtcmd="./server/sockfilt --connect $port --addr $addr --logfile log/sockdata$ftpdnum$ext.log --pidfile .sockdata$ftpdnum$ext.pid $ipv6";
+    my $filtcmd="./server/sockfilt --connect $port --addr $client --logfile log/sockdata$ftpdnum$ext.log --pidfile .sockdata$ftpdnum$ext.pid $ipv6";
     $slavepid = open2(\*DREAD, \*DWRITE, $filtcmd);
 
     print STDERR "$filtcmd\n" if($verbose);
diff -ruNX excluded curl-7.19.5/tests/runtests.pl curl-7.19.5-updated/tests/runtests.pl
--- curl-7.19.5/tests/runtests.pl	2009-04-17 22:00:06.000000000 -0400
+++ curl-7.19.5-updated/tests/runtests.pl	2009-04-29 16:33:14.000000000 -0400
@@ -976,8 +976,15 @@
     } else {
         $addr = $HOSTIP;
     }
+    my $addr_client;
+    if($ipv6) {
+        $addr_client = $CLIENT6IP;
+    } else {
+        $addr_client = $CLIENTIP;
+    }
+
+    $cmd="$perl $srcdir/ftpserver.pl --pidfile $pidfile $flag --port $port --addr \"$addr\" --client \"$addr_client\"";
 
-    $cmd="$perl $srcdir/ftpserver.pl --pidfile $pidfile $flag --port $port --addr \"$addr\"";
     my ($ftppid, $pid2) = startnew($cmd, $pidfile, 15, 0);
 
     if($ftppid <= 0 || !kill(0, $ftppid)) {