2009-02-06 Gonzalo Paniagua Javier <gonzalo@novell.com>

[mono.git] / mcs / class / System / System.Net / FtpDataStream.cs

diff --git a/mcs/class/System/System.Net/FtpDataStream.cs b/mcs/class/System/System.Net/FtpDataStream.cs
index 9f448bf7538ef6bc871613cdb671f4e0aaf228c4..45af275065506f8ac51b8da72dbc2f2a92f30bc9 100644 (file)
--- a/mcs/class/System/System.Net/FtpDataStream.cs
+++ b/mcs/class/System/System.Net/FtpDataStream.cs
@@ -12,6 +12,7 @@ using System.IO;
 using System.Net.Sockets;
 using System.Runtime.Remoting.Messaging;
 using System.Threading;
+using System.Net;
 
 #if NET_2_0
 
@@ -21,12 +22,10 @@ namespace System.Net
        {
                FtpWebRequest request;
                NetworkStream networkStream;
+               Socket socket;
                bool disposed;
                bool isRead;
                int totalRead;
-               int contentLength;
-
-               ManualResetEvent closewh;
 
                internal FtpDataStream (FtpWebRequest request, Socket socket, bool isRead)
                {
@@ -38,11 +37,13 @@ namespace System.Net
                                throw new ArgumentException ("socket");
 
                        this.request = request;
-                       this.contentLength = socket.Available;
+                       this.socket = socket;
                        this.networkStream = new NetworkStream (socket, true);
                        this.isRead = isRead;
 
-                       closewh = new ManualResetEvent (false);
+                       if (request.EnableSsl) {
+                               FtpWebRequest.ChangeToSSLSocket (ref networkStream);
+                       }
                }
 
                public override bool CanRead {
@@ -87,7 +88,7 @@ namespace System.Net
 
                public override void Close ()
                {
-                       ((IDisposable) this).Dispose ();
+                       Dispose (true);
                }
 
                public override void Flush ()
@@ -108,19 +109,22 @@ namespace System.Net
                int ReadInternal (byte [] buffer, int offset, int size)
                {
                        int nbytes;
+
+                       request.CheckIfAborted ();
+
                        try {
                                // Probably it would be better to have the socket here
                                nbytes = networkStream.Read (buffer, offset, size);
-                       } catch (IOException exc) {
+                       } catch (IOException) {
                                throw new ProtocolViolationException ("Server commited a protocol violation");
                        }
 
                        totalRead += nbytes;
-                       if (nbytes == 0)
-                               contentLength = totalRead;
-                       if (totalRead >= contentLength)
+                       if (nbytes == 0) {
+                               networkStream.Close ();
                                request.SetTransferCompleted ();
-                       
+                       }
+
                        return nbytes;
                }
 
@@ -159,6 +163,7 @@ namespace System.Net
 
                public override int Read (byte [] buffer, int offset, int size)
                {
+                       request.CheckIfAborted ();
                        IAsyncResult ar = BeginRead (buffer, offset, size, null, null);
                        if (!ar.IsCompleted && !ar.AsyncWaitHandle.WaitOne (request.ReadWriteTimeout, false))
                                throw new WebException ("Read timed out.", WebExceptionStatus.Timeout);
@@ -171,9 +176,11 @@ namespace System.Net
                
                void WriteInternal (byte [] buffer, int offset, int size)
                {
+                       request.CheckIfAborted ();
+                       
                        try {
                                networkStream.Write (buffer, offset, size);
-                       } catch (IOException exc) {
+                       } catch (IOException) {
                                throw new ProtocolViolationException ();
                        }
                }
@@ -212,6 +219,7 @@ namespace System.Net
 
                public override void Write (byte [] buffer, int offset, int size)
                {
+                       request.CheckIfAborted ();
                        IAsyncResult ar = BeginWrite (buffer, offset, size, null, null);
                        if (!ar.IsCompleted && !ar.AsyncWaitHandle.WaitOne (request.ReadWriteTimeout, false))
                                throw new WebException ("Read timed out.", WebExceptionStatus.Timeout);
@@ -236,11 +244,28 @@ namespace System.Net
                                return;
 
                        disposed = true;
-
-                       networkStream.Close ();
-                       networkStream = null;
-
-                       closewh.Set ();
+                       if (socket != null) {
+                               try {
+                                       if (socket.Poll (0, SelectMode.SelectRead)) {
+                                               byte [] bytes = new byte [2048];
+                                               int nbytes;
+                                               do {
+                                                       nbytes = socket.Receive (bytes);
+                                               } while (nbytes > 0 && socket.Poll (0, SelectMode.SelectRead));
+                                       }
+                               } catch {
+                                       // Ignore
+                               }
+
+                               try {
+                                       networkStream.Close ();
+                               } catch {
+                               }
+                               networkStream = null;
+                               socket = null;
+                               request.SetTransferCompleted ();
+                               request = null;
+                       }
                }
 
                void CheckDisposed ()
@@ -250,13 +275,6 @@ namespace System.Net
                }
 
                delegate int ReadDelegate (byte [] buffer, int offset, int size);
-
-               // We need to know whether the stream has been closed
-               internal ManualResetEvent CloseWaitHandle {
-                       get {
-                               return closewh;
-                       }
-               }
        }
 }