From 1702b68043aa3d60562e6b54903ad377fc9ca591 Mon Sep 17 00:00:00 2001
From: jkf <jm@famkruithof.net>
Date: Fri, 12 Jul 2019 16:05:46 +0200
Subject: [PATCH] Add Ftp ant task timeout documentation also updated

---
 manual/Tasks/ftp.html                                     | 8 +++++++-
 .../org/apache/tools/ant/taskdefs/optional/net/FTP.java   | 5 +++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html
index b25f332e4..dad5ad939 100644
--- a/manual/Tasks/ftp.html
+++ b/manual/Tasks/ftp.html
@@ -190,7 +190,7 @@ connection.</p>
   <tr>
     <td>preservelastmodified</td>
     <td>Give the copied files the same last modified time as the original source files (applies to
-      getting files only).  (<strong>Note</strong>: Ignored on Java 1.1)</td>
+      getting files only).  (<strong>Note</strong>: Ignored on Java 1.1)</td>11
     <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
@@ -219,6 +219,12 @@ connection.</p>
       disable it in certain firewall scenarios.  <em>since Ant 1.8.0</em></td>
     <td>No; default is <q>true</q></td>
   </tr>
+  <tr>
+    <td>dataTimeout</td>
+    <td>Sets a timeout in milliseconds used when waiting for data on the data connection.
+      A value of 0 means an infinite timeout.<em>since Ant 1.10.7</em></td>
+    <td>No</td>
+  </tr>
   <tr>
     <td colspan="3" class="left">
       <p><strong>The following attributes
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 3be911a4d..ad16f41b7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -1697,11 +1697,12 @@ public class FTP extends Task implements FTPTaskConfig {
     }
 
     /**
-     * Sets the timeout on the data connection.
+     * Sets the timeout on the data connection in milliseconds.
      * Any negative value is discarded and leaves the default
+     * A value of 0 means an infinite timeout
      *
      * @param dataTimeout int
-     * @since Ant 1.10.6
+     * @since Ant 1.10.7
      */
     public void setDataTimeout(int dataTimeout) {
         if(dataTimeout >= 0) {