Revert "Merge branch 'master' of https://github.com/mono/mono"

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

diff --git a/mcs/class/System/System.Net/HttpWebResponse.cs b/mcs/class/System/System.Net/HttpWebResponse.cs
index 79e61a436249dc4f6653567b75d6080e397f4c72..2b756a97bd1e513400a25f64f3484ddc7e40f117 100644 (file)
--- a/mcs/class/System/System.Net/HttpWebResponse.cs
+++ b/mcs/class/System/System.Net/HttpWebResponse.cs
@@ -347,31 +347,22 @@ namespace System.Net
                        if (webHeaders == null)
                                return;
 
-                       //
-                       // Don't terminate response reading on bad cookie value
-                       //
-                       string value;
-                       try {
-                               value = webHeaders.Get ("Set-Cookie");
-                               if (value != null && SetCookie (value))
-                                       return;
-                       } catch {
+                       string value = webHeaders.Get ("Set-Cookie");
+                       if (value != null) {
+                               SetCookie (value);
                        }
 
-                       try {
-                               value = webHeaders.Get ("Set-Cookie2");
-                               if (value != null)
-                                       SetCookie (value);
-                       } catch {
+                       value = webHeaders.Get ("Set-Cookie2");
+                       if (value != null) {
+                               SetCookie (value);
                        }
                }
 
-               bool SetCookie (string header)
+               void SetCookie (string header)
                {
                        if (cookieCollection == null)
                                cookieCollection = new CookieCollection ();
 
-                       bool at_least_one_set = false;
                        var parser = new CookieParser (header);
                        foreach (var cookie in parser.Parse ()) {
                                if (cookie.Domain == "") {
@@ -384,13 +375,9 @@ namespace System.Net
                                        continue;
 
                                cookieCollection.Add (cookie);
-                               if (cookie_container != null) {
+                               if (cookie_container != null)
                                        cookie_container.Add (uri, cookie);
-                                       at_least_one_set = true;
-                               }
                        }
-
-                       return at_least_one_set;
                }
        }       
 }