2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 36a52deb8..e3d524348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20130306
+ - (dtucker) [regress/forward-control.sh] Wait longer for the forwarding
+  connection to start so that the test works on slower machines.
+
 20130305
  - (djm) [regress/modpipe.c] Compilation fix for AIX and parsing fix for
    HP/UX. Spotted by Kevin Brott
diff --git a/regress/forward-control.sh b/regress/forward-control.sh
index 806874895..80ddb4167 100644
--- a/regress/forward-control.sh
+++ b/regress/forward-control.sh
@@ -14,7 +14,7 @@ wait_for_file_to_appear() {
         while test ! -f $_path ; do
                 test $_n -eq 1 && trace "waiting for $_path to appear"
                 _n=`expr $_n + 1`
-                test $_n -ge 5 && return 1
+                test $_n -ge 20 && return 1
                 sleep 1
         done
         return 0
@@ -26,7 +26,7 @@ wait_for_process_to_exit() {
         while kill -0 $_pid 2>/dev/null ; do
                 test $_n -eq 1 && trace "waiting for $_pid to exit"
                 _n=`expr $_n + 1`
-                test $_n -ge 5 && return 1
+                test $_n -ge 20 && return 1
                 sleep 1
         done
         return 0