206601 2020-01-22 11:23:55 -0800 Delete the ITP storage file that is not being used (plist or database file) when switching to a new storage type 2020-02-04 13:09:55 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney achristensen bfulgham cdumez commit-queue conrad_shultz webkit-bug-importer wilander oldest_to_newest 1609637 0 katherine_cheney 2020-01-22 11:23:55 -0800 Whichever storage mechanism is enabled, the other persistent file should be deleted (either the plist or the db file). 1609638 1 katherine_cheney 2020-01-22 11:24:31 -0800 rdar://problem/58696521 1609653 2 388450 katherine_cheney 2020-01-22 11:32:33 -0800 Created attachment 388450 Patch 1610838 3 388450 achristensen 2020-01-24 13:28:59 -0800 Comment on attachment 388450 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388450&action=review > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:167 > + auto persistentStorageFilePath = FileSystem::pathByAppendingComponent(resourceLoadStatisticsDirectory, "full_browsing_session_resourceLog.plist"); Let's name this variable "legacyPlistFilePath" to indicate that it is something we are migrating from and intent to remove support for in the future. 1610953 4 388750 katherine_cheney 2020-01-24 17:41:27 -0800 Created attachment 388750 Patch 1610954 5 katherine_cheney 2020-01-24 17:41:56 -0800 This was causing API test failures, I had to make some changes to the tests in this patch. Alex, I thought you might want to take another look before confirming r+. 1611487 6 388750 commit-queue 2020-01-27 11:16:28 -0800 Comment on attachment 388750 Patch Clearing flags on attachment: 388750 Committed r255156: <https://trac.webkit.org/changeset/255156> 1611488 7 commit-queue 2020-01-27 11:16:30 -0800 All reviewed patches have been landed. Closing bug. 1611489 8 webkit-bug-importer 2020-01-27 11:17:17 -0800 <rdar://problem/58926444> 1614687 9 388750 conrad_shultz 2020-02-04 13:09:55 -0800 Comment on attachment 388750 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388750&action=review > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:168 > + if (FileSystem::fileExists(legacyPlistFilePath)) It's generally an anti-pattern to check for file-existence. Can we just attempt deletion and handle failure as needed? > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:178 > + if (FileSystem::fileExists(databaseStorageFilePath)) { Ditto. 388450 2020-01-22 11:32:33 -0800 2020-01-24 17:41:26 -0800 Patch bug-206601-20200122113232.patch text/plain 3280 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRkMzU1ZTc4MDExOGE5ODgx ZjA5YmVlNTRhZTY1ZTM0ZTk3ZTU1MjYuLmIxZDE0MTczMWY2YWYxMmM3NmVhOTk1MGI0NDU1ZWE5 MGQzMjQ5Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDEtMjIgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRGVsZXRlIHRoZSBJ VFAgc3RvcmFnZSBmaWxlIHRoYXQgaXMgbm90IGJlaW5nIHVzZWQgKHBsaXN0IG9yIGRhdGFiYXNl IGZpbGUpIHdoZW4gc3dpdGNoaW5nIHRvIGEgbmV3IHN0b3JhZ2UgdHlwZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2NjAxCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS81ODY5NjUyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gZGVsZXRlcyB0aGUgdGVtcG9yYXJ5IGZpbGVz IFNRTGl0ZSBjcmVhdGVzIHdoZW4KKyAgICAgICAgY29uc3RydWN0aW5nIGEgbmV3IGRhdGFiYXNl LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSk6CisKIDIwMjAtMDEt MjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbSVBDIEhhcmRl bmluZ10gT25seSBwcm9jZXNzIE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2VzcyBtZXNzYWdlcyB3aGVu IHNlbnQgYnkgdGhlIFVJUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmNwcAppbmRleCA3MWFlYzNjOWEwYWRkNDYzM2NkN2M0MWJlNjRiOTA2NGZm MDFmN2JiLi4zYWUxOTBlZTU4OTAyYTkwZTc5OGVkNGI2YWExZDU2ZWI3NmViNWVkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtMTYzLDkg KzE2MywyMyBAQCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZShOZXR3b3JrU2Vzc2lvbiYgbgogCiAgICAgICAgICAgICBhdXRvIG1l bW9yeVN0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU+ KCp0aGlzLCBtX3N0YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5jbHVkZUxvY2FsaG9zdCk7CiAgICAg ICAgICAgICBkb3duY2FzdDxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZT4oKm1f c3RhdGlzdGljc1N0b3JlLmdldCgpKS5wb3B1bGF0ZUZyb21NZW1vcnlTdG9yZSgqbWVtb3J5U3Rv cmUpOworICAgICAgICAgICAgCisgICAgICAgICAgICBhdXRvIHBlcnNpc3RlbnRTdG9yYWdlRmls ZVBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQocmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RpcmVjdG9yeSwgImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbl9yZXNvdXJjZUxvZy5w bGlzdCIpOworICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMocGVyc2lzdGVu dFN0b3JhZ2VGaWxlUGF0aCkpCisgICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmls ZShwZXJzaXN0ZW50U3RvcmFnZUZpbGVQYXRoKTsKKwogICAgICAgICB9IGVsc2UgewogICAgICAg ICAgICAgbV9zdGF0aXN0aWNzU3RvcmUgPSBtYWtlVW5pcXVlPFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NNZW1vcnlTdG9yZT4oKnRoaXMsIG1fc3RhdGlzdGljc1F1ZXVlLCBzaG91bGRJbmNsdWRlTG9j YWxob3N0KTsKICAgICAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UgPSBtYWtlVW5pcXVlPFJl c291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZT4oZG93bmNhc3Q8UmVzb3VyY2VM b2FkU3RhdGlzdGljc01lbW9yeVN0b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUpLCBtX3N0YXRpc3Rp Y3NRdWV1ZSwgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSk7CisKKyAgICAgICAgICAg IGF1dG8gZGF0YWJhc2VTdG9yYWdlRmlsZVBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRp bmdDb21wb25lbnQocmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSwgIm9ic2VydmF0aW9u cy5kYiIpOworICAgICAgICAgICAgYXV0byBkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlXYWxGaWxl UGF0aCA9IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGlyZWN0b3J5LCAib2JzZXJ2YXRpb25zLmRiLXdhbCIpOworICAgICAgICAgICAg YXV0byBkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlTaG1GaWxlUGF0aCA9IEZpbGVTeXN0ZW06OnBh dGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCAi b2JzZXJ2YXRpb25zLmRiLXNobSIpOworICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVF eGlzdHMoZGF0YWJhc2VTdG9yYWdlRmlsZVBhdGgpKSB7CisgICAgICAgICAgICAgICAgRmlsZVN5 c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VGaWxlUGF0aCk7CisgICAgICAgICAgICAg ICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlXYWxGaWxl UGF0aCk7CisgICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0 b3JhZ2VUZW1wb3JhcnlTaG1GaWxlUGF0aCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAog ICAgICAgICAvLyBGSVhNRSgxOTMyOTcpOiBUaGlzIHNob3VsZCBiZSByZXZpc2VkIGFmdGVyIHRo ZSBVSVByb2Nlc3MgdmVyc2lvbiBnb2VzIGF3YXkuCg== 388750 2020-01-24 17:41:27 -0800 2020-01-27 11:16:28 -0800 Patch bug-206601-20200124174127.patch text/plain 9282 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc1NmFlY2U3OTFiOGVjMjAx OGFhNjQ5ZjM4ZWUyMWMzYmViYjBiNTQuLjA3MjI2ZWYwMTRkZjc1YjBkZDIxYWJmMmUyYzM3MTY1 YjEzNDI1NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDEtMjQgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRGVsZXRlIHRoZSBJ VFAgc3RvcmFnZSBmaWxlIHRoYXQgaXMgbm90IGJlaW5nIHVzZWQgKHBsaXN0IG9yIGRhdGFiYXNl IGZpbGUpIHdoZW4gc3dpdGNoaW5nIHRvIGEgbmV3IHN0b3JhZ2UgdHlwZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2NjAxCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS81ODY5NjUyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gZGVsZXRlcyB0aGUgdGVtcG9yYXJ5IGZpbGVz IFNRTGl0ZSBjcmVhdGVzIHdoZW4KKyAgICAgICAgY29uc3RydWN0aW5nIGEgbmV3IGRhdGFiYXNl LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSk6CisKIDIwMjAtMDEt MjMgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2Nv YV0gQnJva2VyIGFjY2VzcyB0byB0aGUgUG93ZXJNYW5hZ2VtZW50IEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCA3MWFlYzNjOWEwYWRk NDYzM2NkN2M0MWJlNjRiOTA2NGZmMDFmN2JiLi5jNjY5OWZmZWEyMTkwNWYxZDJlZTlkZTQ1MzE4 MGZhODUyZjhhMzk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcApAQCAtMTYzLDkgKzE2MywyMyBAQCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZShOZXR3b3JrU2Vzc2lvbiYgbgog CiAgICAgICAgICAgICBhdXRvIG1lbW9yeVN0b3JlID0gbWFrZVVuaXF1ZTxSZXNvdXJjZUxvYWRT dGF0aXN0aWNzTWVtb3J5U3RvcmU+KCp0aGlzLCBtX3N0YXRpc3RpY3NRdWV1ZSwgc2hvdWxkSW5j bHVkZUxvY2FsaG9zdCk7CiAgICAgICAgICAgICBkb3duY2FzdDxSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGF0YWJhc2VTdG9yZT4oKm1fc3RhdGlzdGljc1N0b3JlLmdldCgpKS5wb3B1bGF0ZUZyb21N ZW1vcnlTdG9yZSgqbWVtb3J5U3RvcmUpOworCisgICAgICAgICAgICBhdXRvIGxlZ2FjeVBsaXN0 RmlsZVBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQocmVzb3VyY2VM b2FkU3RhdGlzdGljc0RpcmVjdG9yeSwgImZ1bGxfYnJvd3Npbmdfc2Vzc2lvbl9yZXNvdXJjZUxv Zy5wbGlzdCIpOworICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobGVnYWN5 UGxpc3RGaWxlUGF0aCkpCisgICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShs ZWdhY3lQbGlzdEZpbGVQYXRoKTsKKwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV9z dGF0aXN0aWNzU3RvcmUgPSBtYWtlVW5pcXVlPFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlT dG9yZT4oKnRoaXMsIG1fc3RhdGlzdGljc1F1ZXVlLCBzaG91bGRJbmNsdWRlTG9jYWxob3N0KTsK ICAgICAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UgPSBtYWtlVW5pcXVlPFJlc291cmNlTG9h ZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3RvcmFnZT4oZG93bmNhc3Q8UmVzb3VyY2VMb2FkU3RhdGlz dGljc01lbW9yeVN0b3JlPigqbV9zdGF0aXN0aWNzU3RvcmUpLCBtX3N0YXRpc3RpY3NRdWV1ZSwg cmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSk7CisKKyAgICAgICAgICAgIGF1dG8gZGF0 YWJhc2VTdG9yYWdlRmlsZVBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25l bnQocmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSwgIm9ic2VydmF0aW9ucy5kYiIpOwor ICAgICAgICAgICAgYXV0byBkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlXYWxGaWxlUGF0aCA9IEZp bGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGlyZWN0b3J5LCAib2JzZXJ2YXRpb25zLmRiLXdhbCIpOworICAgICAgICAgICAgYXV0byBkYXRh YmFzZVN0b3JhZ2VUZW1wb3JhcnlTaG1GaWxlUGF0aCA9IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVu ZGluZ0NvbXBvbmVudChyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5LCAib2JzZXJ2YXRp b25zLmRiLXNobSIpOworICAgICAgICAgICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMoZGF0 YWJhc2VTdG9yYWdlRmlsZVBhdGgpKSB7CisgICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6ZGVs ZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VGaWxlUGF0aCk7CisgICAgICAgICAgICAgICAgRmlsZVN5 c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VUZW1wb3JhcnlXYWxGaWxlUGF0aCk7Cisg ICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShkYXRhYmFzZVN0b3JhZ2VUZW1w b3JhcnlTaG1GaWxlUGF0aCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICAv LyBGSVhNRSgxOTMyOTcpOiBUaGlzIHNob3VsZCBiZSByZXZpc2VkIGFmdGVyIHRoZSBVSVByb2Nl c3MgdmVyc2lvbiBnb2VzIGF3YXkuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggMWZkYzI2MzFmNTRmZDliZDk5MDkxZTcyMmFkZDNkYTUzMDhiNGRm Yy4uZDBlNWYwNzkyOWY5YzMyMjY2ZDk5Y2Q1NDUyODYwMTI1YzEwODYxNCAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisy MDIwLTAxLTI0ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisg ICAgICAgIERlbGV0ZSB0aGUgSVRQIHN0b3JhZ2UgZmlsZSB0aGF0IGlzIG5vdCBiZWluZyB1c2Vk IChwbGlzdCBvciBkYXRhYmFzZSBmaWxlKSB3aGVuIHN3aXRjaGluZyB0byBhIG5ldyBzdG9yYWdl IHR5cGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw NjYwMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTg2OTY1MjE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjYXVzZWQgc29tZSBB UEkgdGVzdHMgdG8gZmFpbCB3aGljaCByZWxpZWQgb24gdGhlIElUUCBmaWxlcworICAgICAgICBh bHdheXMgZXhpc3RpbmcuIE5vdyB0aGUgdGVzdHMgZW5zdXJlIHRoZSByZXNwZWN0aXZlIGZpbGUg ZXhpc3RzIHdoZW4gCisgICAgICAgIHN3aXRjaGluZyBiZXR3ZWVuIGluLW1lbW9yeSBhbmQgZGF0 YWJhc2Ugc3RvcmFnZSBiZWZvcmUgcnVubmluZyB0aGUgdGVzdHMuCisKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW06Cisg ICAgICAgIChlbnN1cmVJVFBGaWxlSXNDcmVhdGVkKToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIw LTAxLTIzICBUdW9tYXMgS2Fya2thaW5lbiAgPHR1b21hcy53ZWJraXRAYXBwbGUuY29tPgogCiAg ICAgICAgIEFkZCBtaXNzaW5nIGNvdmVyYWdlLnhjY29uZmlnCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW0g Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MubW0KaW5kZXggYmMzMzQ5ZjYyNDE4ZGEwMjY4NWM5OGY4NjA1N2NiY2Q2MzZmNTFiMS4u YzI4Zjc1YWQ2NTY1NGMyYWMxNTM3M2RmNDYzMzVjYThiYmY5YzA3ZiAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VM b2FkU3RhdGlzdGljcy5tbQpAQCAtODIsNiArODIsMjAgQEAgYm9vbCBpc0lUUERhdGFiYXNlRW5h YmxlZCgpCiAgICAgcmV0dXJuIGRlZmF1bHREYXRhYmFzZUVuYWJsZWQ7CiB9CiAKK3N0YXRpYyB2 b2lkIGVuc3VyZUlUUEZpbGVJc0NyZWF0ZWQoKQoreworICAgIHN0YXRpYyBib29sIGRvbmVGbGFn OworICAgIGF1dG8gKmRhdGFTdG9yZSA9IFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFT dG9yZV07CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV0pOworICAgIFtkYXRhU3RvcmUg X3NldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkOllFU107CisgICAgW3dlYlZpZXcgbG9h ZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmlu ZzpAImFib3V0OmJsYW5rIl1dXTsKKyAgICBbZGF0YVN0b3JlIF9zZXRVc2VJVFBEYXRhYmFzZTp0 cnVlIGNvbXBsZXRpb25IYW5kbGVyOiBeKHZvaWQpIHsKKyAgICAgICAgZG9uZUZsYWcgPSB0cnVl OworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZUZsYWcpOworICAg IFtkYXRhU3RvcmUgX3NldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkOk5PXTsKK30KKwog VEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBHcmFuZGZhdGhlckNhbGxiYWNrKQogewogICAg IGF1dG8gKmRhdGFTdG9yZSA9IFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV07 CkBAIC0yODYsNiArMzAwLDExIEBAIFRFU1QoUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgU2hvdWxk Tm90R3JhbmRmYXRoZXJPblN0YXJ0dXApCiAgICAgICAgICAgICBjYWxsYmFja0ZsYWcgPSB0cnVl OwogICAgICAgICB9XTsKIAorICAgICAgICAvLyBTaW5jZSB0aGUgSVRQIERhdGFiYXNlIGlzIGVu YWJsZWQsIHRoZSBwbGlzdCBmaWxlIGhhcyBiZWVuIGRlbGV0ZWQuIFdlIG5lZWQgdG8gY3JlYXRl IGl0IGFnYWluLgorICAgICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNyZWF0 ZURpcmVjdG9yeUF0VVJMOnN0YXRpc3RpY3NEaXJlY3RvcnlVUkwgd2l0aEludGVybWVkaWF0ZURp cmVjdG9yaWVzOllFUyBhdHRyaWJ1dGVzOm5pbCBlcnJvcjpuaWxdOworICAgICAgICBbW05TRmls ZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNvcHlJdGVtQXRVUkw6dGVzdFJlc291cmNlVVJMIHRv VVJMOnRhcmdldFVSTCBlcnJvcjpuaWxdOworICAgICAgICBFWFBFQ1RfVFJVRShbW05TRmlsZU1h bmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6dGFyZ2V0VVJMLnBhdGhdKTsK KwogICAgICAgICBbZGF0YVN0b3JlIF9zZXRVc2VJVFBEYXRhYmFzZTpmYWxzZSBjb21wbGV0aW9u SGFuZGxlcjogXih2b2lkKSB7CiAgICAgICAgICAgICBkb25lRmxhZyA9IHRydWU7CiAgICAgICAg IH1dOwpAQCAtMzAwLDE0ICszMTksNyBAQCBURVNUKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsIFNo b3VsZE5vdEdyYW5kZmF0aGVyT25TdGFydHVwRGF0YWJhc2UpCiB7CiAgICAgYXV0byAqZGF0YVN0 b3JlID0gW1dLV2Vic2l0ZURhdGFTdG9yZSBkZWZhdWx0RGF0YVN0b3JlXTsKIAotICAgIE5TVVJM ICpzdGF0aXN0aWNzRGlyZWN0b3J5VVJMID0gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpbQCJ+L0xp YnJhcnkvV2ViS2l0L1Rlc3RXZWJLaXRBUEkvV2Vic2l0ZURhdGEvUmVzb3VyY2VMb2FkU3RhdGlz dGljcyIgc3RyaW5nQnlFeHBhbmRpbmdUaWxkZUluUGF0aF0gaXNEaXJlY3Rvcnk6WUVTXTsKLSAg ICBOU1VSTCAqdGFyZ2V0VVJMID0gW3N0YXRpc3RpY3NEaXJlY3RvcnlVUkwgVVJMQnlBcHBlbmRp bmdQYXRoQ29tcG9uZW50OkAib2JzZXJ2YXRpb25zLmRiIl07Ci0gICAgTlNVUkwgKnRlc3RSZXNv dXJjZVVSTCA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJFbXB0eUdy YW5kZmF0aGVyZWRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIiB3aXRoRXh0ZW5zaW9uOkAicGxpc3Qi IHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl07Ci0KLSAgICBbW05TRmls ZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNyZWF0ZURpcmVjdG9yeUF0VVJMOnN0YXRpc3RpY3NE aXJlY3RvcnlVUkwgd2l0aEludGVybWVkaWF0ZURpcmVjdG9yaWVzOllFUyBhdHRyaWJ1dGVzOm5p bCBlcnJvcjpuaWxdOwotICAgIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY29weUl0 ZW1BdFVSTDp0ZXN0UmVzb3VyY2VVUkwgdG9VUkw6dGFyZ2V0VVJMIGVycm9yOm5pbF07Ci0KLSAg ICBFWFBFQ1RfVFJVRShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNB dFBhdGg6dGFyZ2V0VVJMLnBhdGhdKTsKKyAgICBlbnN1cmVJVFBGaWxlSXNDcmVhdGVkKCk7CiAK ICAgICBzdGF0aWMgYm9vbCBjYWxsYmFja0ZsYWc7CiAgICAgc3RhdGljIGJvb2wgZG9uZUZsYWc7 CkBAIC0zMzYsNiArMzQ4LDggQEAgVEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBTaG91bGRO b3RHcmFuZGZhdGhlck9uU3RhcnR1cERhdGFiYXNlKQogICAgICAgICAgICAgY2FsbGJhY2tGbGFn ID0gdHJ1ZTsKICAgICAgICAgfV07CiAKKyAgICAgICAgZW5zdXJlSVRQRmlsZUlzQ3JlYXRlZCgp OworCiAgICAgICAgIFtkYXRhU3RvcmUgX3NldFVzZUlUUERhdGFiYXNlOnRydWUgY29tcGxldGlv bkhhbmRsZXI6IF4odm9pZCkgewogICAgICAgICAgICAgZG9uZUZsYWcgPSB0cnVlOwogICAgICAg ICB9XTsKQEAgLTM5MCw2ICs0MDQsMTEgQEAgVEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBD aGlsZFByb2Nlc3Nlc05vdExhdW5jaGVkKQogICAgICAgICAgICAgY2FsbGJhY2tGbGFnID0gdHJ1 ZTsKICAgICAgICAgfV07CiAKKyAgICAgICAgLy8gU2luY2UgdGhlIElUUCBEYXRhYmFzZSBpcyBl bmFibGVkLCB0aGUgcGxpc3QgZmlsZSBoYXMgYmVlbiBkZWxldGVkLiBXZSBuZWVkIHRvIGNyZWF0 ZSBpdCBhZ2Fpbi4KKyAgICAgICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBjcmVh dGVEaXJlY3RvcnlBdFVSTDpzdGF0aXN0aWNzRGlyZWN0b3J5VVJMIHdpdGhJbnRlcm1lZGlhdGVE aXJlY3RvcmllczpZRVMgYXR0cmlidXRlczpuaWwgZXJyb3I6bmlsXTsKKyAgICAgICAgW1tOU0Zp bGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBjb3B5SXRlbUF0VVJMOnRlc3RSZXNvdXJjZVVSTCB0 b1VSTDp0YXJnZXRVUkwgZXJyb3I6bmlsXTsKKyAgICAgICAgRVhQRUNUX1RSVUUoW1tOU0ZpbGVN YW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOnRhcmdldFVSTC5wYXRoXSk7 CisKICAgICAgICAgW2RhdGFTdG9yZSBfc2V0VXNlSVRQRGF0YWJhc2U6ZmFsc2UgY29tcGxldGlv bkhhbmRsZXI6IF4odm9pZCkgewogICAgICAgICAgICAgZG9uZUZsYWcgPSB0cnVlOwogICAgICAg ICB9XTsKQEAgLTQxOCwxMiArNDM3LDcgQEAgVEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBD aGlsZFByb2Nlc3Nlc05vdExhdW5jaGVkRGF0YWJhc2UpCiAgICAgTlNVUkwgKnN0YXRpc3RpY3NE aXJlY3RvcnlVUkwgPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOltAIn4vTGlicmFyeS9XZWJLaXQv VGVzdFdlYktpdEFQSS9XZWJzaXRlRGF0YS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzIiBzdHJpbmdC eUV4cGFuZGluZ1RpbGRlSW5QYXRoXSBpc0RpcmVjdG9yeTpZRVNdOwogICAgIE5TVVJMICp0YXJn ZXRVUkwgPSBbc3RhdGlzdGljc0RpcmVjdG9yeVVSTCBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25l bnQ6QCJvYnNlcnZhdGlvbnMuZGIiXTsKIAotICAgIE5TVVJMICp0ZXN0UmVzb3VyY2VVUkwgPSBb W05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiRW1wdHlHcmFuZGZhdGhlcmVk UmVzb3VyY2VMb2FkU3RhdGlzdGljcyIgd2l0aEV4dGVuc2lvbjpAInBsaXN0IiBzdWJkaXJlY3Rv cnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdOwotCi0gICAgW1tOU0ZpbGVNYW5hZ2VyIGRl ZmF1bHRNYW5hZ2VyXSBjcmVhdGVEaXJlY3RvcnlBdFVSTDpzdGF0aXN0aWNzRGlyZWN0b3J5VVJM IHdpdGhJbnRlcm1lZGlhdGVEaXJlY3RvcmllczpZRVMgYXR0cmlidXRlczpuaWwgZXJyb3I6bmls XTsKLSAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNvcHlJdGVtQXRVUkw6dGVz dFJlc291cmNlVVJMIHRvVVJMOnRhcmdldFVSTCBlcnJvcjpuaWxdOwotCi0gICAgRVhQRUNUX1RS VUUoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOnRhcmdl dFVSTC5wYXRoXSk7CisgICAgZW5zdXJlSVRQRmlsZUlzQ3JlYXRlZCgpOwogCiAgICAgc3RhdGlj IGJvb2wgY2FsbGJhY2tGbGFnOwogICAgIHN0YXRpYyBib29sIGRvbmVGbGFnOwpAQCAtNDUyLDYg KzQ2Niw4IEBAIFRFU1QoUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgQ2hpbGRQcm9jZXNzZXNOb3RM YXVuY2hlZERhdGFiYXNlKQogICAgICAgICAgICAgY2FsbGJhY2tGbGFnID0gdHJ1ZTsKICAgICAg ICAgfV07CiAKKyAgICAgICAgZW5zdXJlSVRQRmlsZUlzQ3JlYXRlZCgpOworCiAgICAgICAgIFtk YXRhU3RvcmUgX3NldFVzZUlUUERhdGFiYXNlOnRydWUgY29tcGxldGlvbkhhbmRsZXI6IF4odm9p ZCkgewogICAgICAgICAgICAgZG9uZUZsYWcgPSB0cnVlOwogICAgICAgICB9XTsK