Merge pull request #391 from justcoding121/develop

merge to beta

Author: honfika

Examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs

@@ -90,8 +90,7 @@ public MainWindow()
             //proxyServer.CertificateManager.LoadRootCertificate(@"C:\NameFolder\rootCert.pfx", "PfxPassword");
 
             var explicitEndPoint = new ExplicitProxyEndPoint(IPAddress.Any, 8000, true);
-
-
+            
             proxyServer.AddEndPoint(explicitEndPoint);
             //proxyServer.UpStreamHttpProxy = new ExternalProxy
             //{

Titanium.Web.Proxy/EventArguments/LimitedStream.cs

@@ -22,7 +22,11 @@ public LimitedStream(CustomBufferedStream baseStream, CustomBinaryReader baseRea
             this.baseStream = baseStream;
             this.baseReader = baseReader;
             this.isChunked = isChunked;
-            bytesRemaining = isChunked ? 0 : contentLength;
+            bytesRemaining = isChunked 
+                ? 0 
+                : contentLength == -1 
+                    ? long.MaxValue 
+                    : contentLength;
         }
 
         private void GetNextChunk()
@@ -98,22 +102,31 @@ public override int Read(byte[] buffer, int offset, int count)
             int res = baseStream.Read(buffer, offset, toRead);
             bytesRemaining -= res;
 
+            if (res == 0)
+            {
+                bytesRemaining = -1;
+            }
+
             return res;
         }
 
         public async Task Finish()
         {
-            var buffer = BufferPool.GetBuffer(baseReader.Buffer.Length);
-            try
+            if (bytesRemaining != -1)
             {
-                while (bytesRemaining != -1)
+                var buffer = BufferPool.GetBuffer(baseReader.Buffer.Length);
+                try
                 {
-                    await ReadAsync(buffer, 0, buffer.Length);
+                    int res = await ReadAsync(buffer, 0, buffer.Length);
+                    if (res != 0)
+                    {
+                        throw new Exception("Data received after stream end");
+                    }
+                }
+                finally
+                {
+                    BufferPool.ReturnBuffer(buffer);
                 }
-            }
-            finally
-            {
-                BufferPool.ReturnBuffer(buffer);
             }
         }
 

Titanium.Web.Proxy/Helpers/Tcp.cs

@@ -249,12 +249,8 @@ internal static async Task SendRawTap(Stream clientStream, Stream serverStream,
         internal static Task SendRaw(Stream clientStream, Stream serverStream, int bufferSize,
             Action<byte[], int, int> onDataSend, Action<byte[], int, int> onDataReceive, ExceptionHandler exceptionFunc)
         {
-#if NET45
-            return SendRawApm(clientStream, serverStream, bufferSize, onDataSend, onDataReceive, exceptionFunc);
-#else
-            // todo: Apm hangs in dotnet core
+            // todo: fix APM mode
             return SendRawTap(clientStream, serverStream, bufferSize, onDataSend, onDataReceive, exceptionFunc);
-#endif
         }
     }
 }