207347 2020-02-06 12:23:15 -0800 Web Inspector: show JavaScript Worker terminated state as an internal property 2020-05-10 19:02:09 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=207346 https://bugs.webkit.org/show_bug.cgi?id=211708 InRadar P2 Normal --- 1 hi hi bburg commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1615739 0 hi 2020-02-06 12:23:15 -0800 This would have helped when trying to debug <https://webkit.org/b/207346>. 1615757 1 389984 hi 2020-02-06 13:26:39 -0800 Created attachment 389984 Patch 1615768 2 389984 bburg 2020-02-06 13:39:32 -0800 Comment on attachment 389984 Patch r=me, very cool. Let's wait for EWS, worker tests seem more likely to have flake issues. 1615778 3 389988 hi 2020-02-06 13:51:13 -0800 Created attachment 389988 Patch 1615868 4 389988 commit-queue 2020-02-06 15:17:16 -0800 Comment on attachment 389988 Patch Clearing flags on attachment: 389988 Committed r255986: <https://trac.webkit.org/changeset/255986> 1615869 5 commit-queue 2020-02-06 15:17:18 -0800 All reviewed patches have been landed. Closing bug. 1615871 6 webkit-bug-importer 2020-02-06 15:18:17 -0800 <rdar://problem/59239652> 389984 2020-02-06 13:26:39 -0800 2020-02-06 13:51:11 -0800 Patch bug-207347-20200206132638.patch text/plain 11336 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMTJmZGZkYzRmODNlZDcxZmRlMGFkNGM2NjZkNThmY2RhNDA4MjAxLi41 MjlhYzM5MzhiNGUwYWFkZjE3ZmUxMjBjNDIxNTZhNGIzYWI0ZjcyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMjAtMDItMDYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3cgSmF2YVNjcmlwdCBXb3JrZXIgdGVybWlu YXRlZCBzdGF0ZSBhcyBhbiBpbnRlcm5hbCBwcm9wZXJ0eQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3MzQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3dvcmtlci93b3JrZXIt Y3JlYXRlLWFuZC10ZXJtaW5hdGUuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL1dlYkluamVj dGVkU2NyaXB0SG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJJbmplY3RlZFNjcmlwdEhv c3Q6OmdldEludGVybmFsUHJvcGVydGllcyk6CisKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlci5o OgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyOjp3YXNUZXJtaW5hdGVkKTogQWRkZWQuCisKIDIw MjAtMDItMDUgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAg ICBbUGxheVN0YXRpb25dIE1pc2NlbGxhbmVvdXMgYnVpbGQgZml4ZXMgRmVicnVhcnkgMjAyMCBl ZGl0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRT Y3JpcHRIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlw dEhvc3QuY3BwCmluZGV4IGZhZGYzYmY4ODdiNmRmODljZDQ4NTBmNWU3N2RhOGNjMTkyODRkYTQu LjIxN2ZmNDVlNTlhZjlhZmNiMmRiY2NjNGM0MDAwZWUxYjhiNjI2MDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCkBAIC0zMiw2 ICszMiw4IEBACiAjaW5jbHVkZSAiSlNIVE1MQ29sbGVjdGlvbi5oIgogI2luY2x1ZGUgIkpTTm9k ZS5oIgogI2luY2x1ZGUgIkpTTm9kZUxpc3QuaCIKKyNpbmNsdWRlICJKU1dvcmtlci5oIgorI2lu Y2x1ZGUgIldvcmtlci5oIgogCiAjaWYgRU5BQkxFKFBBWU1FTlRfUkVRVUVTVCkKICNpbmNsdWRl ICJKU1BheW1lbnRSZXF1ZXN0LmgiCkBAIC0xNjEsOSArMTYzLDE3IEBAIHN0YXRpYyBKU1N0cmlu ZyoganNTdHJpbmdGb3JQYXltZW50UmVxdWVzdFN0YXRlKFZNJiB2bSwgUGF5bWVudFJlcXVlc3Q6 OlN0YXRlIHN0CiAKIEpTVmFsdWUgV2ViSW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRlcm5hbFBy b3BlcnRpZXMoVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZXhlYywgSlNDOjpKU1ZhbHVlIHZhbHVl KQogewotI2lmIEVOQUJMRShQQVlNRU5UX1JFUVVFU1QpCiAgICAgYXV0byBzY29wZSA9IERFQ0xB UkVfVEhST1dfU0NPUEUodm0pOwogCisgICAgaWYgKGF1dG8qIHdvcmtlciA9IEpTV29ya2VyOjp0 b1dyYXBwZWQodm0sIHZhbHVlKSkgeworICAgICAgICB1bnNpZ25lZCBpbmRleCA9IDA7CisgICAg ICAgIGF1dG8qIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyKTsKKyAg ICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVy bmFsUHJvcGVydHkodm0sIGV4ZWMsICJ0ZXJtaW5hdGVkIl9zLCBqc0Jvb2xlYW4od29ya2VyLT53 YXNUZXJtaW5hdGVkKCkpKSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsg fSk7CisgICAgICAgIHJldHVybiBhcnJheTsKKyAgICB9CisKKyNpZiBFTkFCTEUoUEFZTUVOVF9S RVFVRVNUKQogICAgIGlmIChQYXltZW50UmVxdWVzdCogcGF5bWVudFJlcXVlc3QgPSBKU1BheW1l bnRSZXF1ZXN0Ojp0b1dyYXBwZWQodm0sIHZhbHVlKSkgewogICAgICAgICB1bnNpZ25lZCBpbmRl eCA9IDA7CiAgICAgICAgIGF1dG8qIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBu dWxscHRyKTsKQEAgLTE3MywxMCArMTgzLDYgQEAgSlNWYWx1ZSBXZWJJbmplY3RlZFNjcmlwdEhv c3Q6OmdldEludGVybmFsUHJvcGVydGllcyhWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBleGUKICAg ICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKICAgICAgICAgcmV0dXJuIGFy cmF5OwogICAgIH0KLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHZtKTsKLSAgICBVTlVTRURfUEFS QU0oZXhlYyk7Ci0gICAgVU5VU0VEX1BBUkFNKHZhbHVlKTsKICNlbmRpZgogCiAgICAgcmV0dXJu IHsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmggYi9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5oCmluZGV4IGI1OWRkMDFiODZmZjE3MmIyODdmMmNh NmVlY2E5Zjc0YzAyMDdkYzEuLjY2YzY4YjViZTc1NjRhMWFjNjJmZWQzZDBkYTM5ZDZkMDg2ZjZh MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuaApAQCAtNjEsNiArNjEsNyBAQCBwdWJsaWM6CiAg ICAgRXhjZXB0aW9uT3I8dm9pZD4gcG9zdE1lc3NhZ2UoSlNDOjpKU0dsb2JhbE9iamVjdCYsIEpT Qzo6SlNWYWx1ZSBtZXNzYWdlLCBQb3N0TWVzc2FnZU9wdGlvbnMmJik7CiAKICAgICB2b2lkIHRl cm1pbmF0ZSgpOworICAgIGJvb2wgd2FzVGVybWluYXRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fd2Fz VGVybWluYXRlZDsgfQogCiAgICAgYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdCBmaW5h bDsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDdiZTExMmQ1MzdhZWYwNjViMmJmMzYxZTEyZmRlMTQzZDQ2N2E2MzEuLjRm ZGZlM2IxNDE0NjQ1ODNmYjAwMmMwMDIwMDliYWNlOTAyMWE0NzkgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NCBAQAorMjAyMC0wMi0wNiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAg ICAgICAgV2ViIEluc3BlY3Rvcjogc2hvdyBKYXZhU2NyaXB0IFdvcmtlciB0ZXJtaW5hdGVkIHN0 YXRlIGFzIGFuIGludGVybmFsIHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDczNDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci93b3JrZXIvd29ya2VyLWNyZWF0ZS1hbmQt dGVybWluYXRlLmh0bWw6CisgICAgICAgIEFkZCBhc3NlcnRpb25zIHRocm91Z2hvdXQgdGhlIHRl c3QgdG8gY2hlY2sgdGhhdCB0aGUgYHRlcm1pbmF0ZWRgIHZhbHVlIG1hdGNoZXMgd2hhdCB0aGUK KyAgICAgICAgZnJvbnRlbmQga25vd3MuCisKIDIwMjAtMDItMDUgIERldmluIFJvdXNzbyAgPGRy b3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNTQ0MjgpOiBbIG1hY09T IHdrMSBdIGluc3BlY3Rvci9jYW52YXMvcmVjb3JkaW5nLTJkLWZ1bGwuaHRtbCBiZWNhbWUgc2xv d2VyLCBmbGFraWx5IHRpbWVzIG91dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3dvcmtlci93b3JrZXItY3JlYXRlLWFuZC10ZXJtaW5hdGUuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci93b3JrZXIvd29ya2VyLWNyZWF0ZS1hbmQtdGVybWluYXRlLmh0bWwKaW5kZXggYjM1 NzNhOTcyMzI4MGE4Y2VjOTVjYzc5OWVhMTgzOTMyYmQ5ZWViZi4uMjcwMWIyMmFiZTUyMTNhOWYx ODBjMWRmN2I3OGU0MTM1NGRmZDZiMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3dvcmtlci93b3JrZXItY3JlYXRlLWFuZC10ZXJtaW5hdGUuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3Ivd29ya2VyL3dvcmtlci1jcmVhdGUtYW5kLXRlcm1pbmF0ZS5odG1sCkBAIC00 Myw2ICs0MywzMyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIFByb3RvY29sVGVzdC5s b2coIk5vIFdvcmtlcnMiKTsKICAgICB9CiAKKyAgICBhc3luYyBmdW5jdGlvbiBjaGVja0ludGVy bmFsUHJvcGVydGllcyhleHByZXNzaW9uLCB7dGVybWluYXRlZH0gPSB7fSkgeworICAgICAgICBs ZXQgZXZhbHVhdGVSZXN1bHQgPSBhd2FpdCBJbnNwZWN0b3JQcm90b2NvbC5hd2FpdENvbW1hbmQo eworICAgICAgICAgICAgbWV0aG9kOiAiUnVudGltZS5ldmFsdWF0ZSIsCisgICAgICAgICAgICBw YXJhbXM6IHsKKyAgICAgICAgICAgICAgICBleHByZXNzaW9uLAorICAgICAgICAgICAgICAgIG9i amVjdEdyb3VwOiAidGVzdCIsCisgICAgICAgICAgICB9LAorICAgICAgICB9KTsKKworICAgICAg ICBQcm90b2NvbFRlc3QuYXNzZXJ0KGV2YWx1YXRlUmVzdWx0LnJlc3VsdC50eXBlID09PSAib2Jq ZWN0IiwgYEV2YWx1YXRlIHJlc3VsdCBvZiAnJHtleHByZXNzaW9ufScgc2hvdWxkIGhhdmUgdHlw ZSAnb2JqZWN0Jy5gKTsKKyAgICAgICAgUHJvdG9jb2xUZXN0LmFzc2VydChldmFsdWF0ZVJlc3Vs dC5yZXN1bHQuY2xhc3NOYW1lID09PSAiV29ya2VyIiwgYEV2YWx1YXRlIHJlc3VsdCBvZiAnJHtl eHByZXNzaW9ufScgc2hvdWxkIGhhdmUgY2xhc3NOYW1lICdXb3JrZXInLmApOworCisgICAgICAg IGxldCBnZXRQcm9wZXJ0aWVzUmVzdWx0ID0gYXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wuYXdhaXRD b21tYW5kKHsKKyAgICAgICAgICAgIG1ldGhvZDogIlJ1bnRpbWUuZ2V0UHJvcGVydGllcyIsCisg ICAgICAgICAgICBwYXJhbXM6IHsKKyAgICAgICAgICAgICAgICBvYmplY3RJZDogZXZhbHVhdGVS ZXN1bHQucmVzdWx0Lm9iamVjdElkLAorICAgICAgICAgICAgfSwKKyAgICAgICAgfSk7CisKKyAg ICAgICAgbGV0IGludGVybmFsUHJvcGVydGllcyA9IGdldFByb3BlcnRpZXNSZXN1bHQuaW50ZXJu YWxQcm9wZXJ0aWVzOworICAgICAgICBQcm90b2NvbFRlc3QuYXNzZXJ0KGludGVybmFsUHJvcGVy dGllcy5sZW5ndGggPT09IDEsIGBXb3JrZXIgJyR7ZXhwcmVzc2lvbn0nIHNob3VsZCBvbmx5IGhh dmUgb25lIGludGVybmFsIHByb3BlcnR5LmApOworCisgICAgICAgIFByb3RvY29sVGVzdC5hc3Nl cnQoaW50ZXJuYWxQcm9wZXJ0aWVzWzBdLm5hbWUgPT09ICJ0ZXJtaW5hdGVkIiwgYFdvcmtlciAn JHtleHByZXNzaW9ufScgc2hvdWxkIGhhdmUgJ3Rlcm1pbmF0ZWQnIGludGVybmFsIHByb3BlcnR5 LmApOworICAgICAgICBQcm90b2NvbFRlc3QuYXNzZXJ0KGludGVybmFsUHJvcGVydGllc1swXS52 YWx1ZS50eXBlID09PSAiYm9vbGVhbiIsIGBJbnRlcm5hbCAndGVybWluYXRlZCcgcHJvcGVydHkg b2YgJyR7ZXhwcmVzc2lvbn0nIHNob3VsZCBiZSBhIGJvb2xlYW4uYCk7CisgICAgICAgIFByb3Rv Y29sVGVzdC5hc3NlcnQoaW50ZXJuYWxQcm9wZXJ0aWVzWzBdLnZhbHVlLnZhbHVlID09PSB0ZXJt aW5hdGVkLCBgSW50ZXJuYWwgJ3Rlcm1pbmF0ZWQnIHByb3BlcnR5IG9mICcke2V4cHJlc3Npb259 JyBzaG91bGQgaGF2ZSB2YWx1ZSAnJHt0ZXJtaW5hdGVkfScuYCk7CisgICAgfQorCiAKICAgICBs ZXQgdHJpZ2dlck5leHRDcmVhdGU7CiAgICAgbGV0IHRyaWdnZXJOZXh0VGVybWluYXRlOwpAQCAt NzgsNzAgKzEwNSw5MiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7 CiAgICAgICAgIG5hbWU6ICJXb3JrZXIuZW5hYmxlIiwKICAgICAgICAgZGVzY3JpcHRpb246ICJX b3JrZXIuZW5hYmxlIGluZm9ybXMgdGhlIGZyb250ZW5kIG9mIHRoZSB0d28gZXhpc3RpbmcgV29y a2VycyIsCi0gICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7Ci0gICAgICAgICAgICBJbnNw ZWN0b3JQcm90b2NvbC5hd2FpdENvbW1hbmQoe21ldGhvZDogIldvcmtlci5lbmFibGUiLCBwYXJh bXM6IHt9fSkKLSAgICAgICAgICAgICAgICAudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICAgICAg ICAgIFByb3RvY29sVGVzdC5leHBlY3RFcXVhbCh3b3JrZXJzLmxlbmd0aCwgMiwgIlNob3VsZCBi ZSBpbmZvcm1lZCBvZiB0d28gZXhpc3RpbmcgV29ya2Vycy4iKTsKLSAgICAgICAgICAgICAgICAg ICAgZHVtcFdvcmtlcnMoKTsKLSAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwotICAgICAg ICAgICAgICAgIH0pLmNhdGNoKHJlamVjdCk7CisgICAgICAgIGFzeW5jIHRlc3QoKSB7CisgICAg ICAgICAgICBhd2FpdCBJbnNwZWN0b3JQcm90b2NvbC5hd2FpdENvbW1hbmQoe21ldGhvZDogIldv cmtlci5lbmFibGUiLCBwYXJhbXM6IHt9fSk7CisKKyAgICAgICAgICAgIFByb3RvY29sVGVzdC5l eHBlY3RFcXVhbCh3b3JrZXJzLmxlbmd0aCwgMiwgIlNob3VsZCBiZSBpbmZvcm1lZCBvZiB0d28g ZXhpc3RpbmcgV29ya2Vycy4iKTsKKyAgICAgICAgICAgIGR1bXBXb3JrZXJzKCk7CisKKyAgICAg ICAgICAgIGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICBjaGVja0ludGVybmFs UHJvcGVydGllcyhgd29ya2VyMWAsIHt0ZXJtaW5hdGVkOiBmYWxzZX0pLAorICAgICAgICAgICAg ICAgIGNoZWNrSW50ZXJuYWxQcm9wZXJ0aWVzKGB3b3JrZXIyYCwge3Rlcm1pbmF0ZWQ6IGZhbHNl fSksCisgICAgICAgICAgICBdKTsKICAgICAgICAgfQogICAgIH0pOwogCiAgICAgc3VpdGUuYWRk VGVzdENhc2UoewogICAgICAgICBuYW1lOiAiV29ya2VyLndvcmtlckNyZWF0ZWQiLAogICAgICAg ICBkZXNjcmlwdGlvbjogIlNob3VsZCByZWNlaXZlIGEgV29ya2VyLndvcmtlckNyZWF0ZWQgZXZl bnQgd2hlbiBjcmVhdGluZyBhIFdvcmtlci4iLAotICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVj dCkgewotICAgICAgICAgICAgUHJvdG9jb2xUZXN0LmV2YWx1YXRlSW5QYWdlKCJjcmVhdGVXb3Jr ZXIzKCkiKTsKLSAgICAgICAgICAgIHdhaXRGb3JXb3JrZXJDcmVhdGVkRXZlbnQoKQotICAgICAg ICAgICAgICAgIC50aGVuKCgpID0+IHsKLSAgICAgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0 LnBhc3MoIldvcmtlci53b3JrZXJDcmVhdGVkIik7Ci0gICAgICAgICAgICAgICAgICAgIGR1bXBX b3JrZXJzKCk7Ci0gICAgICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgICAgICAg ICB9KS5jYXRjaChyZWplY3QpOworICAgICAgICBhc3luYyB0ZXN0KCkgeworICAgICAgICAgICAg YXdhaXQgUHJvbWlzZS5hbGwoWworICAgICAgICAgICAgICAgIHdhaXRGb3JXb3JrZXJDcmVhdGVk RXZlbnQoKSwKKyAgICAgICAgICAgICAgICBQcm90b2NvbFRlc3QuZXZhbHVhdGVJblBhZ2UoImNy ZWF0ZVdvcmtlcjMoKSIpLAorICAgICAgICAgICAgXSk7CisKKyAgICAgICAgICAgIFByb3RvY29s VGVzdC5wYXNzKCJXb3JrZXIud29ya2VyQ3JlYXRlZCIpOworICAgICAgICAgICAgZHVtcFdvcmtl cnMoKTsKKworICAgICAgICAgICAgYXdhaXQgUHJvbWlzZS5hbGwoWworICAgICAgICAgICAgICAg IGNoZWNrSW50ZXJuYWxQcm9wZXJ0aWVzKGB3b3JrZXIxYCwge3Rlcm1pbmF0ZWQ6IGZhbHNlfSks CisgICAgICAgICAgICAgICAgY2hlY2tJbnRlcm5hbFByb3BlcnRpZXMoYHdvcmtlcjJgLCB7dGVy bWluYXRlZDogZmFsc2V9KSwKKyAgICAgICAgICAgICAgICBjaGVja0ludGVybmFsUHJvcGVydGll cyhgd29ya2VyM2AsIHt0ZXJtaW5hdGVkOiBmYWxzZX0pLAorICAgICAgICAgICAgXSk7CiAgICAg ICAgIH0KICAgICB9KTsKIAogICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTog Ildvcmtlci53b3JrZXJUZXJtaW5hdGVkLlBhZ2UiLAogICAgICAgICBkZXNjcmlwdGlvbjogIlNo b3VsZCByZWNlaXZlIGEgV29ya2VyLndvcmtlclRlcm1pbmF0ZWQgZXZlbnQgd2hlbiB0ZXJtaW5h dGluZyBhIFdvcmtlciBmcm9tIHRoZSBQYWdlLiIsCi0gICAgICAgIHRlc3QocmVzb2x2ZSwgcmVq ZWN0KSB7Ci0gICAgICAgICAgICBQcm90b2NvbFRlc3QuZXZhbHVhdGVJblBhZ2UoInRlcm1pbmF0 ZVdvcmtlcjJGcm9tUGFnZSgpIik7Ci0gICAgICAgICAgICB3YWl0Rm9yV29ya2VyVGVybWluYXRl ZEV2ZW50KCkKLSAgICAgICAgICAgICAgICAudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICAgICAg ICAgIFByb3RvY29sVGVzdC5wYXNzKCJXb3JrZXIud29ya2VyVGVybWluYXRlZCIpOwotICAgICAg ICAgICAgICAgICAgICBkdW1wV29ya2VycygpOwotICAgICAgICAgICAgICAgICAgICByZXNvbHZl KCk7Ci0gICAgICAgICAgICAgICAgfSkuY2F0Y2gocmVqZWN0KTsKKyAgICAgICAgYXN5bmMgdGVz dCgpIHsKKyAgICAgICAgICAgIGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICB3 YWl0Rm9yV29ya2VyVGVybWluYXRlZEV2ZW50KCksCisgICAgICAgICAgICAgICAgUHJvdG9jb2xU ZXN0LmV2YWx1YXRlSW5QYWdlKCJ0ZXJtaW5hdGVXb3JrZXIyRnJvbVBhZ2UoKSIpLAorICAgICAg ICAgICAgXSk7CisKKyAgICAgICAgICAgIFByb3RvY29sVGVzdC5wYXNzKCJXb3JrZXIud29ya2Vy VGVybWluYXRlZCIpOworICAgICAgICAgICAgZHVtcFdvcmtlcnMoKTsKKworICAgICAgICAgICAg YXdhaXQgUHJvbWlzZS5hbGwoWworICAgICAgICAgICAgICAgIGNoZWNrSW50ZXJuYWxQcm9wZXJ0 aWVzKGB3b3JrZXIxYCwge3Rlcm1pbmF0ZWQ6IGZhbHNlfSksCisgICAgICAgICAgICAgICAgY2hl Y2tJbnRlcm5hbFByb3BlcnRpZXMoYHdvcmtlcjJgLCB7dGVybWluYXRlZDogdHJ1ZX0pLAorICAg ICAgICAgICAgICAgIGNoZWNrSW50ZXJuYWxQcm9wZXJ0aWVzKGB3b3JrZXIzYCwge3Rlcm1pbmF0 ZWQ6IGZhbHNlfSksCisgICAgICAgICAgICBdKTsKICAgICAgICAgfQogICAgIH0pOwogCiAgICAg c3VpdGUuYWRkVGVzdENhc2UoewogICAgICAgICBuYW1lOiAiV29ya2VyLndvcmtlclRlcm1pbmF0 ZWQuV29ya2VyIiwKICAgICAgICAgZGVzY3JpcHRpb246ICJTaG91bGQgcmVjZWl2ZSBhIFdvcmtl ci53b3JrZXJUZXJtaW5hdGVkIGV2ZW50IHdoZW4gdGVybWluYXRpbmcgYSBXb3JrZXIgZnJvbSB0 aGUgV29ya2VyLiIsCi0gICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7Ci0gICAgICAgICAg ICBQcm90b2NvbFRlc3QuZXZhbHVhdGVJblBhZ2UoInRlcm1pbmF0ZVdvcmtlcjNGcm9tV29ya2Vy KCkiKTsKLSAgICAgICAgICAgIHdhaXRGb3JXb3JrZXJUZXJtaW5hdGVkRXZlbnQoKQotICAgICAg ICAgICAgICAgIC50aGVuKCgpID0+IHsKLSAgICAgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0 LnBhc3MoIldvcmtlci53b3JrZXJUZXJtaW5hdGVkIik7Ci0gICAgICAgICAgICAgICAgICAgIGR1 bXBXb3JrZXJzKCk7Ci0gICAgICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAgICAg ICAgICB9KS5jYXRjaChyZWplY3QpOworICAgICAgICBhc3luYyB0ZXN0KCkgeworICAgICAgICAg ICAgYXdhaXQgUHJvbWlzZS5hbGwoWworICAgICAgICAgICAgICAgIHdhaXRGb3JXb3JrZXJUZXJt aW5hdGVkRXZlbnQoKSwKKyAgICAgICAgICAgICAgICBQcm90b2NvbFRlc3QuZXZhbHVhdGVJblBh Z2UoInRlcm1pbmF0ZVdvcmtlcjNGcm9tV29ya2VyKCkiKSwKKyAgICAgICAgICAgIF0pOworCisg ICAgICAgICAgICBQcm90b2NvbFRlc3QucGFzcygiV29ya2VyLndvcmtlclRlcm1pbmF0ZWQiKTsK KyAgICAgICAgICAgIGR1bXBXb3JrZXJzKCk7CisKKyAgICAgICAgICAgIGF3YWl0IFByb21pc2Uu YWxsKFsKKyAgICAgICAgICAgICAgICBjaGVja0ludGVybmFsUHJvcGVydGllcyhgd29ya2VyMWAs IHt0ZXJtaW5hdGVkOiBmYWxzZX0pLAorICAgICAgICAgICAgICAgIGNoZWNrSW50ZXJuYWxQcm9w ZXJ0aWVzKGB3b3JrZXIyYCwge3Rlcm1pbmF0ZWQ6IHRydWV9KSwKKyAgICAgICAgICAgIF0pOwog ICAgICAgICB9CiAgICAgfSk7CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5h bWU6ICJXb3JrZXIud29ya2VyVGVybWluYXRlZC5HQyIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAi U2hvdWxkIHJlY2VpdmUgYSBXb3JrZXIud29ya2VyVGVybWluYXRlZCBldmVudCB3aGVuIHRlcm1p bmF0aW5nIGEgV29ya2VyIHZpYSBHYXJiYWdlIENvbGxlY3Rpb24uIiwKLSAgICAgICAgdGVzdChy ZXNvbHZlLCByZWplY3QpIHsKLSAgICAgICAgICAgIFByb3RvY29sVGVzdC5ldmFsdWF0ZUluUGFn ZSgidGVybWluYXRlV29ya2VyMVZpYUNvbGxlY3Rpb24oKSIpOwotICAgICAgICAgICAgSW5zcGVj dG9yUHJvdG9jb2wuc2VuZENvbW1hbmQoIkhlYXAuZ2MiLCB7fSk7Ci0gICAgICAgICAgICB3YWl0 Rm9yV29ya2VyVGVybWluYXRlZEV2ZW50KCkKLSAgICAgICAgICAgICAgICAudGhlbigoKSA9PiB7 Ci0gICAgICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5wYXNzKCJXb3JrZXIud29ya2VyVGVy bWluYXRlZCIpOwotICAgICAgICAgICAgICAgICAgICBkdW1wV29ya2VycygpOwotICAgICAgICAg ICAgICAgICAgICByZXNvbHZlKCk7Ci0gICAgICAgICAgICAgICAgfSkuY2F0Y2gocmVqZWN0KTsK KyAgICAgICAgYXN5bmMgdGVzdCgpIHsKKyAgICAgICAgICAgIGxldCB3b3JrZXJUZXJtaW5hdGVk UHJvbWlzZSA9IHdhaXRGb3JXb3JrZXJUZXJtaW5hdGVkRXZlbnQoKTsKKyAgICAgICAgICAgIGF3 YWl0IFByb3RvY29sVGVzdC5ldmFsdWF0ZUluUGFnZSgidGVybWluYXRlV29ya2VyMVZpYUNvbGxl Y3Rpb24oKSIpOworICAgICAgICAgICAgYXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wuYXdhaXRDb21t YW5kKHttZXRob2Q6ICJSdW50aW1lLnJlbGVhc2VPYmplY3RHcm91cCIsIHBhcmFtczoge29iamVj dEdyb3VwOiAidGVzdCJ9fSk7CisgICAgICAgICAgICBhd2FpdCBJbnNwZWN0b3JQcm90b2NvbC5h d2FpdENvbW1hbmQoe21ldGhvZDogIkhlYXAuZ2MiLCBwYXJhbXM6IHt9fSk7CisgICAgICAgICAg ICBhd2FpdCB3b3JrZXJUZXJtaW5hdGVkUHJvbWlzZTsKKworICAgICAgICAgICAgUHJvdG9jb2xU ZXN0LnBhc3MoIldvcmtlci53b3JrZXJUZXJtaW5hdGVkIik7CisgICAgICAgICAgICBkdW1wV29y a2VycygpOworCisgICAgICAgICAgICBhd2FpdCBjaGVja0ludGVybmFsUHJvcGVydGllcyhgd29y a2VyMmAsIHt0ZXJtaW5hdGVkOiB0cnVlfSk7CiAgICAgICAgIH0KICAgICB9KTsKIAo= 389988 2020-02-06 13:51:13 -0800 2020-02-06 15:17:16 -0800 Patch bug-207347-20200206135112.patch text/plain 11904 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwZWE1YzA1MjdlNTRkYWYwM2JlY2M5MjgwYTg1N2U5NjExNzc4NTRjLi43 MmIxZmQ2ZGZiNWIzMjk1ZTNhNDQ3ZDRmYmEwY2IzMjJmMmUxODQ1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMjAtMDItMDYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3cgSmF2YVNjcmlwdCBXb3JrZXIgdGVybWlu YXRlZCBzdGF0ZSBhcyBhbiBpbnRlcm5hbCBwcm9wZXJ0eQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3MzQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QnJpYW4gQnVyZy4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3Ivd29ya2VyL3dvcmtlci1jcmVh dGUtYW5kLXRlcm1pbmF0ZS5odG1sCisKKyAgICAgICAgKiBpbnNwZWN0b3IvV2ViSW5qZWN0ZWRT Y3JpcHRIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkluamVjdGVkU2NyaXB0SG9zdDo6 Z2V0SW50ZXJuYWxQcm9wZXJ0aWVzKToKKworICAgICAgICAqIHdvcmtlcnMvV29ya2VyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpXb3JrZXI6Ondhc1Rlcm1pbmF0ZWQpOiBBZGRlZC4KKwogMjAyMC0w Mi0wNiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1NTkxMCwgcjI1NTk3MCwgYW5kIHIyNTU5NzIuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRIb3N0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3Bw CmluZGV4IGZhZGYzYmY4ODdiNmRmODljZDQ4NTBmNWU3N2RhOGNjMTkyODRkYTQuLmQ3NmE0NzBm ZGUxMDFiN2Y1NThhYjg2MzI5NWE1MjFkY2FjMDQ0MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCkBAIC0zMiw2ICszMiw4IEBA CiAjaW5jbHVkZSAiSlNIVE1MQ29sbGVjdGlvbi5oIgogI2luY2x1ZGUgIkpTTm9kZS5oIgogI2lu Y2x1ZGUgIkpTTm9kZUxpc3QuaCIKKyNpbmNsdWRlICJKU1dvcmtlci5oIgorI2luY2x1ZGUgIldv cmtlci5oIgogCiAjaWYgRU5BQkxFKFBBWU1FTlRfUkVRVUVTVCkKICNpbmNsdWRlICJKU1BheW1l bnRSZXF1ZXN0LmgiCkBAIC01OSw3ICs2MSw2IEBAIEpTVmFsdWUgV2ViSW5qZWN0ZWRTY3JpcHRI b3N0OjpzdWJ0eXBlKEpTR2xvYmFsT2JqZWN0KiBleGVjLCBKU1ZhbHVlIHZhbHVlKQogICAgIHJl dHVybiBqc1VuZGVmaW5lZCgpOwogfQogCi0jaWYgRU5BQkxFKFBBWU1FTlRfUkVRVUVTVCkKIHN0 YXRpYyBKU09iamVjdCogY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShWTSYgdm0sIEpTR2xvYmFs T2JqZWN0KiBleGVjLCBjb25zdCBTdHJpbmcmIG5hbWUsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAg YXV0byogb2JqZWN0ID0gY29uc3RydWN0RW1wdHlPYmplY3QoZXhlYyk7CkBAIC02OCw2ICs2OSw3 IEBAIHN0YXRpYyBKU09iamVjdCogY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShWTSYgdm0sIEpT R2xvYmFsT2JqZWN0KiBleGVjLCBjb25zdCBTCiAgICAgcmV0dXJuIG9iamVjdDsKIH0KIAorI2lm IEVOQUJMRShQQVlNRU5UX1JFUVVFU1QpCiBzdGF0aWMgSlNPYmplY3QqIG9iamVjdEZvclBheW1l bnRPcHRpb25zKFZNJiB2bSwgSlNHbG9iYWxPYmplY3QqIGV4ZWMsIGNvbnN0IFBheW1lbnRPcHRp b25zJiBwYXltZW50T3B0aW9ucykKIHsKICAgICBhdXRvKiBvYmplY3QgPSBjb25zdHJ1Y3RFbXB0 eU9iamVjdChleGVjKTsKQEAgLTE2MSw5ICsxNjMsMTcgQEAgc3RhdGljIEpTU3RyaW5nKiBqc1N0 cmluZ0ZvclBheW1lbnRSZXF1ZXN0U3RhdGUoVk0mIHZtLCBQYXltZW50UmVxdWVzdDo6U3RhdGUg c3QKIAogSlNWYWx1ZSBXZWJJbmplY3RlZFNjcmlwdEhvc3Q6OmdldEludGVybmFsUHJvcGVydGll cyhWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBleGVjLCBKU0M6OkpTVmFsdWUgdmFsdWUpCiB7Ci0j aWYgRU5BQkxFKFBBWU1FTlRfUkVRVUVTVCkKICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJP V19TQ09QRSh2bSk7CiAKKyAgICBpZiAoYXV0byogd29ya2VyID0gSlNXb3JrZXI6OnRvV3JhcHBl ZCh2bSwgdmFsdWUpKSB7CisgICAgICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKKyAgICAgICAgYXV0 byogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIG51bGxwdHIpOworICAgICAgICBh cnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9w ZXJ0eSh2bSwgZXhlYywgInRlcm1pbmF0ZWQiX3MsIGpzQm9vbGVhbih3b3JrZXItPndhc1Rlcm1p bmF0ZWQoKSkpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKyAg ICAgICAgcmV0dXJuIGFycmF5OworICAgIH0KKworI2lmIEVOQUJMRShQQVlNRU5UX1JFUVVFU1Qp CiAgICAgaWYgKFBheW1lbnRSZXF1ZXN0KiBwYXltZW50UmVxdWVzdCA9IEpTUGF5bWVudFJlcXVl c3Q6OnRvV3JhcHBlZCh2bSwgdmFsdWUpKSB7CiAgICAgICAgIHVuc2lnbmVkIGluZGV4ID0gMDsK ICAgICAgICAgYXV0byogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIG51bGxwdHIp OwpAQCAtMTczLDEwICsxODMsNiBAQCBKU1ZhbHVlIFdlYkluamVjdGVkU2NyaXB0SG9zdDo6Z2V0 SW50ZXJuYWxQcm9wZXJ0aWVzKFZNJiB2bSwgSlNHbG9iYWxPYmplY3QqIGV4ZQogICAgICAgICBS RVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogICAgICAgICByZXR1cm4gYXJyYXk7CiAg ICAgfQotI2Vsc2UKLSAgICBVTlVTRURfUEFSQU0odm0pOwotICAgIFVOVVNFRF9QQVJBTShleGVj KTsKLSAgICBVTlVTRURfUEFSQU0odmFsdWUpOwogI2VuZGlmCiAKICAgICByZXR1cm4geyB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuaCBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvV29ya2VyLmgKaW5kZXggYjU5ZGQwMWI4NmZmMTcyYjI4N2YyY2E2ZWVjYTlm NzRjMDIwN2RjMS4uNjZjNjhiNWJlNzU2NGExYWM2MmZlZDNkMGRhMzlkNmQwODZmNmEyNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS93b3JrZXJzL1dvcmtlci5oCkBAIC02MSw2ICs2MSw3IEBAIHB1YmxpYzoKICAgICBFeGNl cHRpb25Pcjx2b2lkPiBwb3N0TWVzc2FnZShKU0M6OkpTR2xvYmFsT2JqZWN0JiwgSlNDOjpKU1Zh bHVlIG1lc3NhZ2UsIFBvc3RNZXNzYWdlT3B0aW9ucyYmKTsKIAogICAgIHZvaWQgdGVybWluYXRl KCk7CisgICAgYm9vbCB3YXNUZXJtaW5hdGVkKCkgY29uc3QgeyByZXR1cm4gbV93YXNUZXJtaW5h dGVkOyB9CiAKICAgICBib29sIGhhc1BlbmRpbmdBY3Rpdml0eSgpIGNvbnN0IGZpbmFsOwogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggYjVkNThlYjA5NzUyZTMwNmIwZTlhYTRmMGRkMTFhMGIxNDA1ODI1Ni4uYWY5NDhhZDYx NjdmY2ExOTJmYmMzMDcyM2JiMmM0OGY1Y2EwODg1YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDIwLTAyLTA2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBzaG93IEphdmFTY3JpcHQgV29ya2VyIHRlcm1pbmF0ZWQgc3RhdGUgYXMg YW4gaW50ZXJuYWwgcHJvcGVydHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNzM0NworCisgICAgICAgIFJldmlld2VkIGJ5IEJyaWFuIEJ1cmcuCisK KyAgICAgICAgKiBpbnNwZWN0b3Ivd29ya2VyL3dvcmtlci1jcmVhdGUtYW5kLXRlcm1pbmF0ZS5o dG1sOgorICAgICAgICBBZGQgYXNzZXJ0aW9ucyB0aHJvdWdob3V0IHRoZSB0ZXN0IHRvIGNoZWNr IHRoYXQgdGhlIGB0ZXJtaW5hdGVkYCB2YWx1ZSBtYXRjaGVzIHdoYXQgdGhlCisgICAgICAgIGZy b250ZW5kIGtub3dzLgorCiAyMDIwLTAyLTA2ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVA d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjU1OTEwLCBy MjU1OTcwLCBhbmQgcjI1NTk3Mi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci93 b3JrZXIvd29ya2VyLWNyZWF0ZS1hbmQtdGVybWluYXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3Ivd29ya2VyL3dvcmtlci1jcmVhdGUtYW5kLXRlcm1pbmF0ZS5odG1sCmluZGV4IGIzNTcz YTk3MjMyODBhOGNlYzk1Y2M3OTllYTE4MzkzMmJkOWVlYmYuLjI3MDFiMjJhYmU1MjEzYTlmMTgw YzFkZjdiNzhlNDEzNTRkZmQ2YjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci93 b3JrZXIvd29ya2VyLWNyZWF0ZS1hbmQtdGVybWluYXRlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3dvcmtlci93b3JrZXItY3JlYXRlLWFuZC10ZXJtaW5hdGUuaHRtbApAQCAtNDMs NiArNDMsMzMgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICBQcm90b2NvbFRlc3QubG9n KCJObyBXb3JrZXJzIik7CiAgICAgfQogCisgICAgYXN5bmMgZnVuY3Rpb24gY2hlY2tJbnRlcm5h bFByb3BlcnRpZXMoZXhwcmVzc2lvbiwge3Rlcm1pbmF0ZWR9ID0ge30pIHsKKyAgICAgICAgbGV0 IGV2YWx1YXRlUmVzdWx0ID0gYXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wuYXdhaXRDb21tYW5kKHsK KyAgICAgICAgICAgIG1ldGhvZDogIlJ1bnRpbWUuZXZhbHVhdGUiLAorICAgICAgICAgICAgcGFy YW1zOiB7CisgICAgICAgICAgICAgICAgZXhwcmVzc2lvbiwKKyAgICAgICAgICAgICAgICBvYmpl Y3RHcm91cDogInRlc3QiLAorICAgICAgICAgICAgfSwKKyAgICAgICAgfSk7CisKKyAgICAgICAg UHJvdG9jb2xUZXN0LmFzc2VydChldmFsdWF0ZVJlc3VsdC5yZXN1bHQudHlwZSA9PT0gIm9iamVj dCIsIGBFdmFsdWF0ZSByZXN1bHQgb2YgJyR7ZXhwcmVzc2lvbn0nIHNob3VsZCBoYXZlIHR5cGUg J29iamVjdCcuYCk7CisgICAgICAgIFByb3RvY29sVGVzdC5hc3NlcnQoZXZhbHVhdGVSZXN1bHQu cmVzdWx0LmNsYXNzTmFtZSA9PT0gIldvcmtlciIsIGBFdmFsdWF0ZSByZXN1bHQgb2YgJyR7ZXhw cmVzc2lvbn0nIHNob3VsZCBoYXZlIGNsYXNzTmFtZSAnV29ya2VyJy5gKTsKKworICAgICAgICBs ZXQgZ2V0UHJvcGVydGllc1Jlc3VsdCA9IGF3YWl0IEluc3BlY3RvclByb3RvY29sLmF3YWl0Q29t bWFuZCh7CisgICAgICAgICAgICBtZXRob2Q6ICJSdW50aW1lLmdldFByb3BlcnRpZXMiLAorICAg ICAgICAgICAgcGFyYW1zOiB7CisgICAgICAgICAgICAgICAgb2JqZWN0SWQ6IGV2YWx1YXRlUmVz dWx0LnJlc3VsdC5vYmplY3RJZCwKKyAgICAgICAgICAgIH0sCisgICAgICAgIH0pOworCisgICAg ICAgIGxldCBpbnRlcm5hbFByb3BlcnRpZXMgPSBnZXRQcm9wZXJ0aWVzUmVzdWx0LmludGVybmFs UHJvcGVydGllczsKKyAgICAgICAgUHJvdG9jb2xUZXN0LmFzc2VydChpbnRlcm5hbFByb3BlcnRp ZXMubGVuZ3RoID09PSAxLCBgV29ya2VyICcke2V4cHJlc3Npb259JyBzaG91bGQgb25seSBoYXZl IG9uZSBpbnRlcm5hbCBwcm9wZXJ0eS5gKTsKKworICAgICAgICBQcm90b2NvbFRlc3QuYXNzZXJ0 KGludGVybmFsUHJvcGVydGllc1swXS5uYW1lID09PSAidGVybWluYXRlZCIsIGBXb3JrZXIgJyR7 ZXhwcmVzc2lvbn0nIHNob3VsZCBoYXZlICd0ZXJtaW5hdGVkJyBpbnRlcm5hbCBwcm9wZXJ0eS5g KTsKKyAgICAgICAgUHJvdG9jb2xUZXN0LmFzc2VydChpbnRlcm5hbFByb3BlcnRpZXNbMF0udmFs dWUudHlwZSA9PT0gImJvb2xlYW4iLCBgSW50ZXJuYWwgJ3Rlcm1pbmF0ZWQnIHByb3BlcnR5IG9m ICcke2V4cHJlc3Npb259JyBzaG91bGQgYmUgYSBib29sZWFuLmApOworICAgICAgICBQcm90b2Nv bFRlc3QuYXNzZXJ0KGludGVybmFsUHJvcGVydGllc1swXS52YWx1ZS52YWx1ZSA9PT0gdGVybWlu YXRlZCwgYEludGVybmFsICd0ZXJtaW5hdGVkJyBwcm9wZXJ0eSBvZiAnJHtleHByZXNzaW9ufScg c2hvdWxkIGhhdmUgdmFsdWUgJyR7dGVybWluYXRlZH0nLmApOworICAgIH0KKwogCiAgICAgbGV0 IHRyaWdnZXJOZXh0Q3JlYXRlOwogICAgIGxldCB0cmlnZ2VyTmV4dFRlcm1pbmF0ZTsKQEAgLTc4 LDcwICsxMDUsOTIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgc3VpdGUuYWRkVGVzdENhc2Uoewog ICAgICAgICBuYW1lOiAiV29ya2VyLmVuYWJsZSIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiV29y a2VyLmVuYWJsZSBpbmZvcm1zIHRoZSBmcm9udGVuZCBvZiB0aGUgdHdvIGV4aXN0aW5nIFdvcmtl cnMiLAotICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewotICAgICAgICAgICAgSW5zcGVj dG9yUHJvdG9jb2wuYXdhaXRDb21tYW5kKHttZXRob2Q6ICJXb3JrZXIuZW5hYmxlIiwgcGFyYW1z OiB7fX0pCi0gICAgICAgICAgICAgICAgLnRoZW4oKCkgPT4gewotICAgICAgICAgICAgICAgICAg ICBQcm90b2NvbFRlc3QuZXhwZWN0RXF1YWwod29ya2Vycy5sZW5ndGgsIDIsICJTaG91bGQgYmUg aW5mb3JtZWQgb2YgdHdvIGV4aXN0aW5nIFdvcmtlcnMuIik7Ci0gICAgICAgICAgICAgICAgICAg IGR1bXBXb3JrZXJzKCk7Ci0gICAgICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKLSAgICAgICAg ICAgICAgICB9KS5jYXRjaChyZWplY3QpOworICAgICAgICBhc3luYyB0ZXN0KCkgeworICAgICAg ICAgICAgYXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wuYXdhaXRDb21tYW5kKHttZXRob2Q6ICJXb3Jr ZXIuZW5hYmxlIiwgcGFyYW1zOiB7fX0pOworCisgICAgICAgICAgICBQcm90b2NvbFRlc3QuZXhw ZWN0RXF1YWwod29ya2Vycy5sZW5ndGgsIDIsICJTaG91bGQgYmUgaW5mb3JtZWQgb2YgdHdvIGV4 aXN0aW5nIFdvcmtlcnMuIik7CisgICAgICAgICAgICBkdW1wV29ya2VycygpOworCisgICAgICAg ICAgICBhd2FpdCBQcm9taXNlLmFsbChbCisgICAgICAgICAgICAgICAgY2hlY2tJbnRlcm5hbFBy b3BlcnRpZXMoYHdvcmtlcjFgLCB7dGVybWluYXRlZDogZmFsc2V9KSwKKyAgICAgICAgICAgICAg ICBjaGVja0ludGVybmFsUHJvcGVydGllcyhgd29ya2VyMmAsIHt0ZXJtaW5hdGVkOiBmYWxzZX0p LAorICAgICAgICAgICAgXSk7CiAgICAgICAgIH0KICAgICB9KTsKIAogICAgIHN1aXRlLmFkZFRl c3RDYXNlKHsKICAgICAgICAgbmFtZTogIldvcmtlci53b3JrZXJDcmVhdGVkIiwKICAgICAgICAg ZGVzY3JpcHRpb246ICJTaG91bGQgcmVjZWl2ZSBhIFdvcmtlci53b3JrZXJDcmVhdGVkIGV2ZW50 IHdoZW4gY3JlYXRpbmcgYSBXb3JrZXIuIiwKLSAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3Qp IHsKLSAgICAgICAgICAgIFByb3RvY29sVGVzdC5ldmFsdWF0ZUluUGFnZSgiY3JlYXRlV29ya2Vy MygpIik7Ci0gICAgICAgICAgICB3YWl0Rm9yV29ya2VyQ3JlYXRlZEV2ZW50KCkKLSAgICAgICAg ICAgICAgICAudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5w YXNzKCJXb3JrZXIud29ya2VyQ3JlYXRlZCIpOwotICAgICAgICAgICAgICAgICAgICBkdW1wV29y a2VycygpOwotICAgICAgICAgICAgICAgICAgICByZXNvbHZlKCk7Ci0gICAgICAgICAgICAgICAg fSkuY2F0Y2gocmVqZWN0KTsKKyAgICAgICAgYXN5bmMgdGVzdCgpIHsKKyAgICAgICAgICAgIGF3 YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yV29ya2VyQ3JlYXRlZEV2 ZW50KCksCisgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0LmV2YWx1YXRlSW5QYWdlKCJjcmVh dGVXb3JrZXIzKCkiKSwKKyAgICAgICAgICAgIF0pOworCisgICAgICAgICAgICBQcm90b2NvbFRl c3QucGFzcygiV29ya2VyLndvcmtlckNyZWF0ZWQiKTsKKyAgICAgICAgICAgIGR1bXBXb3JrZXJz KCk7CisKKyAgICAgICAgICAgIGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICBj aGVja0ludGVybmFsUHJvcGVydGllcyhgd29ya2VyMWAsIHt0ZXJtaW5hdGVkOiBmYWxzZX0pLAor ICAgICAgICAgICAgICAgIGNoZWNrSW50ZXJuYWxQcm9wZXJ0aWVzKGB3b3JrZXIyYCwge3Rlcm1p bmF0ZWQ6IGZhbHNlfSksCisgICAgICAgICAgICAgICAgY2hlY2tJbnRlcm5hbFByb3BlcnRpZXMo YHdvcmtlcjNgLCB7dGVybWluYXRlZDogZmFsc2V9KSwKKyAgICAgICAgICAgIF0pOwogICAgICAg ICB9CiAgICAgfSk7CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJX b3JrZXIud29ya2VyVGVybWluYXRlZC5QYWdlIiwKICAgICAgICAgZGVzY3JpcHRpb246ICJTaG91 bGQgcmVjZWl2ZSBhIFdvcmtlci53b3JrZXJUZXJtaW5hdGVkIGV2ZW50IHdoZW4gdGVybWluYXRp bmcgYSBXb3JrZXIgZnJvbSB0aGUgUGFnZS4iLAotICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVj dCkgewotICAgICAgICAgICAgUHJvdG9jb2xUZXN0LmV2YWx1YXRlSW5QYWdlKCJ0ZXJtaW5hdGVX b3JrZXIyRnJvbVBhZ2UoKSIpOwotICAgICAgICAgICAgd2FpdEZvcldvcmtlclRlcm1pbmF0ZWRF dmVudCgpCi0gICAgICAgICAgICAgICAgLnRoZW4oKCkgPT4gewotICAgICAgICAgICAgICAgICAg ICBQcm90b2NvbFRlc3QucGFzcygiV29ya2VyLndvcmtlclRlcm1pbmF0ZWQiKTsKLSAgICAgICAg ICAgICAgICAgICAgZHVtcFdvcmtlcnMoKTsKLSAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgp OwotICAgICAgICAgICAgICAgIH0pLmNhdGNoKHJlamVjdCk7CisgICAgICAgIGFzeW5jIHRlc3Qo KSB7CisgICAgICAgICAgICBhd2FpdCBQcm9taXNlLmFsbChbCisgICAgICAgICAgICAgICAgd2Fp dEZvcldvcmtlclRlcm1pbmF0ZWRFdmVudCgpLAorICAgICAgICAgICAgICAgIFByb3RvY29sVGVz dC5ldmFsdWF0ZUluUGFnZSgidGVybWluYXRlV29ya2VyMkZyb21QYWdlKCkiKSwKKyAgICAgICAg ICAgIF0pOworCisgICAgICAgICAgICBQcm90b2NvbFRlc3QucGFzcygiV29ya2VyLndvcmtlclRl cm1pbmF0ZWQiKTsKKyAgICAgICAgICAgIGR1bXBXb3JrZXJzKCk7CisKKyAgICAgICAgICAgIGF3 YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICBjaGVja0ludGVybmFsUHJvcGVydGll cyhgd29ya2VyMWAsIHt0ZXJtaW5hdGVkOiBmYWxzZX0pLAorICAgICAgICAgICAgICAgIGNoZWNr SW50ZXJuYWxQcm9wZXJ0aWVzKGB3b3JrZXIyYCwge3Rlcm1pbmF0ZWQ6IHRydWV9KSwKKyAgICAg ICAgICAgICAgICBjaGVja0ludGVybmFsUHJvcGVydGllcyhgd29ya2VyM2AsIHt0ZXJtaW5hdGVk OiBmYWxzZX0pLAorICAgICAgICAgICAgXSk7CiAgICAgICAgIH0KICAgICB9KTsKIAogICAgIHN1 aXRlLmFkZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTogIldvcmtlci53b3JrZXJUZXJtaW5hdGVk LldvcmtlciIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiU2hvdWxkIHJlY2VpdmUgYSBXb3JrZXIu d29ya2VyVGVybWluYXRlZCBldmVudCB3aGVuIHRlcm1pbmF0aW5nIGEgV29ya2VyIGZyb20gdGhl IFdvcmtlci4iLAotICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewotICAgICAgICAgICAg UHJvdG9jb2xUZXN0LmV2YWx1YXRlSW5QYWdlKCJ0ZXJtaW5hdGVXb3JrZXIzRnJvbVdvcmtlcigp Iik7Ci0gICAgICAgICAgICB3YWl0Rm9yV29ya2VyVGVybWluYXRlZEV2ZW50KCkKLSAgICAgICAg ICAgICAgICAudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5w YXNzKCJXb3JrZXIud29ya2VyVGVybWluYXRlZCIpOwotICAgICAgICAgICAgICAgICAgICBkdW1w V29ya2VycygpOwotICAgICAgICAgICAgICAgICAgICByZXNvbHZlKCk7Ci0gICAgICAgICAgICAg ICAgfSkuY2F0Y2gocmVqZWN0KTsKKyAgICAgICAgYXN5bmMgdGVzdCgpIHsKKyAgICAgICAgICAg IGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yV29ya2VyVGVybWlu YXRlZEV2ZW50KCksCisgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0LmV2YWx1YXRlSW5QYWdl KCJ0ZXJtaW5hdGVXb3JrZXIzRnJvbVdvcmtlcigpIiksCisgICAgICAgICAgICBdKTsKKworICAg ICAgICAgICAgUHJvdG9jb2xUZXN0LnBhc3MoIldvcmtlci53b3JrZXJUZXJtaW5hdGVkIik7Cisg ICAgICAgICAgICBkdW1wV29ya2VycygpOworCisgICAgICAgICAgICBhd2FpdCBQcm9taXNlLmFs bChbCisgICAgICAgICAgICAgICAgY2hlY2tJbnRlcm5hbFByb3BlcnRpZXMoYHdvcmtlcjFgLCB7 dGVybWluYXRlZDogZmFsc2V9KSwKKyAgICAgICAgICAgICAgICBjaGVja0ludGVybmFsUHJvcGVy dGllcyhgd29ya2VyMmAsIHt0ZXJtaW5hdGVkOiB0cnVlfSksCisgICAgICAgICAgICBdKTsKICAg ICAgICAgfQogICAgIH0pOwogCiAgICAgc3VpdGUuYWRkVGVzdENhc2UoewogICAgICAgICBuYW1l OiAiV29ya2VyLndvcmtlclRlcm1pbmF0ZWQuR0MiLAogICAgICAgICBkZXNjcmlwdGlvbjogIlNo b3VsZCByZWNlaXZlIGEgV29ya2VyLndvcmtlclRlcm1pbmF0ZWQgZXZlbnQgd2hlbiB0ZXJtaW5h dGluZyBhIFdvcmtlciB2aWEgR2FyYmFnZSBDb2xsZWN0aW9uLiIsCi0gICAgICAgIHRlc3QocmVz b2x2ZSwgcmVqZWN0KSB7Ci0gICAgICAgICAgICBQcm90b2NvbFRlc3QuZXZhbHVhdGVJblBhZ2Uo InRlcm1pbmF0ZVdvcmtlcjFWaWFDb2xsZWN0aW9uKCkiKTsKLSAgICAgICAgICAgIEluc3BlY3Rv clByb3RvY29sLnNlbmRDb21tYW5kKCJIZWFwLmdjIiwge30pOwotICAgICAgICAgICAgd2FpdEZv cldvcmtlclRlcm1pbmF0ZWRFdmVudCgpCi0gICAgICAgICAgICAgICAgLnRoZW4oKCkgPT4gewot ICAgICAgICAgICAgICAgICAgICBQcm90b2NvbFRlc3QucGFzcygiV29ya2VyLndvcmtlclRlcm1p bmF0ZWQiKTsKLSAgICAgICAgICAgICAgICAgICAgZHVtcFdvcmtlcnMoKTsKLSAgICAgICAgICAg ICAgICAgICAgcmVzb2x2ZSgpOwotICAgICAgICAgICAgICAgIH0pLmNhdGNoKHJlamVjdCk7Cisg ICAgICAgIGFzeW5jIHRlc3QoKSB7CisgICAgICAgICAgICBsZXQgd29ya2VyVGVybWluYXRlZFBy b21pc2UgPSB3YWl0Rm9yV29ya2VyVGVybWluYXRlZEV2ZW50KCk7CisgICAgICAgICAgICBhd2Fp dCBQcm90b2NvbFRlc3QuZXZhbHVhdGVJblBhZ2UoInRlcm1pbmF0ZVdvcmtlcjFWaWFDb2xsZWN0 aW9uKCkiKTsKKyAgICAgICAgICAgIGF3YWl0IEluc3BlY3RvclByb3RvY29sLmF3YWl0Q29tbWFu ZCh7bWV0aG9kOiAiUnVudGltZS5yZWxlYXNlT2JqZWN0R3JvdXAiLCBwYXJhbXM6IHtvYmplY3RH cm91cDogInRlc3QifX0pOworICAgICAgICAgICAgYXdhaXQgSW5zcGVjdG9yUHJvdG9jb2wuYXdh aXRDb21tYW5kKHttZXRob2Q6ICJIZWFwLmdjIiwgcGFyYW1zOiB7fX0pOworICAgICAgICAgICAg YXdhaXQgd29ya2VyVGVybWluYXRlZFByb21pc2U7CisKKyAgICAgICAgICAgIFByb3RvY29sVGVz dC5wYXNzKCJXb3JrZXIud29ya2VyVGVybWluYXRlZCIpOworICAgICAgICAgICAgZHVtcFdvcmtl cnMoKTsKKworICAgICAgICAgICAgYXdhaXQgY2hlY2tJbnRlcm5hbFByb3BlcnRpZXMoYHdvcmtl cjJgLCB7dGVybWluYXRlZDogdHJ1ZX0pOwogICAgICAgICB9CiAgICAgfSk7CiAK