exceptions propagating incompatible with dotnet. Patch by roeie@mainsoft.com

svn path=/branches/mainsoft/gh1.7/mcs/; revision=57591

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
index e22a71b0bdc2aedeef3ecca585791f7dd1201a10..9070e531e0f3d7f0b6649f3abcfee84548d3f1b1 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-05  Andrew Skiba <andrews@mainsoft.com>
+
+       * HttpClientChannel.cs, HttpServerChannel.cs: exceptions propagating
+       incompatible with dotnet. Patch by roeie@mainsoft.com
+
 2005-11-06  Svetlana Zholkovsky  <svetlanaz@mainsoft.com>
 
     * Add HttpHandlerFactory.jvm.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
index e92b059b435b8b9422ea9ea54fae9aa88efa52dc..f9694e3ebf4926d61022b8415dc9132ed5779fa1 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs
@@ -589,7 +589,8 @@ namespace System.Runtime.Remoting.Channels.Http
                        catch (WebException ex)
                        {
                                httpWebResponse = ex.Response as HttpWebResponse;
-                               if (httpWebResponse == null || httpWebResponse.StatusCode == HttpStatusCode.InternalServerError) throw ex;
+                               if (httpWebResponse == null || httpWebResponse.StatusCode < HttpStatusCode.InternalServerError) 
+                                       throw ex;
                        }
 
                        ReceiveResponse (httpWebResponse, out responseHeaders, out responseStream);

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
index 4419807e33308e8a74b3f83a23ab92a9b70c2fbb..46fda67bc81539a991533eae4aa59248d1e804da 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs
@@ -398,7 +398,7 @@ namespace System.Runtime.Remoting.Channels.Http
                                {
                                        try 
                                        {
-                                               HttpServer.SendResponse (reqArg, 400, null, null);
+                                               HttpServer.SendResponse (reqArg, 500, null, null);
                                        }
                                        catch (Exception e)
                                        {

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
index cad694ba1a46b1ffb1f78a8cb11289128face2c1..02adb514117f1d496bd79fcf8ca33fb96ff141ea 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-05  Andrew Skiba <andrews@mainsoft.com>
+
+       * SoapMessageFormatter.cs: exceptions propagating
+       incompatible with dotnet. Patch by roeie@mainsoft.com
+
 2005-11-05  Robert Jordan  <robertj@gmx.net>
 
        * IAuthorizeRemotingConnection.cs: Added.

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
index e5ec6c3f7c55448c2ccc83b500fbe94a132ebc51..e958e557cdfcb0e354592ebf1feb2af1072e060c 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
@@ -5,27 +5,27 @@
 // Author:     Jean-Marc Andre (jean-marc.andre@polymtl.ca)\r
 //\r
 //\r
-
-//
-// 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.
-//
+\r
+//\r
+// Permission is hereby granted, free of charge, to any person obtaining\r
+// a copy of this software and associated documentation files (the\r
+// "Software"), to deal in the Software without restriction, including\r
+// without limitation the rights to use, copy, modify, merge, publish,\r
+// distribute, sublicense, and/or sell copies of the Software, and to\r
+// permit persons to whom the Software is furnished to do so, subject to\r
+// the following conditions:\r
+// \r
+// The above copyright notice and this permission notice shall be\r
+// included in all copies or substantial portions of the Software.\r
+// \r
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+//\r
 \r
 using System;\r
 using System.Collections;\r
@@ -320,7 +320,7 @@ namespace System.Runtime.Remoting.Channels {
                        }\r
                        else {\r
                                // an Exception was thrown while executing the function\r
-                               responseHeaders["__HttpStatusCode"] = "400";\r
+                               responseHeaders["__HttpStatusCode"] = "500";\r
                                responseHeaders["__HttpReasonPhrase"] = "Bad Request";\r
                                // fill the transport headers\r
                                responseHeaders["Content-Type"] = "text/xml; charset=\"utf-8\"";\r
@@ -459,4 +459,4 @@ namespace System.Runtime.Remoting.Channels {
                        }\r
                }\r
        }\r
-}
+}\r

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/ChangeLog
index cf8e3b99b2427ec9849c7504da64c5857bd2b6a7..6d0dc85c0706fbbf2bf91548964aae6ed58eda05 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/ChangeLog
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-05  Andrew Skiba <andrews@mainsoft.com>
+
+       * SdlChannelSink.cs: exceptions propagating
+       incompatible with dotnet. Patch by roeie@mainsoft.com
+
 2005-11-06  Svetlana Zholkovsky  <svetlanaz@mainsoft.com>
 
     * MetaData.cs: only TARGET_JVM changes

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SdlChannelSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SdlChannelSink.cs
index 53041cdad1915c5a9a18ba1e3c2f12f15231f446..9290e1b053f85d717bab6db43f2a23f9a483a783 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SdlChannelSink.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/SdlChannelSink.cs
@@ -108,7 +108,7 @@ namespace System.Runtime.Remoting.MetadataServices
                                catch (Exception ex)
                                {
                                        responseHeaders = new TransportHeaders ();
-                                       responseHeaders [CommonTransportKeys.HttpStatusCode] = "500";
+                                       responseHeaders [CommonTransportKeys.HttpStatusCode] = "400";
                                        responseStream = new MemoryStream (Encoding.UTF8.GetBytes (ex.ToString ()));
                                }
                                return ServerProcessing.Complete;