Merge pull request #472 from MelanieT/spmanager_fix

[mono.git] / mcs / class / System / System.Net / WebConnectionGroup.cs

diff --git a/mcs/class/System/System.Net/WebConnectionGroup.cs b/mcs/class/System/System.Net/WebConnectionGroup.cs
index 96bc94f79aa1de3657ca36e4e07975c129fd76f0..ee17b99816641e96697ed91b7c2396e8def5aa5c 100644 (file)
--- a/mcs/class/System/System.Net/WebConnectionGroup.cs
+++ b/mcs/class/System/System.Net/WebConnectionGroup.cs
@@ -5,6 +5,7 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2003 Ximian, Inc (http://www.ximian.com)
+// Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
 //
 
 //
@@ -51,6 +52,26 @@ namespace System.Net
                        queue = new Queue ();
                }
 
+               public void Close ()
+               {
+                       //TODO: what do we do with the queue? Empty it out and abort the requests?
+                       //TODO: abort requests or wait for them to finish
+                       lock (connections) {
+                               WeakReference cncRef = null;
+
+                               int end = connections.Count;
+                               // ArrayList removed = null;
+                               for (int i = 0; i < end; i++) {
+                                       cncRef = (WeakReference) connections [i];
+                                       WebConnection cnc = cncRef.Target as WebConnection;
+                                       if (cnc != null) {
+                                               cnc.Close (false);
+                                       }
+                               }
+                               connections.Clear ();
+                       }
+               }
+
                public WebConnection GetConnection (HttpWebRequest request)
                {
                        WebConnection cnc = null;
@@ -89,18 +110,22 @@ namespace System.Net
 
                        bool needs_reset = false;
                        NetworkCredential cnc_cred = cnc.NtlmCredential;
-                       NetworkCredential req_cred = request.Credentials.GetCredential (request.RequestUri, "NTLM");
-                       if (cnc_cred.Domain != req_cred.Domain || cnc_cred.UserName != req_cred.UserName ||
+
+                       bool isProxy = (request.Proxy != null && !request.Proxy.IsBypassed (request.RequestUri));
+                       ICredentials req_icreds = (!isProxy) ? request.Credentials : request.Proxy.Credentials;
+                       NetworkCredential req_cred = (req_icreds != null) ? req_icreds.GetCredential (request.RequestUri, "NTLM") : null;
+
+                       if (cnc_cred == null || req_cred == null ||
+                               cnc_cred.Domain != req_cred.Domain || cnc_cred.UserName != req_cred.UserName ||
                                cnc_cred.Password != req_cred.Password) {
                                needs_reset = true;
                        }
-#if NET_1_1
+
                        if (!needs_reset) {
                                bool req_sharing = request.UnsafeAuthenticatedConnectionSharing;
                                bool cnc_sharing = cnc.UnsafeAuthenticatedConnectionSharing;
                                needs_reset = (req_sharing == false || req_sharing != cnc_sharing);
                        }
-#endif
                        if (needs_reset) {
                                cnc.Close (false); // closes the authenticated connection
                                cnc.ResetNtlm ();
@@ -140,7 +165,7 @@ namespace System.Net
                        if (rnd == null)
                                rnd = new Random ();
 
-                       int idx = (count > 1) ? rnd.Next (0, count - 1) : 0;
+                       int idx = (count > 1) ? rnd.Next (0, count) : 0;
                        cncRef = (WeakReference) connections [idx];
                        cnc = cncRef.Target as WebConnection;
                        if (cnc == null) {