* NetworkAccess.cs: Only mark as flags enum on 2.0.

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

diff --git a/mcs/class/System/System.Net/DigestClient.cs b/mcs/class/System/System.Net/DigestClient.cs
index 30c84273bd251b6ef444654143005203753313cd..ef7438277218e42d1b9353a98e009f801a8afd77 100644 (file)
--- a/mcs/class/System/System.Net/DigestClient.cs
+++ b/mcs/class/System/System.Net/DigestClient.cs
@@ -61,7 +61,6 @@ namespace System.Net
                int length;
                int pos;
                static string [] keywords = { "realm", "opaque", "nonce", "algorithm", "qop" };
-               static char [] endSeparator = new char[] { '"', ',' };
                string [] values = new string [keywords.Length];
 
                public DigestHeaderParser (string header)
@@ -130,15 +129,6 @@ namespace System.Net
                        pos--;
                }
                
-               void SkipNonWhitespace ()
-               {
-                       char c = 'a';
-                       while (pos < length && c != ' ' && c != '\t' && c != '\r' && c != '\n') {
-                               c = header [pos++];
-                       }
-                       pos--;
-               }
-               
                string GetKey ()
                {
                        SkipWhitespace ();
@@ -301,7 +291,7 @@ namespace System.Net
                {
                        string response = String.Format ("{0}:{1}:", HA1 (username, password), Nonce);
                        if (QOP != null)
-                               response += String.Format ("{0}:{1}:{2}:", _nc.ToString ("x8"), CNonce, QOP);
+                               response += String.Format ("{0}:{1}:{2}:", _nc.ToString ("X8"), CNonce, QOP);
                        response += HA2 (webRequest);
                        return HashToHexString (response);
                }
@@ -339,7 +329,7 @@ namespace System.Net
                        auth.AppendFormat ("response=\"{0}\", ", Response (userName, password, request));
 
                        if (QOP != null) { // quality of protection (server decision)
-                               auth.AppendFormat ("qop={0}, ", QOP);
+                               auth.AppendFormat ("qop=\"{0}\", ", QOP);
                        }
 
                        lock (this) {
@@ -370,21 +360,15 @@ namespace System.Net
        class DigestClient : IAuthenticationModule
        {
 
-               static Hashtable cache;
-
-               public DigestClient () {}
-
+               static readonly Hashtable cache = Hashtable.Synchronized (new Hashtable ());
+               
                static Hashtable Cache {
                        get {
-                               lock (typeof (DigestClient)) {
-                                       if (cache == null) {
-                                               cache = Hashtable.Synchronized (new Hashtable ());
-                                       } else {
-                                               CheckExpired (cache.Count);
-                                       }
-
-                                       return cache;
+                               lock (cache.SyncRoot) {
+                                       CheckExpired (cache.Count);
                                }
+                               
+                               return cache;
                        }
                }