[System.Net.Http] Return ContentLength of the buffer when content is loaded into...

diff --git a/mcs/class/System.Net.Http/System.Net.Http.Headers/HttpContentHeaders.cs b/mcs/class/System.Net.Http/System.Net.Http.Headers/HttpContentHeaders.cs
index 57bda06b90c3cf431083d388615753634f1a3866..802d479541d6677ad2a785a341b70e6f36ae1b12 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http.Headers/HttpContentHeaders.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http.Headers/HttpContentHeaders.cs
@@ -73,6 +73,10 @@ namespace System.Net.Http.Headers
                                if (v != null)
                                        return v;
 
+                               v = content.LoadedBufferLength;
+                               if (v != null)
+                                       return v;
+
                                long l;
                                if (content.TryComputeLength (out l))
                                        return l;

diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpContent.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpContent.cs
index 021f2e9b0d9f8edac15ac185d2ccff6c6091090c..77419d28cd4e904648dda1f9c67f7abce7ceba6c 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpContent.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpContent.cs
@@ -75,6 +75,12 @@ namespace System.Net.Http
                        }
                }
 
+               internal long? LoadedBufferLength {
+                       get {
+                               return buffer == null ? (long?)null : buffer.Length;
+                       }
+               }
+
                public Task CopyToAsync (Stream stream)
                {
                        return CopyToAsync (stream, null);

diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs
index 413e459526e155331dd378ae912f78f61e99554e..3835eff66d5dc382557075dfae3efaf3f3d14d14 100644 (file)
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs
@@ -90,6 +90,20 @@ namespace MonoTests.System.Net.Http
                        }
                }
 
+               class CannotSeekStream : MemoryStream
+               {
+                       public CannotSeekStream ()
+                               : base (new byte [11])
+                       {
+                       }
+
+                       public override bool CanSeek {
+                               get {
+                                       return false;
+                               }
+                       }
+               }
+
                [Test]
                public void Ctor_Invalid ()
                {
@@ -407,5 +421,13 @@ namespace MonoTests.System.Net.Http
                        Assert.AreEqual (0, stream_read.Position, "#3");        
                        Assert.AreEqual (1, stream_read.Length, "#4");
                }
+
+               [Test]
+               public void ContentLengthAfterLoad ()
+               {
+                       var sc = new StreamContent (new CannotSeekStream ());
+                       Assert.IsTrue (sc.LoadIntoBufferAsync ().Wait (3000), "#1");
+                       Assert.AreEqual (11, sc.Headers.ContentLength, "#2");
+               }
        }
 }