using System.Net.Sockets;
using System.Runtime.Remoting.Messaging;
using System.Threading;
+using System.Net;
#if NET_2_0
{
FtpWebRequest request;
NetworkStream networkStream;
+ Socket socket;
bool disposed;
bool isRead;
int totalRead;
- int contentLength;
-
- ManualResetEvent closewh;
internal FtpDataStream (FtpWebRequest request, Socket socket, bool isRead)
{
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 {
public override void Close ()
{
- ((IDisposable) this).Dispose ();
+ Dispose (true);
}
public override void Flush ()
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;
}
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);
void WriteInternal (byte [] buffer, int offset, int size)
{
+ request.CheckIfAborted ();
+
try {
networkStream.Write (buffer, offset, size);
- } catch (IOException exc) {
+ } catch (IOException) {
throw new ProtocolViolationException ();
}
}
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);
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 ()
}
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;
- }
- }
}
}