Author: miguel
Date: 2005-04-27 16:54:42 -0400 (Wed, 27 Apr 2005)
New Revision: 43686

Modified:
   
branches/mono-1-1-6/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.de.resources.prebuilt
   
branches/mono-1-1-6/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.en.resources.prebuilt
   
branches/mono-1-1-6/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.resources.prebuilt
   branches/mono-1-1-6/mcs/class/System/System.Net/CookieCollection.cs
   branches/mono-1-1-6/mcs/class/System/System.Net/CookieContainer.cs
   branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebRequest.cs
   branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebResponse.cs
Log:
other bits in 1.1.6 that were not commited

Modified: 
branches/mono-1-1-6/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.de.resources.prebuilt
===================================================================
(Binary files differ)

Modified: 
branches/mono-1-1-6/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.en.resources.prebuilt
===================================================================
(Binary files differ)

Modified: 
branches/mono-1-1-6/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.resources.prebuilt
===================================================================
(Binary files differ)

Modified: branches/mono-1-1-6/mcs/class/System/System.Net/CookieCollection.cs
===================================================================
--- branches/mono-1-1-6/mcs/class/System/System.Net/CookieCollection.cs 
2005-04-27 20:33:50 UTC (rev 43685)
+++ branches/mono-1-1-6/mcs/class/System/System.Net/CookieCollection.cs 
2005-04-27 20:54:42 UTC (rev 43686)
@@ -82,7 +82,7 @@
                        int pos = SearchCookie (cookie);
                        if (pos == -1)
                                list.Add (cookie);
-                       else 
+                       else
                                list [pos] = cookie;
                }
 
@@ -94,6 +94,9 @@
 
                        for (int i = list.Count - 1; i >= 0; i--) {
                                Cookie c = (Cookie) list [i];
+                               if (c.Version != cookie.Version)
+                                       continue;
+
                                if (0 != String.Compare (domain, c.Domain, 
true, CultureInfo.InvariantCulture))
                                        continue;
 

Modified: branches/mono-1-1-6/mcs/class/System/System.Net/CookieContainer.cs
===================================================================
--- branches/mono-1-1-6/mcs/class/System/System.Net/CookieContainer.cs  
2005-04-27 20:33:50 UTC (rev 43685)
+++ branches/mono-1-1-6/mcs/class/System/System.Net/CookieContainer.cs  
2005-04-27 20:54:42 UTC (rev 43686)
@@ -140,7 +140,7 @@
                                        throw new CookieException ("Capacity 
exceeded");
 
                                cookies.Add (cookie);
-                               count++;
+                               count = cookies.Count;
                        }
                }
 
@@ -265,7 +265,7 @@
                                                        continue;
 
                                                if (path [path.Length - 1] != 
'/' && uripath.Length > path.Length &&
-                                                   path [path.Length] != '/')
+                                                   uripath [path.Length] != 
'/')
                                                        continue;
                                        }
                                }

Modified: branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebRequest.cs
===================================================================
--- branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebRequest.cs   
2005-04-27 20:33:50 UTC (rev 43685)
+++ branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebRequest.cs   
2005-04-27 20:54:42 UTC (rev 43686)
@@ -1023,7 +1023,7 @@
 
                        WebException wexc = null;
                        try {
-                               webResponse = new HttpWebResponse (actualUri, 
method, data, (cookieContainer != null));
+                               webResponse = new HttpWebResponse (actualUri, 
method, data, cookieContainer);
                                haveResponse = true;
                        } catch (Exception e) {
                                wexc = new WebException (e.Message, e, 
WebExceptionStatus.ProtocolError, null); 

Modified: branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebResponse.cs
===================================================================
--- branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebResponse.cs  
2005-04-27 20:33:50 UTC (rev 43685)
+++ branches/mono-1-1-6/mcs/class/System/System.Net/HttpWebResponse.cs  
2005-04-27 20:54:42 UTC (rev 43686)
@@ -52,13 +52,14 @@
                string statusDescription;
                long contentLength = -1;
                string contentType;
+               CookieContainer cookieContainer;
 
                bool disposed = false;
                Stream stream;
                
                // Constructors
                
-               internal HttpWebResponse (Uri uri, string method, 
WebConnectionData data, bool cookiesSet)
+               internal HttpWebResponse (Uri uri, string method, 
WebConnectionData data, CookieContainer container)
                {
                        this.uri = uri;
                        this.method = method;
@@ -67,7 +68,8 @@
                        statusCode = (HttpStatusCode) data.StatusCode;
                        statusDescription = data.StatusDescription;
                        stream = data.stream;
-                       if (cookiesSet) {
+                       if (container != null) {
+                               this.cookieContainer = container;
                                FillCookies ();
                        } else if (webHeaders != null) {
                                webHeaders.RemoveInternal ("Set-Cookie");
@@ -408,6 +410,8 @@
                                cookie.Domain = uri.Host;
 
                        cookieCollection.Add (cookie);
+                       if (cookieContainer != null)
+                               cookieContainer.Add (uri, cookie);
                }
 
                void SetCookie2 (string cookies_str)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to