205841 2020-01-06 16:18:49 -0800 Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory 2020-01-10 09:41:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen commit-queue webkit-bug-importer youennf oldest_to_newest 1603356 0 achristensen 2020-01-06 16:18:49 -0800 Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory 1603357 1 386910 achristensen 2020-01-06 16:21:39 -0800 Created attachment 386910 Patch 1605160 2 386910 commit-queue 2020-01-10 09:40:42 -0800 Comment on attachment 386910 Patch Clearing flags on attachment: 386910 Committed r254342: <https://trac.webkit.org/changeset/254342> 1605161 3 commit-queue 2020-01-10 09:40:43 -0800 All reviewed patches have been landed. Closing bug. 1605162 4 webkit-bug-importer 2020-01-10 09:41:15 -0800 <rdar://problem/58481534> 386910 2020-01-06 16:21:39 -0800 2020-01-10 09:40:42 -0800 Patch bug-205841-20200106162138.patch text/plain 11942 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTQwOTIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTA2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIFdlYnNp dGVEYXRhU3RvcmU6OnNldENhY2hlU3RvcmFnZURpcmVjdG9yeSB3aGljaCBoYXMgYmVlbiByZXBs YWNlZCBieSBXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbjo6c2V0Q2FjaGVTdG9yYWdlRGly ZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDU4NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmLmNwcDoK KyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25Db3B5Q2FjaGVTdG9yYWdl RGlyZWN0b3J5KToKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25TZXRD YWNoZVN0b3JhZ2VEaXJlY3RvcnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1dlYnNp dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9y ZSBfY2FjaGVTdG9yYWdlRGlyZWN0b3J5XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLV2Vic2l0 ZURhdGFTdG9yZSBfc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5Ol0pOiBEZWxldGVkLgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0ZS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpyZXRyaWV2ZUNhY2hlU3RvcmFnZVBhcmFt ZXRlcnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3Jl Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmNhY2hlU3RvcmFnZURpcmVj dG9yeSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNldENhY2hl U3RvcmFnZURpcmVjdG9yeSk6IERlbGV0ZWQuCisKIDIwMjAtMDEtMDYgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBOZXR3b3JrU2Vzc2lvbkNv Y29hOjppc29sYXRlZFNlc3Npb24gc2hvdWxkIG5vdCB1c2UgaXRlcmF0b3IgYWZ0ZXIgbXV0YXRp bmcgbV9pc29sYXRlZFNlc3Npb25zCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Qy9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0 aW9uUmVmLmNwcAkocmV2aXNpb24gMjU0MDkyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTkwLDYgKzkwLDE2IEBAIHZvaWQgV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv blNldFcKICAgICBXZWJLaXQ6OnRvSW1wbChjb25maWd1cmF0aW9uKS0+c2V0V2ViU1FMRGF0YWJh c2VEaXJlY3RvcnkoV2ViS2l0Ojp0b0ltcGwoZGlyZWN0b3J5KS0+c3RyaW5nKCkpOwogfQogCitX S1N0cmluZ1JlZiBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uQ29weUNhY2hlU3RvcmFn ZURpcmVjdG9yeShXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRp b24pCit7CisgICAgcmV0dXJuIFdlYktpdDo6dG9Db3BpZWRBUEkoV2ViS2l0Ojp0b0ltcGwoY29u ZmlndXJhdGlvbiktPmNhY2hlU3RvcmFnZURpcmVjdG9yeSgpKTsKK30KKwordm9pZCBXS1dlYnNp dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5KFdLV2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tTdHJpbmdSZWYgZGly ZWN0b3J5KQoreworICAgIFdlYktpdDo6dG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRDYWNoZVN0 b3JhZ2VEaXJlY3RvcnkoV2ViS2l0Ojp0b0ltcGwoZGlyZWN0b3J5KS0+c3RyaW5nKCkpOworfQor CiBXS1N0cmluZ1JlZiBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uQ29weU1lZGlhS2V5 c1N0b3JhZ2VEaXJlY3RvcnkoV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZiBjb25m aWd1cmF0aW9uKQogewogICAgIHJldHVybiBXZWJLaXQ6OnRvQ29waWVkQVBJKFdlYktpdDo6dG9J bXBsKGNvbmZpZ3VyYXRpb24pLT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkpOwpJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvblJlZi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYuaAkocmV2aXNpb24gMjU0MDkyKQorKysg U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvblJlZi5oCSh3b3JraW5nIGNvcHkpCkBAIC01MSw2ICs1MSw5IEBAIFdLX0VYUE9SVCB2b2lk IFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3UKIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS1dlYnNp dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uQ29weVdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KFdLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbik7CiBXS19FWFBPUlQg dm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0V2ViU1FMRGF0YWJhc2VEaXJl Y3RvcnkoV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBX S1N0cmluZ1JlZiBkaXJlY3RvcnkpOwogCitXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tXZWJzaXRl RGF0YVN0b3JlQ29uZmlndXJhdGlvbkNvcHlDYWNoZVN0b3JhZ2VEaXJlY3RvcnkoV0tXZWJzaXRl RGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKTsKK1dLX0VYUE9SVCB2b2lk IFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25TZXRDYWNoZVN0b3JhZ2VEaXJlY3Rvcnko V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmlu Z1JlZiBkaXJlY3RvcnkpOworCiBXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tXZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbkNvcHlNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KFdLV2Vic2l0ZURh dGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbik7CiBXS19FWFBPUlQgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9y eShXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIFdLU3Ry aW5nUmVmIGRpcmVjdG9yeSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQkocmV2aXNpb24gMjU0MDky KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9y ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzE5LDE2ICszMTksNiBAQCAtICh2b2lkKV9zZXRQZXJP cmlnaW5TdG9yYWdlUXVvdGE6KE5TVUluCiB7CiB9CiAKLS0gKE5TU3RyaW5nICopX2NhY2hlU3Rv cmFnZURpcmVjdG9yeQotewotICAgIHJldHVybiBfd2Vic2l0ZURhdGFTdG9yZS0+Y2FjaGVTdG9y YWdlRGlyZWN0b3J5KCk7Ci19Ci0KLS0gKHZvaWQpX3NldENhY2hlU3RvcmFnZURpcmVjdG9yeToo TlNTdHJpbmcgKilkaXJlY3RvcnkKLXsKLSAgICBfd2Vic2l0ZURhdGFTdG9yZS0+c2V0Q2FjaGVT dG9yYWdlRGlyZWN0b3J5KGRpcmVjdG9yeSk7Ci19Ci0KIC0gKHZvaWQpX3NldEJvdW5kSW50ZXJm YWNlSWRlbnRpZmllcjooTlNTdHJpbmcgKilpZGVudGlmaWVyCiB7CiAgICAgX3dlYnNpdGVEYXRh U3RvcmUtPnNldEJvdW5kSW50ZXJmYWNlSWRlbnRpZmllcihpZGVudGlmaWVyKTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi c2l0ZURhdGFTdG9yZVByaXZhdGUuaAkocmV2aXNpb24gMjU0MDkyKQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaAkod29ya2lu ZyBjb3B5KQpAQCAtNTAsNyArNTAsNiBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwg X1dLV2Vic2l0CiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRW5hYmxlZDopIEJPT0wgX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkIFdL X0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTIpLCBpb3MoMTAuMCkpOwogQHByb3BlcnR5IChub25h dG9taWMsIHNldHRlcj1fc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZTopIEJPT0wg X3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygx MC4xNCksIGlvcygxMi4wKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRQZXJP cmlnaW5TdG9yYWdlUXVvdGE6KSBOU1VJbnRlZ2VyIF9wZXJPcmlnaW5TdG9yYWdlUXVvdGEgV0tf QVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24ucGVyT3JpZ2luU3RvcmFnZVF1b3RhIiwgbWFjb3MoMTAuMTMuNCwgV0tfTUFDX1RC QSksIGlvcygxMS4zLCBXS19JT1NfVEJBKSk7Ci1AcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVy PV9zZXRDYWNoZVN0b3JhZ2VEaXJlY3Rvcnk6KSBOU1N0cmluZyogX2NhY2hlU3RvcmFnZURpcmVj dG9yeSBXS19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJfV0tXZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbi5jYWNoZVN0b3JhZ2VEaXJlY3RvcnkiLCBtYWNvcygxMC4xMy40LCBX S19NQUNfVEJBKSwgaW9zKDExLjMsIFdLX0lPU19UQkEpKTsKIAogQHByb3BlcnR5IChub25hdG9t aWMsIHNldHRlcj1fc2V0Qm91bmRJbnRlcmZhY2VJZGVudGlmaWVyOikgTlNTdHJpbmcgKl9ib3Vu ZEludGVyZmFjZUlkZW50aWZpZXIgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgi X1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uYm91bmRJbnRlcmZhY2VJZGVudGlmaWVy IiwgbWFjb3MoMTAuMTMuNCwgV0tfTUFDX1RCQSksIGlvcygxMS4zLCBXS19JT1NfVEJBKSk7CiBA cHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRBbGxvd3NDZWxsdWxhckFjY2VzczopIEJP T0wgX2FsbG93c0NlbGx1bGFyQWNjZXNzIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1F TlQoIl9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmFsbG93c0NlbGx1bGFyQWNjZXNz IiwgbWFjb3MoMTAuMTMuNCwgV0tfTUFDX1RCQSksIGlvcygxMS4zLCBXS19JT1NfVEJBKSk7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29y a1Byb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDI1NDA5MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTExOTMsNyArMTE5Myw3IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6cmV0cmlldmVDYWNo ZVMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGF1dG8mIGNhY2hlU3RvcmFnZURpcmVj dG9yeSA9IHN0b3JlLT5jYWNoZVN0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICBhdXRvJiBjYWNoZVN0 b3JhZ2VEaXJlY3RvcnkgPSBzdG9yZS0+Y29uZmlndXJhdGlvbigpLmNhY2hlU3RvcmFnZURpcmVj dG9yeSgpOwogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBjYWNoZVN0b3JhZ2VEaXJlY3Rv cnlFeHRlbnNpb25IYW5kbGU7CiAgICAgaWYgKCFjYWNoZVN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0 eSgpKQogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3JpdGVE aXJlY3RvcnkoY2FjaGVTdG9yYWdlRGlyZWN0b3J5LCBjYWNoZVN0b3JhZ2VEaXJlY3RvcnlFeHRl bnNpb25IYW5kbGUpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAkocmV2aXNpb24gMjU0MDkyKQorKysgU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMjYsNyArMTI2LDYgQEAgcHVibGljOgogICAgIHVpbnQ2NF90IHBlck9y aWdpblN0b3JhZ2VRdW90YSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb2x2ZWRDb25maWd1cmF0aW9u LT5wZXJPcmlnaW5TdG9yYWdlUXVvdGEoKTsgfQogICAgIHVpbnQ2NF90IHBlclRoaXJkUGFydHlP cmlnaW5TdG9yYWdlUXVvdGEoKSBjb25zdDsKICAgICBjb25zdCBTdHJpbmcmIGNhY2hlU3RvcmFn ZURpcmVjdG9yeSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLT5jYWNo ZVN0b3JhZ2VEaXJlY3RvcnkoKTsgfQotICAgIHZvaWQgc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5 KFN0cmluZyYmIGRpcmVjdG9yeSkgeyBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+c2V0Q2FjaGVT dG9yYWdlRGlyZWN0b3J5KFdURk1vdmUoZGlyZWN0b3J5KSk7IH0KIAogI2lmIEVOQUJMRShSRVNP VVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl KiByZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZUxvYWRT dGF0aXN0aWNzLmdldCgpOyB9CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTQwOTYpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wMS0wNiAgQWxleCBDaHJpc3RlbnNl biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBXZWJzaXRlRGF0 YVN0b3JlOjpzZXRDYWNoZVN0b3JhZ2VEaXJlY3Rvcnkgd2hpY2ggaGFzIGJlZW4gcmVwbGFjZWQg YnkgV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb246OnNldENhY2hlU3RvcmFnZURpcmVjdG9y eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbToKKyAgICAg ICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6 VGVzdENvbnRyb2xsZXI6OndlYnNpdGVEYXRhU3RvcmUpOgorICAgICAgICAqIFdlYktpdFRlc3RS dW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbToKKyAgICAgICAgKFdUUjo6aW5pdGlh bGl6ZVdlYlZpZXdDb25maWd1cmF0aW9uKToKKwogMjAyMC0wMS0wNiAgSm9uYXRoYW4gQmVkYXJk ICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgdGVzdC1sbGRiLXdlYmtpdDogVXNlIGxv Z2dpbmcgbW9kdWxlCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1NlcnZpY2VXb3JrZXJCYXNpYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbQkocmV2aXNpb24gMjU0MDky KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29ya2Vy QmFzaWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEzNTcsOCArMTM1Nyw4IEBAIFRFU1QoU2Vydmlj ZVdvcmtlcnMsIFNlcnZpY2VXb3JrZXJBbmRDYWMKICAgICBzZXRDb25maWd1cmF0aW9uSW5qZWN0 ZWRCdW5kbGVQYXRoKGNvbmZpZ3VyYXRpb24uZ2V0KCkpOwogICAgIGF1dG8gZGF0YVN0b3JlQ29u ZmlndXJhdGlvbiA9IGFkb3B0TlMoW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG5l d10pOwogICAgIFtkYXRhU3RvcmVDb25maWd1cmF0aW9uIF9zZXRTZXJ2aWNlV29ya2VyUmVnaXN0 cmF0aW9uRGlyZWN0b3J5OltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6QCIvdmFyL3RtcCJdXTsKKyAg ICBbZGF0YVN0b3JlQ29uZmlndXJhdGlvbiBfc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5OltOU1VS TCBmaWxlVVJMV2l0aFBhdGg6QCIvdmFyL3RtcCJdXTsKICAgICBhdXRvIHdlYnNpdGVEYXRhU3Rv cmUgPSBhZG9wdE5TKFtbV0tXZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1 cmF0aW9uOmRhdGFTdG9yZUNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKLSAgICBbd2Vic2l0ZURhdGFT dG9yZSBfc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5OkAiL3Zhci90bXAiXTsKICAgICBbY29uZmln dXJhdGlvbiBzZXRXZWJzaXRlRGF0YVN0b3JlOndlYnNpdGVEYXRhU3RvcmUuZ2V0KCldOwogCiAg ICAgUmV0YWluUHRyPERpcmVjdG9yeVBhZ2VNZXNzYWdlSGFuZGxlcj4gZGlyZWN0b3J5UGFnZU1l c3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW0RpcmVjdG9yeVBhZ2VNZXNzYWdlSGFuZGxlciBhbGxv Y10gaW5pdF0pOwpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5j cHAJKHJldmlzaW9uIDI1NDA5MikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRy b2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjcsNiArNTI3LDcgQEAgV0tXZWJzaXRlRGF0 YVN0b3JlUmVmIFRlc3RDb250cm9sbGVyOjp3ZQogCiAgICAgICAgICAgICBXS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uU2V0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeShjb25maWd1cmF0 aW9uLmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHBhdGhTZXBhcmF0b3IgKyAiQXBwbGlj YXRpb25DYWNoZSIpLmdldCgpKTsKICAgICAgICAgICAgIFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb25TZXROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9X Syh0ZW1wb3JhcnlGb2xkZXIgKyBwYXRoU2VwYXJhdG9yICsgIkNhY2hlIikuZ2V0KCkpOworICAg ICAgICAgICAgV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblNldENhY2hlU3RvcmFnZURp cmVjdG9yeShjb25maWd1cmF0aW9uLmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHBhdGhT ZXBhcmF0b3IgKyAiQ2FjaGVTdG9yYWdlIikuZ2V0KCkpOwogICAgICAgICAgICAgV0tXZWJzaXRl RGF0YVN0b3JlQ29uZmlndXJhdGlvblNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KGNvbmZp Z3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgcGF0aFNlcGFyYXRvciArICJE YXRhYmFzZXMiICsgcGF0aFNlcGFyYXRvciArICJJbmRleGVkREIiKS5nZXQoKSk7CiAgICAgICAg ICAgICBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0TG9jYWxTdG9yYWdlRGlyZWN0 b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgcGF0aFNlcGFy YXRvciArICJMb2NhbFN0b3JhZ2UiKS5nZXQoKSk7CiAgICAgICAgICAgICBXS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uU2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoY29uZmlndXJhdGlv bi5nZXQoKSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBwYXRoU2VwYXJhdG9yICsgIkRhdGFiYXNl cyIgKyBwYXRoU2VwYXJhdG9yICsgIldlYlNRTCIpLmdldCgpKTsKSW5kZXg6IFRvb2xzL1dlYktp dFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW0JKHJldmlz aW9uIDI1NDA5MikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xs ZXJDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNzEsMTIgKzcxLDYgQEAgdm9pZCBpbml0aWFs aXplV2ViVmlld0NvbmZpZ3VyYXRpb24oY29ucwogCiAgICAgV0tDb250ZXh0U2V0U3RvcmFnZUFj Y2Vzc0FQSUVuYWJsZWQoY29udGV4dCwgdHJ1ZSk7CiAKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmUq IHBvb2xXZWJzaXRlRGF0YVN0b3JlID0gKF9fYnJpZGdlIFdLV2Vic2l0ZURhdGFTdG9yZSAqKVRl c3RDb250cm9sbGVyOjp3ZWJzaXRlRGF0YVN0b3JlKCk7Ci0gICAgaWYgKGxpYnJhcnlQYXRoKSB7 Ci0gICAgICAgIFN0cmluZyBjYWNoZVN0b3JhZ2VEaXJlY3RvcnkgPSBTdHJpbmcobGlicmFyeVBh dGgpICsgJy8nICsgIkNhY2hlU3RvcmFnZSI7Ci0gICAgICAgIFtwb29sV2Vic2l0ZURhdGFTdG9y ZSBfc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5OiBjYWNoZVN0b3JhZ2VEaXJlY3RvcnldOwotICAg IH0KLQogICAgIFtnbG9iYWxXZWJWaWV3Q29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3JlIF9z ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDpZRVNdOwogICAgIFtnbG9iYWxXZWJWaWV3 Q29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3JlIF9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzU2V0 U2hvdWxkU3VibWl0VGVsZW1ldHJ5Ok5PXTsKIAo=