Rebasing issues

Author: benaadams

src/Microsoft.AspNet.Server.Kestrel/Http/Frame.FeatureCollection.cs

@@ -291,7 +291,7 @@ async Task<Stream> IHttpUpgradeFeature.UpgradeAsync()
                 }
             }
 
-            await ProduceStartAndFireOnStarting(immediate: true);
+            await ProduceStartAndFireOnStarting(immediate: true); 
 
             return DuplexStream;
         }

src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs

@@ -826,11 +826,7 @@ private bool TakeStartLine(SocketInput input)
             }
         }
 
-<<<<<<< HEAD
         public static bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders requestHeaders, MemoryPool2 memorypool)
-=======
-        public static bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders requestHeaders)
->>>>>>> 68d63ed... Reduce GetString allocs and conversions
         {
             var scan = input.ConsumingStart();
             var consumed = scan;
@@ -891,61 +887,55 @@ public static bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders req
 
                     var wrapping = false;
 
-                    while (!scan.IsEnd)
+                    var block = memorypool.Lease();
+                    try
                     {
-                        if (scan.Seek('\r') == -1)
+                        while (!scan.IsEnd)
                         {
-                            // no "\r" in sight, burn used bytes and go back to await more data
-                            return false;
-                        }
+                            if (scan.Seek('\r') == -1)
+                            {
+                                // no "\r" in sight, burn used bytes and go back to await more data
+                                return false;
+                            }
 
-                        var endValue = scan;
-                        chFirst = scan.Take(); // expecting: /r
-                        chSecond = scan.Take(); // expecting: /n
+                            var endValue = scan;
+                            chFirst = scan.Take(); // expecting: /r
+                            chSecond = scan.Take(); // expecting: /n
 
-                        if (chSecond != '\n')
-                        {
-                            // "\r" was all by itself, move just after it and try again
-                            scan = endValue;
-                            scan.Take();
-                            continue;
-                        }
-
-                        var chThird = scan.Peek();
-                        if (chThird == ' ' || chThird == '\t')
-                        {
-                            // special case, "\r\n " or "\r\n\t".
-                            // this is considered wrapping"linear whitespace" and is actually part of the header value
-                            // continue past this for the next
-                            wrapping = true;
-                            continue;
-                        }
+                            if (chSecond != '\n')
+                            {
+                                // "\r" was all by itself, move just after it and try again
+                                scan = endValue;
+                                scan.Take();
+                                continue;
+                            }
 
-<<<<<<< HEAD
-                        var block = memorypool.Lease();
-                        try
-=======
-                        var name = beginName.GetArraySegment(ref endName);
-                        var value = beginValue.GetAsciiString(ref endValue);
-                        if (wrapping)
->>>>>>> 68d63ed... Reduce GetString allocs and conversions
-                        {
-                            var name = beginName.GetArraySegment(endName, block.Data);
-                            var value = beginValue.GetString(endValue);
-                            if (wrapping)
+                            var chThird = scan.Peek();
+                            if (chThird == ' ' || chThird == '\t')
                             {
-                                value = value.Replace("\r\n", " ");
+                                // special case, "\r\n " or "\r\n\t".
+                                // this is considered wrapping"linear whitespace" and is actually part of the header value
+                                // continue past this for the next
+                                wrapping = true;
+                                continue;
                             }
 
-                            consumed = scan;
-                            requestHeaders.Append(name.Array, name.Offset, name.Count, value);
-                            break;
-                        }
-                        finally
-                        {
-                            memorypool.Return(block);
+                                var name = beginName.GetArraySegment(ref endName, block.Data);
+                                var value = beginValue.GetAsciiString(ref endValue);
+                                if (wrapping)
+                                {
+                                    value = value.Replace("\r\n", " ");
+                                }
+
+                                consumed = scan;
+                                requestHeaders.Append(name.Array, name.Offset, name.Count, value);
+                                break;
                         }
                     }
+                    finally
+                    {
+                        memorypool.Return(block);
+                    }
                 }
                 return false;
             }

src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPool2.cs

@@ -31,12 +31,6 @@ public class MemoryPool2 : IDisposable
         /// </summary>
         private const int _blockLength = _blockStride - _blockUnused;
 
-        /// <summary>
-        /// Max allocation block size for pooled blocks, 
-        /// larger values can be leased but they will be disposed after use rather than returned to the pool.
-        /// </summary>
-        public const int MaxPooledBlockLength = _blockLength;
-
         /// <summary>
         /// Max allocation block size for pooled blocks, 
         /// larger values can be leased but they will be disposed after use rather than returned to the pool.

src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs

@@ -682,7 +682,7 @@ public string GetUtf8String(ref MemoryPoolIterator2 end)
             }
         }
 
-        public ArraySegment<byte> GetArraySegment(MemoryPoolIterator2 end, ArraySegment<byte> scratchBuffer)
+        public ArraySegment<byte> GetArraySegment(ref MemoryPoolIterator2 end, ArraySegment<byte> scratchBuffer)
         {
             if (IsDefault || end.IsDefault)
             {
@@ -693,7 +693,7 @@ public ArraySegment<byte> GetArraySegment(MemoryPoolIterator2 end, ArraySegment<
                 return new ArraySegment<byte>(_block.Array, _index, end._index - _index);
             }
 
-            var length = GetLength(end);
+            var length = GetLength(ref end);
 
             if (length < scratchBuffer.Count)
             {

test/Microsoft.AspNet.Server.KestrelTests/TestInput.cs

@@ -15,10 +15,10 @@ class TestInput : IConnectionControl, IFrameControl, IDisposable
 
         public TestInput()
         {
-            var memory2 = new MemoryPool2();
+            _memory2 = new MemoryPool2();
             FrameContext = new FrameContext
             {
-                SocketInput = new SocketInput(memory2),
+                SocketInput = new SocketInput(_memory2),
                 ConnectionControl = this,
                 FrameControl = this
             };