Merge pull request #4569 from lambdageek/dev-coop-handles-march

[mono.git] / mcs / class / System / System.Net / ChunkedInputStream.cs

diff --git a/mcs/class/System/System.Net/ChunkedInputStream.cs b/mcs/class/System/System.Net/ChunkedInputStream.cs
index 2ee49937e54a6c5018da298828ae9f0378e4d52d..5a46e510525ae070f3136244492bad3ddb487be7 100644 (file)
--- a/mcs/class/System/System.Net/ChunkedInputStream.cs
+++ b/mcs/class/System/System.Net/ChunkedInputStream.cs
@@ -24,7 +24,10 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#if NET_2_0
+
+#if SECURITY_DEP
+
+using System.IO;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
 namespace System.Net {
@@ -51,9 +54,9 @@ namespace System.Net {
                        }
                }
 
-               public ChunkedInputStream (HttpListenerContext context, Socket sock,
+               public ChunkedInputStream (HttpListenerContext context, Stream stream,
                                                byte [] buffer, int offset, int length)
-                                       : base (sock, buffer, offset, length)
+                                       : base (stream, buffer, offset, length)
                {
                        this.context = context;
                        WebHeaderCollection coll = (WebHeaderCollection) context.Request.Headers;
@@ -156,7 +159,7 @@ namespace System.Net {
                                ares.AsyncWaitHandle.WaitOne ();
 
                        if (my_ares.Error != null)
-                               throw new HttpListenerException (400, "I/O operation aborted.");
+                               throw new HttpListenerException (400, "I/O operation aborted: " + my_ares.Error.Message);
 
                        return my_ares.Count;
                }