Ver código fonte

2009-03-04 Atsushi Enomoto <[email protected]>

	* CrossDomainAccessManager.cs : 2.1 WebRequest misses some
 	  members used here.

	* Makefile : add /r:System.Core in 2.1 build.


svn path=/trunk/mcs/; revision=128579
Atsushi Eno 17 anos atrás
pai
commit
b91e42e4f9

+ 4 - 0
mcs/class/System.ServiceModel/ChangeLog

@@ -1,3 +1,7 @@
+2009-03-04  Astushi Enomoto  <[email protected]>
+
+	* Makefile : add /r:System.Core in 2.1 build.
+
 2009-03-04  Astushi Enomoto  <[email protected]>
 
 	* net_2_1_raw_System.ServiceModel.dll.sources :

+ 1 - 1
mcs/class/System.ServiceModel/Makefile

@@ -30,7 +30,7 @@ LIB_MCS_FLAGS += /d:NET_3_0 	\
 endif
 
 ifeq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += /r:System.Net
+LIB_MCS_FLAGS += /r:System.Net /r:System.Core
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)

+ 5 - 0
mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog

@@ -1,3 +1,8 @@
+2009-03-04  Atsushi Enomoto  <[email protected]>
+
+	* CrossDomainAccessManager.cs : 2.1 WebRequest misses some
+ 	  members used here.
+
 2009-03-04  Atsushi Enomoto  <[email protected]>
 
 	* CrossDomainAccessManager.cs, ClientAccessPolicy.cs,

+ 4 - 4
mcs/class/System.ServiceModel/System.ServiceModel/CrossDomainAccessManager.cs

@@ -81,8 +81,8 @@ namespace System.ServiceModel
 		{
 			var m = new CrossDomainAccessManager (applicationUri);
 
-			var wreq = WebRequest.Create (new Uri (applicationUri, "/clientaccesspolicy.xml"));
-			var wres = (HttpWebResponse) wreq.GetResponse ();
+			var wreq = (HttpWebRequest) WebRequest.Create (new Uri (applicationUri, "/clientaccesspolicy.xml"));
+			var wres = (HttpWebResponse) wreq.EndGetResponse (wreq.BeginGetResponse (null, null));
 			if ((int) wres.StatusCode >= 400)
 				try {
 					using (var xr = XmlReader.Create (wres.GetResponseStream ()))
@@ -95,8 +95,8 @@ namespace System.ServiceModel
 			if (m.Client != null)
 				return m;
 
-			wreq = WebRequest.Create (new Uri (applicationUri, "/crossdomain.xml"));
-			wres = (HttpWebResponse) wreq.GetResponse ();
+			wreq = (HttpWebRequest) WebRequest.Create (new Uri (applicationUri, "/crossdomain.xml"));
+			wres = (HttpWebResponse) wreq.EndGetResponse (wreq.BeginGetResponse (null, null));
 			if ((int) wres.StatusCode >= 400)
 				try {
 					using (var xr = XmlReader.Create (wres.GetResponseStream ()))