From baf999440258e85ffda5ab07367d35fb8042e12e Mon Sep 17 00:00:00 2001
From: Steven Schubiger <stsc@member.fsf.org>
Date: Thu, 25 Feb 2010 21:47:53 +0100
Subject: [PATCH] Add port substitution for FTP to tests.

---
 tests/ChangeLog    | 5 +++++
 tests/FTPServer.pm | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/tests/ChangeLog b/tests/ChangeLog
index e9a4c76a..a2b739d5 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-25  Steven Schubiger  <stsc@member.fsf.org>
+
+	* FTPServer.pm (FTPServer::new): Substitute port placeholders
+	in content of files to be retrieved via FTP.
+
 2009-10-14  Steven Schubiger  <stsc@member.fsf.org>
 
 	* Test-E-k-K.px, Test-cookies-401.px, Test-ftp-bad-list.px,
diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm
index 2758ab1e..87e79839 100644
--- a/tests/FTPServer.pm
+++ b/tests/FTPServer.pm
@@ -489,6 +489,12 @@ sub new {
                                              Proto => 'tcp',
                                              Type => SOCK_STREAM)
                                         or die "bind: $!";
+
+    foreach my $file (keys %{$self->{_input}}) {
+        my $ref = \$self->{_input}{$file}{content};
+        $$ref =~ s/{{port}}/$self->sockport/eg;
+    }
+
     return $self;
 }
 
-- 
2.39.2