2007-03-09 Miguel de Icaza <miguel@novell.com>

	* FtpDataStream.cs: Close must be called on the stream before we
	attempt to read a status code from the remote server.

svn path=/trunk/mcs/; revision=73986

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index ffd18361193c5fe2768a2993ef52296b1265696b..3efc1a7f14422771daaa0ad06539213bc1c323ac 100644 (file)
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-09  Miguel de Icaza  <miguel@novell.com>
+
+       * FtpDataStream.cs: Close must be called on the stream before we
+       attempt to read a status code from the remote server.
+
+       Fixes FTP transfers to complete. 
+
 2007-03-05 Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>
 
        * HttpWebRequest.cs: properly handle OPTIONS, which may or may not

diff --git a/mcs/class/System/System.Net/FtpDataStream.cs b/mcs/class/System/System.Net/FtpDataStream.cs
index f8d77e174d74d5e24ffc4e3ec9159c57bfcc03a9..0638e28ca0b89c46c8658d5e8c9eb9de5bdfa8da 100644 (file)
--- a/mcs/class/System/System.Net/FtpDataStream.cs
+++ b/mcs/class/System/System.Net/FtpDataStream.cs
@@ -130,10 +130,10 @@ namespace System.Net
                        totalRead += nbytes;
                        if (nbytes == 0) {
                                contentLength = totalRead;
-                               request.SetTransferCompleted ();
                                networkStream.Close ();
+                               request.SetTransferCompleted ();
                        }
-                       
+
                        return nbytes;
                }