Merge pull request #2676 from dotnet-bot/from-tfs

Merge changes from TFS

Author: stephentoub

src/System.Net.Http/src/System/Net/Http/ByteArrayContent.cs

@@ -23,6 +23,10 @@ public ByteArrayContent(byte[] content)
             _content = content;
             _offset = 0;
             _count = content.Length;
+            
+#if NETNative
+            SetBuffer(_content, _offset, _count);
+#endif
         }
 
         public ByteArrayContent(byte[] content, int offset, int count)
@@ -43,6 +47,10 @@ public ByteArrayContent(byte[] content, int offset, int count)
             _content = content;
             _offset = offset;
             _count = count;
+            
+#if NETNative
+            SetBuffer(_content, _offset, _count);
+#endif
         }
 
         protected override Task SerializeToStreamAsync(Stream stream, TransportContext context)

src/System.Net.Http/src/System/Net/Http/HttpContent.cs

@@ -52,6 +52,23 @@ private bool IsBuffered
             get { return _bufferedContent != null; }
         }
 
+#if NETNative        
+        internal void SetBuffer(byte[] buffer, int offset, int count)
+        {
+            _bufferedContent = new MemoryStream(buffer, offset, count, false, true);
+        }
+        
+        internal bool TryGetBuffer(out ArraySegment<byte> buffer)
+        {
+            if (_bufferedContent == null)
+            {
+                return false;
+            }
+            
+            return _bufferedContent.TryGetBuffer(out buffer);
+        }
+#endif
+     
         protected HttpContent()
         {
             // Log to get an ID for the current content. This ID is used when the content gets associated to a message.