From 007e9c3169664c1b8cc96827f0b06626fc7af8b9 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Fri, 22 Oct 2004 14:12:44 +0000 Subject: [PATCH] * HttpClientChannel.cs: In CreateMessageSink, process the remote channel data if the provided url does not have the expected format. This fixes a regression from the fix for bug #66768 and fixes #68669. svn path=/trunk/mcs/; revision=35242 --- .../System.Runtime.Remoting.Channels.Http/ChangeLog | 6 ++++++ .../HttpClientChannel.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 42d8b6eb326..1790bfb7bdb 100644 --- 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,9 @@ +2004-10-22 Lluis Sanchez Gual + + * HttpClientChannel.cs: In CreateMessageSink, process the remote channel + data if the provided url does not have the expected format. This fixes + a regression from the fix for bug #66768 and fixes #68669. + 2004-09-27 Lluis Sanchez Gual * HttpClientChannel.cs: Throw an http exception if the response is a 500, 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 6526b9542a2..6225b1e4de2 100644 --- 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 @@ -145,7 +145,7 @@ namespace System.Runtime.Remoting.Channels.Http public virtual IMessageSink CreateMessageSink(String url, Object remoteChannelData, out String objectURI) { - if (url == null && remoteChannelData != null && remoteChannelData as IChannelDataStore != null ) + if ((url == null || !HttpHelper.StartsWithHttp (url)) && remoteChannelData != null && remoteChannelData as IChannelDataStore != null ) { IChannelDataStore ds = (IChannelDataStore) remoteChannelData; url = ds.ChannelUris[0]; -- 2.25.1