2010-05-14 Sebastien Pouliot <sebastien@ximian.com>

	* FlashCrossDomainPolicy.cs: Reverse conditions order on secure=true
	since we're currently too severe. Fix DRT668

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

diff --git a/mcs/class/System.Net/System.Net.Policy/ChangeLog b/mcs/class/System.Net/System.Net.Policy/ChangeLog
index 3866d2b4f72ef749e30f7f25c0b57a49dbe89d2c..0be4a73082d13da760dbe124771ee97abc36dbd6 100644 (file)
--- a/mcs/class/System.Net/System.Net.Policy/ChangeLog
+++ b/mcs/class/System.Net/System.Net.Policy/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-14  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * FlashCrossDomainPolicy.cs: Reverse conditions order on secure=true
+       since we're currently too severe. Fix DRT668
+
 2010-04-13  Sebastien Pouliot  <sebastien@ximian.com>
 
        * CrossDomainPolicyManager.cs: Fix previous change since it 

diff --git a/mcs/class/System.Net/System.Net.Policy/FlashCrossDomainPolicy.cs b/mcs/class/System.Net/System.Net.Policy/FlashCrossDomainPolicy.cs
index fd15eeb8ae19e8d33da48ae596b6f30fdb43e504..0ed9107e46756d4e6d67cdc0247596d5d6ffa3f1 100644 (file)
--- a/mcs/class/System.Net/System.Net.Policy/FlashCrossDomainPolicy.cs
+++ b/mcs/class/System.Net/System.Net.Policy/FlashCrossDomainPolicy.cs
@@ -105,9 +105,9 @@ namespace System.Net.Policy {
                                // if Secure is false then it allows applications from HTTP to download data from HTTPS servers
                                if (!Secure)
                                        return true;
-                               // if Secure is true then only application on HTTPS servers can access data on HTTPS servers
-                               if (ApplicationUri.Scheme == Uri.UriSchemeHttps)
-                                       return (uri.Scheme == Uri.UriSchemeHttps);
+                               // if Secure is true then data on HTTPS servers can only be accessed by application on HTTPS servers
+                               if (uri.Scheme == Uri.UriSchemeHttps)
+                                       return (ApplicationUri.Scheme == Uri.UriSchemeHttps);
                                // otherwise FILE/HTTP applications can access HTTP uris
                                return true;
                        }