From 0c24993c981370ec9e278dfd8d567189257cfd74 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 21 Dec 2004 13:38:06 +0000
Subject: [PATCH] <scp> using <fileset> doesn't work with OpenSSH 3.9 (and
 later?).

PR: 31939
Submitted by:    Casper Groenen <cgroenen at xebia dot com>
                 Atsuhiko Yamanaka <ymnk at jcraft dot com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277253 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                       | 3 +++
 .../apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index f9620ad3d..1ac7e1401 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -215,6 +215,9 @@ Fixed bugs:
 * fixed Regexp-Mapper docs which gave outdated instructions (optional.jar)
   Bugzilla report 28584
 
+* <scp> using <fileset> didn't work with OpenSSH 3.9 and later.
+  Bugzilla report 31939
+
 Changes from Ant 1.6.1 to Ant 1.6.2
 ===================================
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
index b13fbf237..9f0a358b6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
@@ -112,7 +112,7 @@ public class ScpToMessage extends AbstractSshMessage {
     }
 
     private void doMultipleTransfer() throws IOException, JSchException {
-        Channel channel = openExecChannel("scp -d -t " + remotePath);
+        Channel channel = openExecChannel("scp -r -d -t " + remotePath);
         try {
             OutputStream out = channel.getOutputStream();
             InputStream in = channel.getInputStream();