217393 2020-10-06 10:36:55 -0700 REGRESSION: [Mac Release] 2 Cookie API are failing 2020-10-09 15:14:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tsavell achristensen achristensen cdumez webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1695208 0 tsavell 2020-10-06 10:36:55 -0700 TestWebKitAPI.WebKit.CookieCacheSyncAcrossProcess /Volumes/Data/slave/catalina-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/CookiePrivateBrowsing.mm:110 Expected equality of these values: "foo=bar" (NSString *)cookie Which is: "" /Volumes/Data/slave/catalina-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/CookiePrivateBrowsing.mm:130 Expected equality of these values: "foo=bar" cookieString Which is: "" TestWebKitAPI.WebKit.RelaxThirdPartyCookieBlocking /Volumes/Data/slave/catalina-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:232 Value of: strstr(request.data(), "Cookie: a=b\r\n") Actual: false Expected: true /Volumes/Data/slave/catalina-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:232 Value of: strstr(request.data(), "Cookie: a=b\r\n") Actual: false Expected: true /Volumes/Data/slave/catalina-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:232 Value of: strstr(request.data(), "Cookie: a=b\r\n") Actual: false Expected: true 1695209 1 webkit-bug-importer 2020-10-06 10:37:16 -0700 <rdar://problem/70006475> 1696266 2 410950 achristensen 2020-10-09 10:46:28 -0700 Created attachment 410950 Patch 1696273 3 410952 achristensen 2020-10-09 11:06:23 -0700 Created attachment 410952 Patch 1696282 4 410952 cdumez 2020-10-09 11:28:05 -0700 Comment on attachment 410952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410952&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/CookiePrivateBrowsing.mm:81 > + [[WKWebsiteDataStore defaultDataStore].httpCookieStore _setCookieAcceptPolicy:static_cast<NSHTTPCookieAcceptPolicy>(NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain) completionHandler:^{ This test does not use the default data store at all. It uses an ephemeral session so why does setting the default data store cookie policy help? Doesn't this indicate a WebKit bug of some sort? 1696294 5 410952 achristensen 2020-10-09 12:01:24 -0700 Comment on attachment 410952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410952&action=review >> Tools/TestWebKitAPI/Tests/WebKitCocoa/CookiePrivateBrowsing.mm:81 >> + [[WKWebsiteDataStore defaultDataStore].httpCookieStore _setCookieAcceptPolicy:static_cast<NSHTTPCookieAcceptPolicy>(NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain) completionHandler:^{ > > This test does not use the default data store at all. It uses an ephemeral session so why does setting the default data store cookie policy help? Doesn't this indicate a WebKit bug of some sort? CFNetwork ephemeral cookie stores inherit their initial cookie accept policy from the default store. 1696312 6 410964 achristensen 2020-10-09 12:31:22 -0700 Created attachment 410964 Patch 1696349 7 ews-feeder 2020-10-09 13:53:55 -0700 Committed r268286: <https://trac.webkit.org/changeset/268286> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410964. 1696375 8 achristensen 2020-10-09 15:14:43 -0700 https://results.webkit.org/?suite=api-tests&test=TestWebKitAPI.WebKit.CookieCacheSyncAcrossProcess https://results.webkit.org/?suite=api-tests&test=TestWebKitAPI.WebKit.RelaxThirdPartyCookieBlocking Seems to have fixed it. Hooray! 410950 2020-10-09 10:46:28 -0700 2020-10-09 11:15:49 -0700 Patch bug-217393-20201009104627.patch text/plain 4247 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODI2OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTEwLTA5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogW01hYyBSZWxlYXNlXSAyIENvb2tpZSBB UEkgYXJlIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNzM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmIGJhZCB0aGluZ3MgaGFwcGVuIHdoZW4gcnVubmluZyBBUEkgdGVzdHMsIHRoZSBU ZXN0V2ViS2l0QVBJIGRlZmF1bHQgY29va2llIHN0b3JhZ2UgY2FuIGdldCBzdHVjayB3aXRoCisg ICAgICAgIGEgY29va2llIGFjY2VwdCBwb2xpY3kgb2YgbmV2ZXIsIHdoaWNoIGNhdXNlcyBmdXR1 cmUgdGVzdHMgdG8gZmFpbC4gIEFsbCBleGlzdGluZyB0ZXN0cyByZXN0b3JlIHRoZSBjb29raWUK KyAgICAgICAgYWNjZXB0IHBvbGljeSB0byB3aGF0IGl0IHdhcyBiZWZvcmUgdGhlIHRlc3Qgc3Rh cnRlZCwgYnV0IG9uY2UgYSBtYWNoaW5lIGdldHMgaW50byBhIGJhZCBzdGF0ZSwgdGhlcmUncyBu b3RoaW5nCisgICAgICAgIHRvIHJlc2V0IGl0IHRvIHRoZSBkZWZhdWx0IHN0YXRlLiAgU29tZSBv ZiBvdXIgdGVzdCBib3RzIGhhdmUgZ290dGVuIGludG8gdGhpcyBiYWQgc3RhdGUsIGNhdXNpbmcg MiBjb29raWUgQVBJCisgICAgICAgIHRlc3RzIHRvIGZhaWwuICBUbyBmaXggdGhpcywgc2V0IHRo ZSBjb29raWUgYWNjZXB0IHBvbGljeSB0byBpdHMgZGVmYXVsdCB2YWx1ZSBiZWZvcmUgcnVubmlu ZyB0aGVzZSB0d28gdGVzdHMuCisgICAgICAgIEkgdmVyaWZpZWQgdGhpcyB3b3JrcyBieSBnZXR0 aW5nIG15IGNvbXB1dGVyIGludG8gdGhpcyBiYWQgc3RhdGUsIHZlcmlmeWluZyByZXBlYXRlZCBB UEkgdGVzdCBydW5zIGRvbid0IGZpeCBpdCwKKyAgICAgICAgYW5kIHZlcmlmaWVkIHRoaXMgYnJp bmdzIHRoZSBjb21wdXRlciBiYWNrIGludG8gYSBnb29kIHN0YXRlIGFuZCBjYXVzZXMgdGhlIEFQ SSB0ZXN0cyB0byBwYXNzIGFnYWluLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW06CisgICAgICAgIChURVNUKToKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1tOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMTAtMDkgIEthdGUgQ2hlbmV5ICA8a2F0 aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvbW90ZSBXS1dlYlZpZXcgbWVk aWEgcGxheWJhY2sgU1BJIHRvIEFQSQpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW0J KHJldmlzaW9uIDI2ODI2MCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvQ29va2llUHJpdmF0ZUJyb3dzaW5nLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMCArMjgs MTIgQEAKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJUZXN0LmgiCiAj aW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCisjaW1wb3J0IDxXZWJLaXQvV0tIVFRQQ29va2llU3Rv cmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tQcm9jZXNzUG9vbC5oPgogI2ltcG9ydCA8 V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3 Lmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oPgorI2ltcG9ydCA8 cGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNp bXBvcnQgPHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlTnVtYmVycy5oPgogI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CkBAIC03NSw2ICs3NywxMiBAQCBURVNUKFdlYktpdCwgQ29va2ll UHJpdmF0ZUJyb3dzaW5nKQogCiBURVNUKFdlYktpdCwgQ29va2llQ2FjaGVTeW5jQWNyb3NzUHJv Y2VzcykKIHsKKyAgICBfX2Jsb2NrIGJvb2wgc2V0RGVmYXVsdENvb2tpZUFjY2VwdFBvbGljeSA9 IGZhbHNlOworICAgIFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdLmh0dHBD b29raWVTdG9yZSBfc2V0Q29va2llQWNjZXB0UG9saWN5Ok5TSFRUUENvb2tpZUFjY2VwdFBvbGlj eUV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbiBjb21wbGV0aW9uSGFuZGxlcjpeewor ICAgICAgICBzZXREZWZhdWx0Q29va2llQWNjZXB0UG9saWN5ID0gdHJ1ZTsKKyAgICB9XTsKKyAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnNldERlZmF1bHRDb29raWVBY2NlcHRQb2xpY3kp OworCiAgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gYWxsb2NdIGluaXRdKTsKICAgICBbY29uZmlndXJhdGlvbiBzZXRXZWJzaXRlRGF0YVN0 b3JlOltXS1dlYnNpdGVEYXRhU3RvcmUgbm9uUGVyc2lzdGVudERhdGFTdG9yZV1dOwogICAgIGF1 dG8gdmlldzEgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO U01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0 KCldKTsKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJveHku bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Q cm94eS5tbQkocmV2aXNpb24gMjY4MjYwKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Qcm94eS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzIsOSArMzIsMTEgQEAKICNp bXBvcnQgIlRlc3RVSURlbGVnYXRlLmgiCiAjaW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1w b3J0ICJVdGlsaXRpZXMuaCIKKyNpbXBvcnQgPFdlYktpdC9XS0hUVFBDb29raWVTdG9yZVByaXZh dGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg+CiAjaW1w b3J0IDxXZWJLaXQvV2ViS2l0Lmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLV2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb24uaD4KKyNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmg+CiAj aW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdDb25jYXRl bmF0ZU51bWJlcnMuaD4KIApAQCAtMTg3LDYgKzE4OSwxMiBAQCBuYW1lc3BhY2UgVGVzdFdlYktp dEFQSSB7CiAKIFRFU1QoV2ViS2l0LCBSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykKIHsK KyAgICBfX2Jsb2NrIGJvb2wgc2V0RGVmYXVsdENvb2tpZUFjY2VwdFBvbGljeSA9IGZhbHNlOwor ICAgIFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdLmh0dHBDb29raWVTdG9y ZSBfc2V0Q29va2llQWNjZXB0UG9saWN5Ok5TSFRUUENvb2tpZUFjY2VwdFBvbGljeUV4Y2x1c2l2 ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbiBjb21wbGV0aW9uSGFuZGxlcjpeeworICAgICAgICBz ZXREZWZhdWx0Q29va2llQWNjZXB0UG9saWN5ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBVdGlsOjpy dW4oJnNldERlZmF1bHRDb29raWVBY2NlcHRQb2xpY3kpOworCiAgICAgYXV0byBydW5UZXN0ID0g W10gKGJvb2wgc2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2llQmxvY2tpbmcpIHsKICAgICAgICAg SFRUUFNlcnZlciBzZXJ2ZXIoW2Nvbm5lY3Rpb25Db3VudCA9IDAsIHNob3VsZFJlbGF4VGhpcmRQ YXJ0eUNvb2tpZUJsb2NraW5nXSAoQ29ubmVjdGlvbiBjb25uZWN0aW9uKSBtdXRhYmxlIHsKICAg ICAgICAgICAgICsrY29ubmVjdGlvbkNvdW50Owo= 410952 2020-10-09 11:06:23 -0700 2020-10-09 12:31:20 -0700 Patch bug-217393-20201009110623.patch text/plain 4325 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODI2OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTEwLTA5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogW01hYyBSZWxlYXNlXSAyIENvb2tpZSBB UEkgYXJlIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNzM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmIGJhZCB0aGluZ3MgaGFwcGVuIHdoZW4gcnVubmluZyBBUEkgdGVzdHMsIHRoZSBU ZXN0V2ViS2l0QVBJIGRlZmF1bHQgY29va2llIHN0b3JhZ2UgY2FuIGdldCBzdHVjayB3aXRoCisg ICAgICAgIGEgY29va2llIGFjY2VwdCBwb2xpY3kgb2YgbmV2ZXIsIHdoaWNoIGNhdXNlcyBmdXR1 cmUgdGVzdHMgdG8gZmFpbC4gIEFsbCBleGlzdGluZyB0ZXN0cyByZXN0b3JlIHRoZSBjb29raWUK KyAgICAgICAgYWNjZXB0IHBvbGljeSB0byB3aGF0IGl0IHdhcyBiZWZvcmUgdGhlIHRlc3Qgc3Rh cnRlZCwgYnV0IG9uY2UgYSBtYWNoaW5lIGdldHMgaW50byBhIGJhZCBzdGF0ZSwgdGhlcmUncyBu b3RoaW5nCisgICAgICAgIHRvIHJlc2V0IGl0IHRvIHRoZSBkZWZhdWx0IHN0YXRlLiAgU29tZSBv ZiBvdXIgdGVzdCBib3RzIGhhdmUgZ290dGVuIGludG8gdGhpcyBiYWQgc3RhdGUsIGNhdXNpbmcg MiBjb29raWUgQVBJCisgICAgICAgIHRlc3RzIHRvIGZhaWwuICBUbyBmaXggdGhpcywgc2V0IHRo ZSBjb29raWUgYWNjZXB0IHBvbGljeSB0byBpdHMgZGVmYXVsdCB2YWx1ZSBiZWZvcmUgcnVubmlu ZyB0aGVzZSB0d28gdGVzdHMuCisgICAgICAgIEkgdmVyaWZpZWQgdGhpcyB3b3JrcyBieSBnZXR0 aW5nIG15IGNvbXB1dGVyIGludG8gdGhpcyBiYWQgc3RhdGUsIHZlcmlmeWluZyByZXBlYXRlZCBB UEkgdGVzdCBydW5zIGRvbid0IGZpeCBpdCwKKyAgICAgICAgYW5kIHZlcmlmaWVkIHRoaXMgYnJp bmdzIHRoZSBjb21wdXRlciBiYWNrIGludG8gYSBnb29kIHN0YXRlIGFuZCBjYXVzZXMgdGhlIEFQ SSB0ZXN0cyB0byBwYXNzIGFnYWluLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW06CisgICAgICAgIChURVNUKToKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1tOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMTAtMDkgIEthdGUgQ2hlbmV5ICA8a2F0 aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvbW90ZSBXS1dlYlZpZXcgbWVk aWEgcGxheWJhY2sgU1BJIHRvIEFQSQpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW0J KHJldmlzaW9uIDI2ODI2OCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvQ29va2llUHJpdmF0ZUJyb3dzaW5nLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMCArMjgs MTIgQEAKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJUZXN0LmgiCiAj aW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCisjaW1wb3J0IDxXZWJLaXQvV0tIVFRQQ29va2llU3Rv cmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tQcm9jZXNzUG9vbC5oPgogI2ltcG9ydCA8 V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3 Lmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oPgorI2ltcG9ydCA8 cGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNp bXBvcnQgPHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlTnVtYmVycy5oPgogI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CkBAIC03NSw2ICs3NywxMiBAQCBURVNUKFdlYktpdCwgQ29va2ll UHJpdmF0ZUJyb3dzaW5nKQogCiBURVNUKFdlYktpdCwgQ29va2llQ2FjaGVTeW5jQWNyb3NzUHJv Y2VzcykKIHsKKyAgICBfX2Jsb2NrIGJvb2wgc2V0RGVmYXVsdENvb2tpZUFjY2VwdFBvbGljeSA9 IGZhbHNlOworICAgIFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdLmh0dHBD b29raWVTdG9yZSBfc2V0Q29va2llQWNjZXB0UG9saWN5OnN0YXRpY19jYXN0PE5TSFRUUENvb2tp ZUFjY2VwdFBvbGljeT4oTlNIVFRQQ29va2llQWNjZXB0UG9saWN5RXhjbHVzaXZlbHlGcm9tTWFp bkRvY3VtZW50RG9tYWluKSBjb21wbGV0aW9uSGFuZGxlcjpeeworICAgICAgICBzZXREZWZhdWx0 Q29va2llQWNjZXB0UG9saWN5ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJnNldERlZmF1bHRDb29raWVBY2NlcHRQb2xpY3kpOworCiAgICAgYXV0byBjb25m aWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKICAgICBbY29uZmlndXJhdGlvbiBzZXRXZWJzaXRlRGF0YVN0b3JlOltXS1dlYnNpdGVEYXRh U3RvcmUgbm9uUGVyc2lzdGVudERhdGFTdG9yZV1dOwogICAgIGF1dG8gdmlldzEgPSBhZG9wdE5T KFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgw MCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKSW5kZXg6IFRvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJveHkubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm94eS5tbQkocmV2aXNpb24g MjY4MjY4KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm94eS5t bQkod29ya2luZyBjb3B5KQpAQCAtMzIsOSArMzIsMTEgQEAKICNpbXBvcnQgIlRlc3RVSURlbGVn YXRlLmgiCiAjaW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1wb3J0ICJVdGlsaXRpZXMuaCIK KyNpbXBvcnQgPFdlYktpdC9XS0hUVFBDb29raWVTdG9yZVByaXZhdGUuaD4KICNpbXBvcnQgPFdl YktpdC9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViS2l0 Lmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaD4K KyNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWlu UHRyLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdDb25jYXRlbmF0ZU51bWJlcnMuaD4KIApA QCAtMTg3LDYgKzE4OSwxMiBAQCBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7CiAKIFRFU1QoV2Vi S2l0LCBSZWxheFRoaXJkUGFydHlDb29raWVCbG9ja2luZykKIHsKKyAgICBfX2Jsb2NrIGJvb2wg c2V0RGVmYXVsdENvb2tpZUFjY2VwdFBvbGljeSA9IGZhbHNlOworICAgIFtbV0tXZWJzaXRlRGF0 YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdLmh0dHBDb29raWVTdG9yZSBfc2V0Q29va2llQWNjZXB0 UG9saWN5OnN0YXRpY19jYXN0PE5TSFRUUENvb2tpZUFjY2VwdFBvbGljeT4oTlNIVFRQQ29va2ll QWNjZXB0UG9saWN5RXhjbHVzaXZlbHlGcm9tTWFpbkRvY3VtZW50RG9tYWluKSBjb21wbGV0aW9u SGFuZGxlcjpeeworICAgICAgICBzZXREZWZhdWx0Q29va2llQWNjZXB0UG9saWN5ID0gdHJ1ZTsK KyAgICB9XTsKKyAgICBVdGlsOjpydW4oJnNldERlZmF1bHRDb29raWVBY2NlcHRQb2xpY3kpOwor CiAgICAgYXV0byBydW5UZXN0ID0gW10gKGJvb2wgc2hvdWxkUmVsYXhUaGlyZFBhcnR5Q29va2ll QmxvY2tpbmcpIHsKICAgICAgICAgSFRUUFNlcnZlciBzZXJ2ZXIoW2Nvbm5lY3Rpb25Db3VudCA9 IDAsIHNob3VsZFJlbGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nXSAoQ29ubmVjdGlvbiBjb25u ZWN0aW9uKSBtdXRhYmxlIHsKICAgICAgICAgICAgICsrY29ubmVjdGlvbkNvdW50Owo= 410964 2020-10-09 12:31:22 -0700 2020-10-09 13:53:55 -0700 Patch bug-217393-20201009123121.patch text/plain 4233 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODI3MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTEwLTA5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogW01hYyBSZWxlYXNlXSAyIENvb2tpZSBB UEkgYXJlIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNzM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmIGJhZCB0aGluZ3MgaGFwcGVuIHdoZW4gcnVubmluZyBBUEkgdGVzdHMsIHRoZSBU ZXN0V2ViS2l0QVBJIGRlZmF1bHQgY29va2llIHN0b3JhZ2UgY2FuIGdldCBzdHVjayB3aXRoCisg ICAgICAgIGEgY29va2llIGFjY2VwdCBwb2xpY3kgb2YgbmV2ZXIsIHdoaWNoIGNhdXNlcyBmdXR1 cmUgdGVzdHMgdG8gZmFpbC4gIEFsbCBleGlzdGluZyB0ZXN0cyByZXN0b3JlIHRoZSBjb29raWUK KyAgICAgICAgYWNjZXB0IHBvbGljeSB0byB3aGF0IGl0IHdhcyBiZWZvcmUgdGhlIHRlc3Qgc3Rh cnRlZCwgYnV0IG9uY2UgYSBtYWNoaW5lIGdldHMgaW50byBhIGJhZCBzdGF0ZSwgdGhlcmUncyBu b3RoaW5nCisgICAgICAgIHRvIHJlc2V0IGl0IHRvIHRoZSBkZWZhdWx0IHN0YXRlLiAgU29tZSBv ZiBvdXIgdGVzdCBib3RzIGhhdmUgZ290dGVuIGludG8gdGhpcyBiYWQgc3RhdGUsIGNhdXNpbmcg MiBjb29raWUgQVBJCisgICAgICAgIHRlc3RzIHRvIGZhaWwuICBUbyBmaXggdGhpcywgc2V0IHRo ZSBjb29raWUgYWNjZXB0IHBvbGljeSB0byBpdHMgZGVmYXVsdCB2YWx1ZSBiZWZvcmUgcnVubmlu ZyB0aGVzZSB0d28gdGVzdHMuCisgICAgICAgIEkgdmVyaWZpZWQgdGhpcyB3b3JrcyBieSBnZXR0 aW5nIG15IGNvbXB1dGVyIGludG8gdGhpcyBiYWQgc3RhdGUsIHZlcmlmeWluZyByZXBlYXRlZCBB UEkgdGVzdCBydW5zIGRvbid0IGZpeCBpdCwKKyAgICAgICAgYW5kIHZlcmlmaWVkIHRoaXMgYnJp bmdzIHRoZSBjb21wdXRlciBiYWNrIGludG8gYSBnb29kIHN0YXRlIGFuZCBjYXVzZXMgdGhlIEFQ SSB0ZXN0cyB0byBwYXNzIGFnYWluLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW06CisgICAgICAgIChURVNUKToKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1tOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMTAtMDkgIEthdGUgQ2hlbmV5ICA8a2F0 aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvbW90ZSBXS1dlYlZpZXcgbWVk aWEgcGxheWJhY2sgU1BJIHRvIEFQSQpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db29raWVQcml2YXRlQnJvd3NpbmcubW0J KHJldmlzaW9uIDI2ODI3MykKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvQ29va2llUHJpdmF0ZUJyb3dzaW5nLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMCArMjgs MTIgQEAKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJUZXN0LmgiCiAj aW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCisjaW1wb3J0IDxXZWJLaXQvV0tIVFRQQ29va2llU3Rv cmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tQcm9jZXNzUG9vbC5oPgogI2ltcG9ydCA8 V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3 Lmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oPgorI2ltcG9ydCA8 cGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNp bXBvcnQgPHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlTnVtYmVycy5oPgogI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CkBAIC03NSw2ICs3NywxMiBAQCBURVNUKFdlYktpdCwgQ29va2ll UHJpdmF0ZUJyb3dzaW5nKQogCiBURVNUKFdlYktpdCwgQ29va2llQ2FjaGVTeW5jQWNyb3NzUHJv Y2VzcykKIHsKKyAgICBfX2Jsb2NrIGJvb2wgc2V0RGVmYXVsdENvb2tpZUFjY2VwdFBvbGljeSA9 IGZhbHNlOworICAgIFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdLmh0dHBD b29raWVTdG9yZSBfc2V0Q29va2llQWNjZXB0UG9saWN5Ok5TSFRUUENvb2tpZUFjY2VwdFBvbGlj eU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluIGNvbXBsZXRpb25IYW5kbGVyOl57CisgICAgICAg IHNldERlZmF1bHRDb29raWVBY2NlcHRQb2xpY3kgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmc2V0RGVmYXVsdENvb2tpZUFjY2VwdFBvbGljeSk7CisKICAg ICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOwogICAgIFtjb25maWd1cmF0aW9uIHNldFdlYnNpdGVEYXRhU3RvcmU6W1dL V2Vic2l0ZURhdGFTdG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3JlXV07CiAgICAgYXV0byB2aWV3 MSA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJl Y3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwpJ bmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm94eS5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1t CShyZXZpc2lvbiAyNjgyNzMpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Byb3h5Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw5ICszMiwxMSBAQAogI2ltcG9ydCAi VGVzdFVJRGVsZWdhdGUuaCIKICNpbXBvcnQgIlRlc3RXS1dlYlZpZXcuaCIKICNpbXBvcnQgIlV0 aWxpdGllcy5oIgorI2ltcG9ydCA8V2ViS2l0L1dLSFRUUENvb2tpZVN0b3JlUHJpdmF0ZS5oPgog I2ltcG9ydCA8V2ViS2l0L1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaD4KICNpbXBvcnQgPFdl YktpdC9XZWJLaXQuaD4KICNpbXBvcnQgPFdlYktpdC9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmln dXJhdGlvbi5oPgorI2ltcG9ydCA8cGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaD4KICNpbXBvcnQg PHd0Zi9SZXRhaW5QdHIuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlTnVt YmVycy5oPgogCkBAIC0xODcsNiArMTg5LDEyIEBAIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsK IAogVEVTVChXZWJLaXQsIFJlbGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nKQogeworICAgIF9f YmxvY2sgYm9vbCBzZXREZWZhdWx0Q29va2llQWNjZXB0UG9saWN5ID0gZmFsc2U7CisgICAgW1tX S1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0uaHR0cENvb2tpZVN0b3JlIF9zZXRD b29raWVBY2NlcHRQb2xpY3k6TlNIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9j dW1lbnREb21haW4gY29tcGxldGlvbkhhbmRsZXI6XnsKKyAgICAgICAgc2V0RGVmYXVsdENvb2tp ZUFjY2VwdFBvbGljeSA9IHRydWU7CisgICAgfV07CisgICAgVXRpbDo6cnVuKCZzZXREZWZhdWx0 Q29va2llQWNjZXB0UG9saWN5KTsKKwogICAgIGF1dG8gcnVuVGVzdCA9IFtdIChib29sIHNob3Vs ZFJlbGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nKSB7CiAgICAgICAgIEhUVFBTZXJ2ZXIgc2Vy dmVyKFtjb25uZWN0aW9uQ291bnQgPSAwLCBzaG91bGRSZWxheFRoaXJkUGFydHlDb29raWVCbG9j a2luZ10gKENvbm5lY3Rpb24gY29ubmVjdGlvbikgbXV0YWJsZSB7CiAgICAgICAgICAgICArK2Nv bm5lY3Rpb25Db3VudDsK