2010-04-06 Atsushi Enomoto <atsushi@ximian.com>

	* HttpReplyChannel.cs : fill To header only if it does not exist.

svn path=/trunk/mcs/; revision=154826

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 0fde4d42b14cdaf122349e9f55074e6de191e381..cd3e77a98cdc44c0cae83da57440af06848f7991 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-06  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * HttpReplyChannel.cs : fill To header only if it does not exist.
+
 2010-04-06  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SecureMessageGenerator.cs : set ReplyTo and To, do not add.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpReplyChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpReplyChannel.cs
index 41968d02a1fd7b07e9b7c21c26e8f1920f72af41..ea71a327937993ac7bd69a8420120dc894259750 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpReplyChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpReplyChannel.cs
@@ -151,16 +151,14 @@ namespace System.ServiceModel.Channels
                        } else if (ctx.Request.HttpMethod == "GET") {
                                msg = Message.CreateMessage (MessageVersion, null);
                        }
-                       msg.Headers.To = ctx.Request.Url;
+                       if (msg.Headers.To == null)
+                               msg.Headers.To = ctx.Request.Url;
                        msg.Properties.Add ("Via", LocalAddress.Uri);
                        msg.Properties.Add (HttpRequestMessageProperty.Name, CreateRequestProperty (ctx.Request.HttpMethod, ctx.Request.Url.Query, ctx.Request.Headers));
 /*
 MessageBuffer buf = msg.CreateBufferedCopy (0x10000);
 msg = buf.CreateMessage ();
-System.Xml.XmlTextWriter w = new System.Xml.XmlTextWriter (Console.Out);
-w.Formatting = System.Xml.Formatting.Indented;
-buf.CreateMessage ().WriteMessage (w);
-w.Close ();
+Console.WriteLine (buf.CreateMessage ());
 */
                        context = new HttpRequestContext (this, msg, ctx);
                        reqctx = context;