Merge branch 'master' into beta

Author: justcoding121

src/Titanium.Web.Proxy/Helpers/HttpWriter.cs

@@ -18,18 +18,13 @@ internal class HttpWriter : ICustomStreamWriter
 
         private static readonly byte[] newLine = ProxyConstants.NewLineBytes;
 
-        private static readonly Encoder encoder = Encoding.ASCII.GetEncoder();
-
-        private readonly char[] charBuffer;
+        private static readonly Encoding encoder = Encoding.ASCII;
 
         internal HttpWriter(Stream stream, IBufferPool bufferPool, int bufferSize)
         {
             BufferSize = bufferSize;
             this.stream = stream;
             this.bufferPool = bufferPool;
-
-            // ASCII encoder max byte count is char count + 1
-            charBuffer = new char[BufferSize - 1];
         }
 
         internal int BufferSize { get; }
@@ -55,12 +50,10 @@ private async Task writeAsyncInternal(string value, bool addNewLine, Cancellatio
             int charCount = value.Length;
             if (charCount < BufferSize - newLineChars)
             {
-                value.CopyTo(0, charBuffer, 0, charCount);
-
                 var buffer = bufferPool.GetBuffer(BufferSize);
                 try
                 {
-                    int idx = encoder.GetBytes(charBuffer, 0, charCount, buffer, 0, true);
+                    int idx = encoder.GetBytes(value, 0, charCount, buffer, 0);
                     if (newLineChars > 0)
                     {
                         Buffer.BlockCopy(newLine, 0, buffer, idx, newLineChars);
@@ -76,11 +69,8 @@ private async Task writeAsyncInternal(string value, bool addNewLine, Cancellatio
             }
             else
             {
-                var charBuffer = new char[charCount];
-                value.CopyTo(0, charBuffer, 0, charCount);
-
                 var buffer = new byte[charCount + newLineChars + 1];
-                int idx = encoder.GetBytes(charBuffer, 0, charCount, buffer, 0, true);
+                int idx = encoder.GetBytes(value, 0, charCount, buffer, 0);
                 if (newLineChars > 0)
                 {
                     Buffer.BlockCopy(newLine, 0, buffer, idx, newLineChars);