New test.

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels.Http / HttpHelper.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs
index c3bb4e108782b1503874a6289fe0e55d605e6d32..71db924d3a0c6e5c739e0ca469cad38432bd7d79 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpHelper.cs
@@ -12,6 +12,27 @@
 //
 //==========================================================================
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// 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.
+//
+
 
 using System;
 using System.IO;
@@ -52,60 +73,18 @@ namespace System.Runtime.Remoting.Channels.Http
                                return false;
                }
 
-               public static Stream CopyStream(Stream inStream)
+               public static void CopyStream (Stream inStream, Stream outStream)
                {
-                       
-                       Stream outStream = new MemoryStream();
-                       
-                       int  temp;
-                       
-                       try
-                       {
-                               while(true)
-                               {
-                                       temp = inStream.ReadByte();
-                                       if(temp==-1)
-                                               break;
-                                       outStream.WriteByte((byte)temp);
-                               }
-                               outStream.Flush();
-                               outStream.Seek(0,SeekOrigin.Begin);
-                       }
-                       catch(Exception e)
-                       {
-                               Console.WriteLine(e);
-                       }
-                       
-                       return outStream;
-               }
+                       byte[] buffer = new byte [1024];
 
-               public static bool CopyStream(Stream inStream, Stream outStream)
-               {
-                       int  temp;
+                       int nr;
+                       while ((nr = inStream.Read (buffer, 0, buffer.Length)) > 0)
+                               outStream.Write (buffer, 0, nr);
 
-                       try
-                       {
-                               while(true)
-                               {
-                                       temp = inStream.ReadByte();
-                                                                               
-                                       if(temp==-1)
-                                               break;
-                                       outStream.WriteByte((byte)temp);
-                               }
-                               
-                               outStream.Flush();
-                               
-                               if(outStream.CanSeek)
-                                       outStream.Seek(0,SeekOrigin.Begin);
-                       }
-                       catch(Exception e)
-                       {
-                               Console.WriteLine(e);
-                               return false;
-                       }
-                       return true;
-                       
+                       outStream.Flush ();
+
+                       if (outStream.CanSeek)
+                               outStream.Seek (0,SeekOrigin.Begin);
                }
 
                public static String GetHostName()