Attachment 339843 Details for Bug 185434 – ROLLOUT of r231491

[patch] ROLLOUT of r231491

bug-185434-20180508142249.patch (text/plain), 5.64 KB, created by WebKit Commit Bot on 2018-05-08 11:22:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-05-08 11:22:50 PDT

Size: 5.64 KB

patch

obsolete

>Subversion Revision: 231494
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a326d412092674f54172d97dec0dd66823d92c6c..71e47340938696adafefd5983344b57a9e0639f5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-08  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r231491.
>+        https://bugs.webkit.org/show_bug.cgi?id=185434
>+
>+        Setting the Created key on a cookie does not work yet, due a
>+        bug in CFNetwork (Requested by ggaren on #webkit).
>+
>+        Reverted changeset:
>+
>+        "[WKHTTPCookieStore getAllCookies] returns inconsistent
>+        creation time"
>+        https://bugs.webkit.org/show_bug.cgi?id=185041
>+        https://trac.webkit.org/changeset/231491
>+
> 2018-05-08  Sihui Liu  <sihui_liu@apple.com>
> 
>         [WKHTTPCookieStore getAllCookies] returns inconsistent creation time
>diff --git a/Source/WebCore/platform/network/cocoa/CookieCocoa.mm b/Source/WebCore/platform/network/cocoa/CookieCocoa.mm
>index 1b69e7b35094cba7992f50c9258a221788101b5c..575579dbbbdc3a104f9f461a14cb8380fa9c6abd 100644
>--- a/Source/WebCore/platform/network/cocoa/CookieCocoa.mm
>+++ b/Source/WebCore/platform/network/cocoa/CookieCocoa.mm
>@@ -82,7 +82,7 @@ Cookie::operator NSHTTPCookie *() const
>     if (isNull())
>         return nil;
> 
>-    NSMutableDictionary *properties = [NSMutableDictionary dictionaryWithCapacity:13];
>+    NSMutableDictionary *properties = [NSMutableDictionary dictionaryWithCapacity:12];
> 
>     if (!comment.isNull())
>         [properties setObject:(NSString *)comment forKey:NSHTTPCookieComment];
>@@ -106,8 +106,6 @@ Cookie::operator NSHTTPCookie *() const
>     auto maxAge = ceil([expirationDate timeIntervalSinceNow]);
>     if (maxAge > 0)
>         [properties setObject:[NSString stringWithFormat:@"%f", maxAge] forKey:NSHTTPCookieMaximumAge];
>-    
>-    [properties setObject:[NSNumber numberWithDouble:created / 1000.0] forKey:@"Created"];
> 
>     auto* portString = portStringFromVector(ports);
>     if (portString)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f6ca41869b08a7b4a5f30ecdbede5e46e828b746..eccdf8ac8420aa47d6b6017dcc61dd46f81d7a0f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-08  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r231491.
>+        https://bugs.webkit.org/show_bug.cgi?id=185434
>+
>+        Setting the Created key on a cookie does not work yet, due a
>+        bug in CFNetwork (Requested by ggaren on #webkit).
>+
>+        Reverted changeset:
>+
>+        "[WKHTTPCookieStore getAllCookies] returns inconsistent
>+        creation time"
>+        https://bugs.webkit.org/show_bug.cgi?id=185041
>+        https://trac.webkit.org/changeset/231491
>+
> 2018-05-08  Valerie R Young  <valerie@bocoup.com>
> 
>         test262/Runner.pm: move input files to JSTests/test262
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>index 48350f641d3d0ec17d47ecdafc6dc23532dbad16..9d5d7ecd6dc2a4719cd7d49fcc0a254ecd619798 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>@@ -33,7 +33,6 @@
> #import <WebKit/WKWebsiteDataStorePrivate.h>
> #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
> #import <wtf/RetainPtr.h>
>-#import <wtf/Seconds.h>
> 
> #if WK_API_ENABLED
> 
>@@ -311,59 +310,6 @@ TEST(WebKit, WKHTTPCookieStoreHttpOnly)
>     [cookies release];
> }
> 
>-TEST(WebKit, WKHTTPCookieStoreCreationTime) 
>-{   
>-    WKWebsiteDataStore* dataStore = [WKWebsiteDataStore defaultDataStore];
>-
>-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
>-    configuration.get().websiteDataStore = dataStore;
>-    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
>-
>-    [webView loadHTMLString:@"WebKit Test" baseURL:[NSURL URLWithString:@"http://webkit.org"]];
>-    [webView _test_waitForDidFinishNavigation];
>-
>-    [dataStore removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:[] {
>-        gotFlag = true;
>-    }];
>-    TestWebKitAPI::Util::run(&gotFlag);
>-    gotFlag = false;
>-
>-    globalCookieStore = dataStore.httpCookieStore;
>-
>-    RetainPtr<NSHTTPCookie> cookie = [NSHTTPCookie cookieWithProperties:@{
>-        NSHTTPCookiePath: @"/path",
>-        NSHTTPCookieName: @"CookieName",
>-        NSHTTPCookieValue: @"CookieValue",
>-        NSHTTPCookieDomain: @".www.webkit.org",
>-    }];
>-
>-    [globalCookieStore setCookie:cookie.get() completionHandler:[]() {
>-        gotFlag = true;
>-    }];
>-    TestWebKitAPI::Util::run(&gotFlag);
>-    gotFlag = false;
>-
>-    RetainPtr<NSNumber> creationTime = nil;
>-    [globalCookieStore getAllCookies:[&](NSArray<NSHTTPCookie *> *cookies) {
>-        ASSERT_EQ(1u, cookies.count);
>-        creationTime = [cookies objectAtIndex:0].properties[@"Created"];
>-        gotFlag = true;
>-    }];
>-    TestWebKitAPI::Util::run(&gotFlag);
>-    gotFlag = false;
>-
>-    sleep(1_s);
>-
>-    [globalCookieStore getAllCookies:^(NSArray<NSHTTPCookie *> *cookies) {
>-        ASSERT_EQ(1u, cookies.count);
>-        NSNumber* creationTime2 = [cookies objectAtIndex:0].properties[@"Created"];
>-        EXPECT_TRUE([creationTime.get() isEqual:creationTime2]);
>-        gotFlag = true;
>-    }];
>-    TestWebKitAPI::Util::run(&gotFlag);
>-    gotFlag = false;
>-}
>-
> // FIXME: This should be removed once <rdar://problem/35344202> is resolved and bots are updated.
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED <= 110102)
> TEST(WebKit, WKHTTPCookieStoreNonPersistent)

Actions: View | Formatted Diff | Diff

Attachments on bug 185434: 339843