208185 2020-02-25 01:15:12 -0800 New service worker API 'FetchEvent.handled' needs to be supported 2022-01-12 01:45:38 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/web-platform-tests/wpt/pull/32311 InRadar P2 Normal --- 1 ting.shao youennf cdumez clopez esprehn+autocc ews-watchlist kondapallykalyan philip webkit-bug-importer youennf oldest_to_newest 1622533 0 ting.shao 2020-02-25 01:15:12 -0800 'FetchEvent.handled' is a new service worker API which is added in spec as following: spec: https://w3c.github.io/ServiceWorker/#fetch-event-handled spec PR: https://github.com/w3c/ServiceWorker/pull/1496 wpt: https://github.com/web-platform-tests/wpt/pull/21652 It's good to support this as it notifies developers when fetch event is processed. 1623038 1 webkit-bug-importer 2020-02-26 09:45:12 -0800 <rdar://problem/59808975> 1828866 2 philip 2022-01-07 03:56:23 -0800 Note that this is support in Chrome and Firefox since late 2020: https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent#browser_compatibility 1829503 3 448760 youennf 2022-01-10 09:39:31 -0800 Created attachment 448760 Patch 1829504 4 youennf 2022-01-10 09:39:43 -0800 Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/32311 1829507 5 ews-watchlist 2022-01-10 09:41:46 -0800 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1829801 6 448760 cdumez 2022-01-11 07:45:32 -0800 Comment on attachment 448760 Patch r=me 1830044 7 ews-feeder 2022-01-12 01:45:35 -0800 Committed r287915 (245948@main): <https://commits.webkit.org/245948@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448760. 448760 2022-01-10 09:39:31 -0800 2022-01-12 01:45:36 -0800 Patch bug-208185-20220110183929.patch text/plain 17785 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU3YzM2MzgwN2RjZmRk YTNkNDRmYzA0ODM5ZmRhMmM3MjgxOThkNi4uZjdiYTAyNzkyMDMwZmFhZTcxMmRlNzNkYWYwNGNj YzFhYmQ3MGNjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAxLTEwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBOZXcgc2VydmljZSB3b3Jr ZXIgQVBJICdGZXRjaEV2ZW50LmhhbmRsZWQnIG5lZWRzIHRvIGJlIHN1cHBvcnRlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4MTg1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81OTgwODk3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFeHBvc2UgRmV0Y2hFdmVudC5oYW5kbGVkIGFuZCByZXNvbHZl L3JlamVjdCBpdCBhcyBwZXIgc3BlY2lmaWNhdGlvbi4KKworICAgICAgICBDb3ZlcmVkIGJ5IHRl c3QgdGhhdCB3ZSB1cGRhdGUgdG8gbm90IHJlbHkgb24gY2xpZW50SWRzIHRoYXQgd2UgZG8gbm90 IHN1cHBvcnQgdmVyeSB3ZWxsLgorCisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL0ZldGNoRXZl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmV0Y2hFdmVudDo6Y3JlYXRlRm9yVGVzdGluZyk6 CisgICAgICAgIChXZWJDb3JlOjpyZXRyaWV2ZUhhbmRsZWRQcm9taXNlKToKKyAgICAgICAgKFdl YkNvcmU6OkZldGNoRXZlbnQ6OkZldGNoRXZlbnQpOgorICAgICAgICAqIHdvcmtlcnMvc2Vydmlj ZS9GZXRjaEV2ZW50Lmg6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL0ZldGNoRXZlbnQuaWRs OgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJGZXRjaC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyRmV0Y2g6OnByb2Nlc3NSZXNwb25z ZSk6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyRmV0Y2g6OmRpc3BhdGNoRmV0Y2hF dmVudCk6CisKIDIwMjItMDEtMTAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIEVuZm9yY2UgZm9jdXMgY2hlY2sgZm9yIGdldFVzZXJNZWRpYQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL0ZldGNoRXZlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL0ZldGNoRXZlbnQuY3BwCmluZGV4IDZjZjQ2OTlmNzEz YmJmOGRlMDQ4OGVmNTIzZDAyZTQ3NTRiYjUyMmQuLjQ3YmUyYWUwMmNiM2VkNDY3YmE3ZjlmYThl NDZhZGRiNDM4YmY4NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vydmlj ZS9GZXRjaEV2ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvRmV0 Y2hFdmVudC5jcHAKQEAgLTQyLDE1ICs0MiwyOCBAQCBSZWY8RmV0Y2hFdmVudD4gRmV0Y2hFdmVu dDo6Y3JlYXRlRm9yVGVzdGluZyhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KQogewog ICAgIEZldGNoRXZlbnQ6OkluaXQgaW5pdDsKICAgICBpbml0LnJlcXVlc3QgPSBGZXRjaFJlcXVl c3Q6OmNyZWF0ZShjb250ZXh0LCB7IH0sIEZldGNoSGVhZGVyczo6Y3JlYXRlKEZldGNoSGVhZGVy czo6R3VhcmQ6OkltbXV0YWJsZSwgeyB9KSwgeyB9LCB7IH0sIHsgfSk7Ci0gICAgcmV0dXJuIEZl dGNoRXZlbnQ6OmNyZWF0ZSgiZmV0Y2giLCBXVEZNb3ZlKGluaXQpLCBFdmVudDo6SXNUcnVzdGVk OjpZZXMpOworICAgIHJldHVybiBGZXRjaEV2ZW50OjpjcmVhdGUoKmNvbnRleHQuZ2xvYmFsT2Jq ZWN0KCksICJmZXRjaCIsIFdURk1vdmUoaW5pdCksIEV2ZW50OjpJc1RydXN0ZWQ6Olllcyk7CiB9 CiAKLUZldGNoRXZlbnQ6OkZldGNoRXZlbnQoY29uc3QgQXRvbVN0cmluZyYgdHlwZSwgSW5pdCYm IGluaXRpYWxpemVyLCBJc1RydXN0ZWQgaXNUcnVzdGVkKQorc3RhdGljIGlubGluZSBSZWY8RE9N UHJvbWlzZT4gcmV0cmlldmVIYW5kbGVkUHJvbWlzZShKU0M6OkpTR2xvYmFsT2JqZWN0JiBnbG9i YWxPYmplY3QsIFJlZlB0cjxET01Qcm9taXNlPiYmIHByb21pc2UpCit7CisgICAgaWYgKHByb21p c2UpCisgICAgICAgIHJldHVybiBwcm9taXNlLnJlbGVhc2VOb25OdWxsKCk7CisKKyAgICBKU0M6 OkpTTG9ja0hvbGRlciBsb2NrKGdsb2JhbE9iamVjdC52bSgpKTsKKworICAgIGF1dG8mIGpzRE9N R2xvYmFsT2JqZWN0ID0gKkpTQzo6anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oJmdsb2JhbE9i amVjdCk7CisgICAgYXV0byBkZWZlcnJlZFByb21pc2UgPSBEZWZlcnJlZFByb21pc2U6OmNyZWF0 ZShqc0RPTUdsb2JhbE9iamVjdCk7CisgICAgcmV0dXJuIERPTVByb21pc2U6OmNyZWF0ZShqc0RP TUdsb2JhbE9iamVjdCwgKkpTQzo6anNDYXN0PEpTQzo6SlNQcm9taXNlKj4oZGVmZXJyZWRQcm9t aXNlLT5wcm9taXNlKCkpKTsKK30KKworRmV0Y2hFdmVudDo6RmV0Y2hFdmVudChKU0M6OkpTR2xv YmFsT2JqZWN0JiBnbG9iYWxPYmplY3QsIGNvbnN0IEF0b21TdHJpbmcmIHR5cGUsIEluaXQmJiBp bml0aWFsaXplciwgSXNUcnVzdGVkIGlzVHJ1c3RlZCkKICAgICA6IEV4dGVuZGFibGVFdmVudCh0 eXBlLCBpbml0aWFsaXplciwgaXNUcnVzdGVkKQogICAgICwgbV9yZXF1ZXN0KGluaXRpYWxpemVy LnJlcXVlc3QucmVsZWFzZU5vbk51bGwoKSkKICAgICAsIG1fY2xpZW50SWQoV1RGTW92ZShpbml0 aWFsaXplci5jbGllbnRJZCkpCiAgICAgLCBtX3Jlc2VydmVkQ2xpZW50SWQoV1RGTW92ZShpbml0 aWFsaXplci5yZXNlcnZlZENsaWVudElkKSkKICAgICAsIG1fdGFyZ2V0Q2xpZW50SWQoV1RGTW92 ZShpbml0aWFsaXplci50YXJnZXRDbGllbnRJZCkpCisgICAgLCBtX2hhbmRsZWQocmV0cmlldmVI YW5kbGVkUHJvbWlzZShnbG9iYWxPYmplY3QsIFdURk1vdmUoaW5pdGlhbGl6ZXIuaGFuZGxlZCkp KQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvRmV0 Y2hFdmVudC5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL0ZldGNoRXZlbnQuaApp bmRleCA4ZjdhYWY1N2I0ZmIzMjIyNWYzODM3NWQzY2QwOWZmNzBhNjRkMmY0Li4xY2Q0NjE2ZWYz NDQ1M2VjY2JlYmYwYzYxYjY0ZTZkOGI1ODkwNzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2UvRmV0Y2hFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9GZXRjaEV2ZW50LmgKQEAgLTMzLDggKzMzLDEzIEBACiAjaW5jbHVkZSA8d3Rm L0NvbXBsZXRpb25IYW5kbGVyLmg+CiAjaW5jbHVkZSA8d3RmL0V4cGVjdGVkLmg+CiAKK25hbWVz cGFjZSBKU0MgeworY2xhc3MgSlNHbG9iYWxPYmplY3Q7Cit9CisKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAorY2xhc3MgRE9NUHJvbWlzZTsKIGNsYXNzIEZldGNoUmVzcG9uc2U7CiBjbGFzcyBSZXNv dXJjZUVycm9yOwogCkBAIC00NiwxMyArNTEsMTQgQEAgcHVibGljOgogICAgICAgICBTdHJpbmcg Y2xpZW50SWQ7CiAgICAgICAgIFN0cmluZyByZXNlcnZlZENsaWVudElkOwogICAgICAgICBTdHJp bmcgdGFyZ2V0Q2xpZW50SWQ7CisgICAgICAgIFJlZlB0cjxET01Qcm9taXNlPiBoYW5kbGVkOwog ICAgIH07CiAKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgUmVmPEZldGNoRXZlbnQ+IGNyZWF0 ZUZvclRlc3RpbmcoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYpOwogCi0gICAgc3RhdGljIFJlZjxG ZXRjaEV2ZW50PiBjcmVhdGUoY29uc3QgQXRvbVN0cmluZyYgdHlwZSwgSW5pdCYmIGluaXRpYWxp emVyLCBJc1RydXN0ZWQgaXNUcnVzdGVkID0gSXNUcnVzdGVkOjpObykKKyAgICBzdGF0aWMgUmVm PEZldGNoRXZlbnQ+IGNyZWF0ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiBnbG9iYWxPYmplY3QsIGNv bnN0IEF0b21TdHJpbmcmIHR5cGUsIEluaXQmJiBpbml0aWFsaXplciwgSXNUcnVzdGVkIGlzVHJ1 c3RlZCA9IElzVHJ1c3RlZDo6Tm8pCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5l dyBGZXRjaEV2ZW50KHR5cGUsIFdURk1vdmUoaW5pdGlhbGl6ZXIpLCBpc1RydXN0ZWQpKTsKKyAg ICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgRmV0Y2hFdmVudChnbG9iYWxPYmplY3QsIHR5cGUs IFdURk1vdmUoaW5pdGlhbGl6ZXIpLCBpc1RydXN0ZWQpKTsKICAgICB9CiAgICAgfkZldGNoRXZl bnQoKTsKIApAQCAtNjcsNiArNzMsNyBAQCBwdWJsaWM6CiAgICAgY29uc3QgU3RyaW5nJiBjbGll bnRJZCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50SWQ7IH0KICAgICBjb25zdCBTdHJpbmcmIHJl c2VydmVkQ2xpZW50SWQoKSBjb25zdCB7IHJldHVybiBtX3Jlc2VydmVkQ2xpZW50SWQ7IH0KICAg ICBjb25zdCBTdHJpbmcmIHRhcmdldENsaWVudElkKCkgY29uc3QgeyByZXR1cm4gbV90YXJnZXRD bGllbnRJZDsgfQorICAgIERPTVByb21pc2UmIGhhbmRsZWQoKSBjb25zdCB7IHJldHVybiBtX2hh bmRsZWQuZ2V0KCk7IH0KIAogICAgIGJvb2wgcmVzcG9uZFdpdGhFbnRlcmVkKCkgY29uc3QgeyBy ZXR1cm4gbV9yZXNwb25kV2l0aEVudGVyZWQ7IH0KIApAQCAtNzgsNyArODUsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBzZXROYXZpZ2F0aW9uUHJlbG9hZElkZW50aWZpZXIoRmV0Y2hJZGVudGlmaWVy KTsKIAogcHJpdmF0ZToKLSAgICBXRUJDT1JFX0VYUE9SVCBGZXRjaEV2ZW50KGNvbnN0IEF0b21T dHJpbmcmLCBJbml0JiYsIElzVHJ1c3RlZCk7CisgICAgV0VCQ09SRV9FWFBPUlQgRmV0Y2hFdmVu dChKU0M6OkpTR2xvYmFsT2JqZWN0JiwgY29uc3QgQXRvbVN0cmluZyYsIEluaXQmJiwgSXNUcnVz dGVkKTsKIAogICAgIHZvaWQgcHJvbWlzZUlzU2V0dGxlZCgpOwogICAgIHZvaWQgcHJvY2Vzc1Jl c3BvbnNlKEV4cGVjdGVkPFJlZjxGZXRjaFJlc3BvbnNlPiwgc3RkOjpvcHRpb25hbDxSZXNvdXJj ZUVycm9yPj4mJik7CkBAIC05Myw2ICsxMDAsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV93YWl0 VG9SZXNwb25kIHsgZmFsc2UgfTsKICAgICBib29sIG1fcmVzcG9uZFdpdGhFcnJvciB7IGZhbHNl IH07CiAgICAgUmVmUHRyPERPTVByb21pc2U+IG1fcmVzcG9uZFByb21pc2U7CisgICAgUmVmPERP TVByb21pc2U+IG1faGFuZGxlZDsKIAogICAgIFJlc3BvbnNlQ2FsbGJhY2sgbV9vblJlc3BvbnNl OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvRmV0Y2hFdmVu dC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvRmV0Y2hFdmVudC5pZGwKaW5k ZXggOTczNzU5MDZkZjBmNGMwZWExNThjYWQ2OTdjOTQ2YjNmYjdlZjJlNy4uOTYwNjVjNjg4MzQ4 MmIyMDhkZTg0MzQ3ZjQ3ZmRiYjg0MjU3ODExMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv d29ya2Vycy9zZXJ2aWNlL0ZldGNoRXZlbnQuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9GZXRjaEV2ZW50LmlkbApAQCAtMzEsMTIgKzMxLDEzIEBACiAgICAgRXhwb3Nl ZD1TZXJ2aWNlV29ya2VyLAogICAgIEpTR2VuZXJhdGVUb05hdGl2ZU9iamVjdAogXSBpbnRlcmZh Y2UgRmV0Y2hFdmVudCA6IEV4dGVuZGFibGVFdmVudCB7Ci0gICAgY29uc3RydWN0b3IoRE9NU3Ry aW5nIHR5cGUsIEZldGNoRXZlbnRJbml0IGV2ZW50SW5pdERpY3QpOworICAgIFtDYWxsV2l0aD1H bG9iYWxPYmplY3RdIGNvbnN0cnVjdG9yKERPTVN0cmluZyB0eXBlLCBGZXRjaEV2ZW50SW5pdCBl dmVudEluaXREaWN0KTsKICAgICBbU2FtZU9iamVjdF0gcmVhZG9ubHkgYXR0cmlidXRlIEZldGNo UmVxdWVzdCByZXF1ZXN0OwogICAgIFtDYWxsV2l0aD1TY3JpcHRFeGVjdXRpb25Db250ZXh0LCBF bmFibGVkQnlTZXR0aW5nPVNlcnZpY2VXb3JrZXJOYXZpZ2F0aW9uUHJlbG9hZEVuYWJsZWRdIHJl YWRvbmx5IGF0dHJpYnV0ZSBQcm9taXNlPGFueT4gcHJlbG9hZFJlc3BvbnNlOwogICAgIHJlYWRv bmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgY2xpZW50SWQ7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRl IERPTVN0cmluZyByZXNlcnZlZENsaWVudElkOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01T dHJpbmcgdGFyZ2V0Q2xpZW50SWQ7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIFByb21pc2U8dW5k ZWZpbmVkPiBoYW5kbGVkOwogCiAgICAgdW5kZWZpbmVkIHJlc3BvbmRXaXRoKFByb21pc2U8RmV0 Y2hSZXNwb25zZT4gcik7CiB9OwpAQCAtNDYsNCArNDcsNSBAQCBkaWN0aW9uYXJ5IEZldGNoRXZl bnRJbml0IDogRXh0ZW5kYWJsZUV2ZW50SW5pdCB7CiAgICAgRE9NU3RyaW5nIGNsaWVudElkID0g IiI7CiAgICAgRE9NU3RyaW5nIHJlc2VydmVkQ2xpZW50SWQgPSAiIjsKICAgICBET01TdHJpbmcg dGFyZ2V0Q2xpZW50SWQgPSAiIjsKKyAgICBQcm9taXNlPHVuZGVmaW5lZD4gaGFuZGxlZDsKIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyRmV0Y2guY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRl eHQvU2VydmljZVdvcmtlckZldGNoLmNwcAppbmRleCA5ZDlhY2Q2NGExNjIxODRkY2MxMmE0ZDQ0 M2ViZTAwMmE2NTJiNmI0Li42ZDJmMWU2YTZkZDE5MTVkZWU1MWFmYWFhYzU2ZTkxZTExOTM2Mjdi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyRmV0Y2guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9j b250ZXh0L1NlcnZpY2VXb3JrZXJGZXRjaC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRl ICJGZXRjaEV2ZW50LmgiCiAjaW5jbHVkZSAiRmV0Y2hSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiRmV0 Y2hSZXNwb25zZS5oIgorI2luY2x1ZGUgIkpTRE9NUHJvbWlzZS5oIgogI2luY2x1ZGUgIk1JTUVU eXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlICJT Y3JpcHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllci5oIgpAQCAtNjQsMTUgKzY1LDE3IEBAIHN0 YXRpYyBpbmxpbmUgUmVzb3VyY2VFcnJvciB2YWxpZGF0ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNl UmVzcG9uc2UmIHJlc3BvbnNlLCBGCiAgICAgcmV0dXJuIHsgfTsKIH0KIAotc3RhdGljIHZvaWQg cHJvY2Vzc1Jlc3BvbnNlKFJlZjxDbGllbnQ+JiYgY2xpZW50LCBFeHBlY3RlZDxSZWY8RmV0Y2hS ZXNwb25zZT4sIHN0ZDo6b3B0aW9uYWw8UmVzb3VyY2VFcnJvcj4+JiYgcmVzdWx0LCBGZXRjaE9w dGlvbnM6Ok1vZGUgbW9kZSwgRmV0Y2hPcHRpb25zOjpSZWRpcmVjdCByZWRpcmVjdCwgY29uc3Qg VVJMJiByZXF1ZXN0VVJMLCBDZXJ0aWZpY2F0ZUluZm8mJiBjZXJ0aWZpY2F0ZUluZm8pCitzdGF0 aWMgdm9pZCBwcm9jZXNzUmVzcG9uc2UoUmVmPENsaWVudD4mJiBjbGllbnQsIEV4cGVjdGVkPFJl ZjxGZXRjaFJlc3BvbnNlPiwgc3RkOjpvcHRpb25hbDxSZXNvdXJjZUVycm9yPj4mJiByZXN1bHQs IEZldGNoT3B0aW9uczo6TW9kZSBtb2RlLCBGZXRjaE9wdGlvbnM6OlJlZGlyZWN0IHJlZGlyZWN0 LCBjb25zdCBVUkwmIHJlcXVlc3RVUkwsIENlcnRpZmljYXRlSW5mbyYmIGNlcnRpZmljYXRlSW5m bywgRGVmZXJyZWRQcm9taXNlJiBwcm9taXNlKQogewogICAgIGlmICghcmVzdWx0Lmhhc192YWx1 ZSgpKSB7CiAgICAgICAgIGF1dG8mIGVycm9yID0gcmVzdWx0LmVycm9yKCk7CiAgICAgICAgIGlm ICghZXJyb3IpIHsKICAgICAgICAgICAgIGNsaWVudC0+ZGlkTm90SGFuZGxlKCk7CisgICAgICAg ICAgICBwcm9taXNlLnJlc29sdmUoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog ICAgICAgICBjbGllbnQtPmRpZEZhaWwoKmVycm9yKTsKKyAgICAgICAgcHJvbWlzZS5yZWplY3Qo RXhjZXB0aW9uIHsgRXhjZXB0aW9uQ29kZTo6TmV0d29ya0Vycm9yIH0pOwogICAgICAgICByZXR1 cm47CiAgICAgfQogICAgIGF1dG8gcmVzcG9uc2UgPSBXVEZNb3ZlKHJlc3VsdC52YWx1ZSgpKTsK QEAgLTgwLDE1ICs4MywxOSBAQCBzdGF0aWMgdm9pZCBwcm9jZXNzUmVzcG9uc2UoUmVmPENsaWVu dD4mJiBjbGllbnQsIEV4cGVjdGVkPFJlZjxGZXRjaFJlc3BvbnNlPiwgcwogICAgIGF1dG8gbG9h ZGluZ0Vycm9yID0gcmVzcG9uc2UtPmxvYWRpbmdFcnJvcigpOwogICAgIGlmICghbG9hZGluZ0Vy cm9yLmlzTnVsbCgpKSB7CiAgICAgICAgIGNsaWVudC0+ZGlkRmFpbChsb2FkaW5nRXJyb3IpOwor ICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBFeGNlcHRpb25Db2RlOjpOZXR3b3Jr RXJyb3IgfSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBhdXRvIHJlc291cmNlUmVz cG9uc2UgPSByZXNwb25zZS0+cmVzb3VyY2VSZXNwb25zZSgpOwogICAgIGlmIChhdXRvIGVycm9y ID0gdmFsaWRhdGVSZXNwb25zZShyZXNvdXJjZVJlc3BvbnNlLCBtb2RlLCByZWRpcmVjdCk7ICFl cnJvci5pc051bGwoKSkgewogICAgICAgICBjbGllbnQtPmRpZEZhaWwoZXJyb3IpOworICAgICAg ICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBFeGNlcHRpb25Db2RlOjpOZXR3b3JrRXJyb3Ig fSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBwcm9taXNlLnJlc29sdmUoKTsKKwog ICAgIGlmIChyZXNvdXJjZVJlc3BvbnNlLmlzUmVkaXJlY3Rpb24oKSAmJiByZXNvdXJjZVJlc3Bv bnNlLmh0dHBIZWFkZXJGaWVsZHMoKS5jb250YWlucyhIVFRQSGVhZGVyTmFtZTo6TG9jYXRpb24p KSB7CiAgICAgICAgIGNsaWVudC0+ZGlkUmVjZWl2ZVJlZGlyZWN0aW9uKHJlc291cmNlUmVzcG9u c2UpOwogICAgICAgICByZXR1cm47CkBAIC0xODEsMTUgKzE4OCwyNSBAQCB2b2lkIGRpc3BhdGNo RmV0Y2hFdmVudChSZWY8Q2xpZW50PiYmIGNsaWVudCwgU2VydmljZVdvcmtlckdsb2JhbFNjb3Bl JiBnbG9iYWxTYwogICAgIH0gZWxzZSBpZiAoY2xpZW50SWQpCiAgICAgICAgIGluaXQuY2xpZW50 SWQgPSBjbGllbnRJZC0+dG9TdHJpbmcoKTsKICAgICBpbml0LmNhbmNlbGFibGUgPSB0cnVlOwot ICAgIGF1dG8gZXZlbnQgPSBGZXRjaEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmZldGNoRXZl bnQsIFdURk1vdmUoaW5pdCksIEV2ZW50OjpJc1RydXN0ZWQ6Olllcyk7CisKKyAgICBhdXRvJiBq c0RPTUdsb2JhbE9iamVjdCA9ICpKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KGdsb2Jh bFNjb3BlLmdsb2JhbE9iamVjdCgpKTsKKyAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGpzRE9N R2xvYmFsT2JqZWN0LnZtKCkpOworCisgICAgYXV0byogcHJvbWlzZSA9IEpTQzo6SlNQcm9taXNl OjpjcmVhdGUoanNET01HbG9iYWxPYmplY3Qudm0oKSwganNET01HbG9iYWxPYmplY3QucHJvbWlz ZVN0cnVjdHVyZSgpKTsKKyAgICBBU1NFUlQocHJvbWlzZSk7CisKKyAgICBhdXRvIGRlZmVycmVk UHJvbWlzZSA9IERlZmVycmVkUHJvbWlzZTo6Y3JlYXRlKGpzRE9NR2xvYmFsT2JqZWN0LCAqcHJv bWlzZSk7CisgICAgaW5pdC5oYW5kbGVkID0gRE9NUHJvbWlzZTo6Y3JlYXRlKGpzRE9NR2xvYmFs T2JqZWN0LCAqcHJvbWlzZSk7CisKKyAgICBhdXRvIGV2ZW50ID0gRmV0Y2hFdmVudDo6Y3JlYXRl KCpnbG9iYWxTY29wZS5nbG9iYWxPYmplY3QoKSwgZXZlbnROYW1lcygpLmZldGNoRXZlbnQsIFdU Rk1vdmUoaW5pdCksIEV2ZW50OjpJc1RydXN0ZWQ6Olllcyk7CiAKICAgICBpZiAoaXNTZXJ2aWNl V29ya2VyTmF2aWdhdGlvblByZWxvYWRFbmFibGVkKQogICAgICAgICBldmVudC0+c2V0TmF2aWdh dGlvblByZWxvYWRJZGVudGlmaWVyKGZldGNoSWRlbnRpZmllcik7CiAKICAgICBDZXJ0aWZpY2F0 ZUluZm8gY2VydGlmaWNhdGVJbmZvID0gZ2xvYmFsU2NvcGUuY2VydGlmaWNhdGVJbmZvKCk7CiAK LSAgICBldmVudC0+b25SZXNwb25zZShbY2xpZW50LCBtb2RlLCByZWRpcmVjdCwgcmVxdWVzdFVS TCwgY2VydGlmaWNhdGVJbmZvID0gV1RGTW92ZShjZXJ0aWZpY2F0ZUluZm8pXSAoYXV0byYmIHJl c3VsdCkgbXV0YWJsZSB7Ci0gICAgICAgIHByb2Nlc3NSZXNwb25zZShXVEZNb3ZlKGNsaWVudCks IFdURk1vdmUocmVzdWx0KSwgbW9kZSwgcmVkaXJlY3QsIHJlcXVlc3RVUkwsIFdURk1vdmUoY2Vy dGlmaWNhdGVJbmZvKSk7CisgICAgZXZlbnQtPm9uUmVzcG9uc2UoW2NsaWVudCwgbW9kZSwgcmVk aXJlY3QsIHJlcXVlc3RVUkwsIGNlcnRpZmljYXRlSW5mbyA9IFdURk1vdmUoY2VydGlmaWNhdGVJ bmZvKSwgZGVmZXJyZWRQcm9taXNlXSAoYXV0byYmIHJlc3VsdCkgbXV0YWJsZSB7CisgICAgICAg IHByb2Nlc3NSZXNwb25zZShXVEZNb3ZlKGNsaWVudCksIFdURk1vdmUocmVzdWx0KSwgbW9kZSwg cmVkaXJlY3QsIHJlcXVlc3RVUkwsIFdURk1vdmUoY2VydGlmaWNhdGVJbmZvKSwgZGVmZXJyZWRQ cm9taXNlLmdldCgpKTsKICAgICB9KTsKIAogICAgIGdsb2JhbFNjb3BlLmRpc3BhdGNoRXZlbnQo ZXZlbnQpOwpAQCAtMTk4LDkgKzIxNSwxMSBAQCB2b2lkIGRpc3BhdGNoRmV0Y2hFdmVudChSZWY8 Q2xpZW50PiYmIGNsaWVudCwgU2VydmljZVdvcmtlckdsb2JhbFNjb3BlJiBnbG9iYWxTYwogICAg ICAgICBpZiAoZXZlbnQtPmRlZmF1bHRQcmV2ZW50ZWQoKSkgewogICAgICAgICAgICAgUmVzb3Vy Y2VFcnJvciBlcnJvciB7IGVycm9yRG9tYWluV2ViS2l0SW50ZXJuYWwsIDAsIHJlcXVlc3RVUkws ICJGZXRjaCBldmVudCB3YXMgY2FuY2VsZWQiX3MsIFJlc291cmNlRXJyb3I6OlR5cGU6OkdlbmVy YWwsIFJlc291cmNlRXJyb3I6OklzU2FuaXRpemVkOjpZZXMgfTsKICAgICAgICAgICAgIGNsaWVu dC0+ZGlkRmFpbChlcnJvcik7CisgICAgICAgICAgICBkZWZlcnJlZFByb21pc2UtPnJlamVjdChF eGNlcHRpb24geyBOZXR3b3JrRXJyb3IgfSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KICAgICAgICAgY2xpZW50LT5kaWROb3RIYW5kbGUoKTsKKyAgICAgICAgZGVmZXJyZWRQcm9t aXNlLT5yZXNvbHZlKCk7CiAgICAgfQogCiAgICAgZ2xvYmFsU2NvcGUudXBkYXRlRXh0ZW5kZWRF dmVudHNTZXQoZXZlbnQucHRyKCkpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXgg MTMzYWUyYTFjZGFiOTRhNzEzYmYwNzYzZTMwNDVhYzJlMzMwMDkwNS4uMDY5MzhlYzFhYjM4ZWMx NjgwY2MwMzM2Mzk5NjVhMDUxYTMyOGM4NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDEtMTAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgorCisgICAgICAgIE5ldyBzZXJ2aWNlIHdvcmtlciBBUEkgJ0ZldGNoRXZlbnQuaGFu ZGxlZCcgbmVlZHMgdG8gYmUgc3VwcG9ydGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgxODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5ODA4 OTc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog d2ViLXBsYXRmb3JtLXRlc3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9mZXRjaC1l dmVudC1oYW5kbGVkLmh0dHBzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0t dGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL2ZldGNoLWV2ZW50LWhhbmRsZWQu aHR0cHMuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJz L3NlcnZpY2Utd29ya2VyL3Jlc291cmNlcy9mZXRjaC1ldmVudC1oYW5kbGVkLXdvcmtlci5qczoK KyAgICAgICAgKHRyeS5ldmVudC5oYW5kbGVkLnRoZW4pOgorICAgICAgICAoY2F0Y2gpOgorICAg ICAgICAoc2VuZF9tZXNzYWdlX3RvX2NsaWVudCk6IERlbGV0ZWQuCisKIDIwMjItMDEtMDkgIEFu dG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBX UFQgdXBkYXRlIGFmdGVyIGh0dHBzOi8vZ2l0aHViLmNvbS93ZWItcGxhdGZvcm0tdGVzdHMvd3B0 L3B1bGwvMzIyMjIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9mZXRjaC1ldmVudC1o YW5kbGVkLmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL2ZldGNoLWV2ZW50 LWhhbmRsZWQuaHR0cHMtZXhwZWN0ZWQudHh0CmluZGV4IGU0NzM5ZjRmYTIyOWRjZDk1OTdkYmMz ZTRiNzZiNjkxYjk1YjNhZmQuLjUxYTU0NzJlNTllODNlYTEwOTM3MjNmZDBiYThmNDE4OTg0MmY3 NTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL2ZldGNoLWV2ZW50LWhhbmRsZWQuaHR0 cHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL2ZldGNoLWV2ZW50LWhhbmRs ZWQuaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0xLDEzICsxLDEwIEBACiAKLQotSGFybmVzcyBFcnJv ciAoVElNRU9VVCksIG1lc3NhZ2UgPSBudWxsCi0KIFBBU1MgZ2xvYmFsIHNldHVwCi1USU1FT1VU IEZldGNoRXZlbnQuaGFuZGxlZCBzaG91bGQgcmVzb2x2ZSB3aGVuIHJlc3BvbmRXaXRoKCkgaXMg bm90IGNhbGxlZCBmb3IgYSBuYXZpZ2F0aW9uIHJlcXVlc3QgVGVzdCB0aW1lZCBvdXQKLU5PVFJV TiBGZXRjaEV2ZW50LmhhbmRsZWQgc2hvdWxkIHJlc29sdmUgd2hlbiByZXNwb25kV2l0aCgpIGlz IG5vdCBjYWxsZWQgZm9yIGEgc3ViLXJlc291cmNlIHJlcXVlc3QKLU5PVFJVTiBGZXRjaEV2ZW50 LmhhbmRsZWQgc2hvdWxkIHJlamVjdCB3aGVuIHJlc3BvbmRXaXRoKCkgaXMgbm90IGNhbGxlZCBh bmQgdGhlIGV2ZW50IGlzIGNhbmNlbGVkCi1OT1RSVU4gRmV0Y2hFdmVudC5oYW5kbGVkIHNob3Vs ZCByZXNvbHZlIHdoZW4gdGhlIHByb21pc2UgcHJvdmlkZWQgdG8gcmVzcG9uZFdpdGgoKSBpcyBy ZXNvbHZlZAotTk9UUlVOIEZldGNoRXZlbnQuaGFuZGxlZCBzaG91bGQgcmVqZWN0IHdoZW4gdGhl IHByb21pc2UgcHJvdmlkZWQgdG8gcmVzcG9uZFdpdGgoKSBpcyByZXNvbHZlZCB0byBhbiBpbnZh bGlkIHJlc3BvbnNlCi1OT1RSVU4gRmV0Y2hFdmVudC5oYW5kbGVkIHNob3VsZCByZWplY3Qgd2hl biB0aGUgcHJvbWlzZSBwcm92aWRlZCB0byByZXNwb25kV2l0aCgpIGlzIHJlamVjdGVkCi1OT1RS VU4gZ2xvYmFsIGNsZWFudXAKK1BBU1MgRmV0Y2hFdmVudC5oYW5kbGVkIHNob3VsZCByZXNvbHZl IHdoZW4gcmVzcG9uZFdpdGgoKSBpcyBub3QgY2FsbGVkIGZvciBhIG5hdmlnYXRpb24gcmVxdWVz dAorUEFTUyBGZXRjaEV2ZW50LmhhbmRsZWQgc2hvdWxkIHJlc29sdmUgd2hlbiByZXNwb25kV2l0 aCgpIGlzIG5vdCBjYWxsZWQgZm9yIGEgc3ViLXJlc291cmNlIHJlcXVlc3QKK1BBU1MgRmV0Y2hF dmVudC5oYW5kbGVkIHNob3VsZCByZWplY3Qgd2hlbiByZXNwb25kV2l0aCgpIGlzIG5vdCBjYWxs ZWQgYW5kIHRoZSBldmVudCBpcyBjYW5jZWxlZAorUEFTUyBGZXRjaEV2ZW50LmhhbmRsZWQgc2hv dWxkIHJlc29sdmUgd2hlbiB0aGUgcHJvbWlzZSBwcm92aWRlZCB0byByZXNwb25kV2l0aCgpIGlz IHJlc29sdmVkCitQQVNTIEZldGNoRXZlbnQuaGFuZGxlZCBzaG91bGQgcmVqZWN0IHdoZW4gdGhl IHByb21pc2UgcHJvdmlkZWQgdG8gcmVzcG9uZFdpdGgoKSBpcyByZXNvbHZlZCB0byBhbiBpbnZh bGlkIHJlc3BvbnNlCitQQVNTIEZldGNoRXZlbnQuaGFuZGxlZCBzaG91bGQgcmVqZWN0IHdoZW4g dGhlIHByb21pc2UgcHJvdmlkZWQgdG8gcmVzcG9uZFdpdGgoKSBpcyByZWplY3RlZAorUEFTUyBn bG9iYWwgY2xlYW51cAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9mZXRjaC1ldmVu dC1oYW5kbGVkLmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9mZXRjaC1ldmVudC1oYW5k bGVkLmh0dHBzLmh0bWwKaW5kZXggOGQzOWI2NWJiNjI4YjhkY2RhMDdjODA0MTYyNTgzYzgwOTg2 YTZjMy4uMDhiODhjZTM3NzNkMDM2Y2YxZWEzYTlmMzIxZjg3YjI2ZDU0ZmZmZCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZXJ2aWNlLXdv cmtlcnMvc2VydmljZS13b3JrZXIvZmV0Y2gtZXZlbnQtaGFuZGxlZC5odHRwcy5odG1sCisrKyBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3Jr ZXJzL3NlcnZpY2Utd29ya2VyL2ZldGNoLWV2ZW50LWhhbmRsZWQuaHR0cHMuaHRtbApAQCAtMTAs MTggKzEwLDExIEBAIGxldCBmcmFtZSA9IG51bGw7CiBsZXQgd29ya2VyID0gbnVsbDsKIGNvbnN0 IHNjcmlwdCA9ICdyZXNvdXJjZXMvZmV0Y2gtZXZlbnQtaGFuZGxlZC13b3JrZXIuanMnOwogY29u c3Qgc2NvcGUgPSAncmVzb3VyY2VzL3NpbXBsZS5odG1sJzsKK2NvbnN0IGNoYW5uZWwgPSBuZXcg TWVzc2FnZUNoYW5uZWwoKTsKIAogLy8gV2FpdCBmb3IgYSBtZXNzYWdlIGZyb20gdGhlIHNlcnZp Y2Ugd29ya2VyIGFuZCByZW1vdmVzIHRoZSBtZXNzYWdlIGhhbmRsZXIuCiBmdW5jdGlvbiB3YWl0 X2Zvcl9tZXNzYWdlX2Zyb21fd29ya2VyKCkgewotICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29s dmUpID0+IHsKLSAgICBjb25zdCBoYW5kbGVyID0gKGV2ZW50KSA9PiB7Ci0gICAgICBmcmFtZS5j b250ZW50V2luZG93Lm5hdmlnYXRvci5zZXJ2aWNlV29ya2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIo Ci0gICAgICAgICAgJ21lc3NhZ2UnLCBoYW5kbGVyKTsKLSAgICAgIHJlc29sdmUoZXZlbnQuZGF0 YSk7Ci0gICAgfTsKLSAgICBmcmFtZS5jb250ZW50V2luZG93Lm5hdmlnYXRvci5zZXJ2aWNlV29y a2VyLmFkZEV2ZW50TGlzdGVuZXIoCi0gICAgICAgICdtZXNzYWdlJywgaGFuZGxlcik7Ci0gIH0p OworICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IGNoYW5uZWwucG9ydDIub25tZXNz YWdlID0gKGV2ZW50KSA9PiByZXNvbHZlKGV2ZW50LmRhdGEpKTsKIH0KIAogLy8gR2xvYmFsIHNl dHVwOiB0aGlzIG11c3QgYmUgdGhlIGZpcnN0IHByb21pc2VfdGVzdC4KQEAgLTI5LDEyICsyMiwx NiBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgKHQpID0+IHsKICAgY29uc3QgcmVnaXN0cmF0aW9uID0K ICAgICAgIGF3YWl0IHNlcnZpY2Vfd29ya2VyX3VucmVnaXN0ZXJfYW5kX3JlZ2lzdGVyKHQsIHNj cmlwdCwgc2NvcGUpOwogICB3b3JrZXIgPSByZWdpc3RyYXRpb24uaW5zdGFsbGluZzsKKyAgaWYg KCF3b3JrZXIpCisgICAgICB3b3JrZXIgPSByZWdpc3RyYXRpb24uYWN0aXZlOworICB3b3JrZXIu cG9zdE1lc3NhZ2Uoe3BvcnQ6Y2hhbm5lbC5wb3J0MX0sIFtjaGFubmVsLnBvcnQxXSk7CiAgIGF3 YWl0IHdhaXRfZm9yX3N0YXRlKHQsIHdvcmtlciwgJ2FjdGl2YXRlZCcpOwogfSwgJ2dsb2JhbCBz ZXR1cCcpOwogCiBwcm9taXNlX3Rlc3QoYXN5bmMgKHQpID0+IHsKLSAgZnJhbWUgPSBhd2FpdCB3 aXRoX2lmcmFtZShzY29wZSk7CisgIGNvbnN0IHByb21pc2UgPSB3aXRoX2lmcmFtZShzY29wZSk7 CiAgIGNvbnN0IG1lc3NhZ2UgPSBhd2FpdCB3YWl0X2Zvcl9tZXNzYWdlX2Zyb21fd29ya2VyKCk7 CisgIGZyYW1lID0gYXdhaXQgcHJvbWlzZTsKICAgYXNzZXJ0X2VxdWFscyhtZXNzYWdlLCAnUkVT T0xWRUQnKTsKIH0sICdGZXRjaEV2ZW50LmhhbmRsZWQgc2hvdWxkIHJlc29sdmUgd2hlbiByZXNw b25kV2l0aCgpIGlzIG5vdCBjYWxsZWQgZm9yIGEnICsKICAgICAnIG5hdmlnYXRpb24gcmVxdWVz dCcpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3JrZXIvcmVzb3VyY2VzL2ZldGNoLWV2ZW50 LWhhbmRsZWQtd29ya2VyLmpzIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3JrZXIvcmVzb3VyY2VzL2ZldGNoLWV2 ZW50LWhhbmRsZWQtd29ya2VyLmpzCmluZGV4IDBkYzZkZTAwNWRiYTA4Y2RhMTM0YWE2NTdlNTYx OTEzNjJjZjI4YTguLjUzZWUxNDkzNzQzZDc5NzY4OTA4YTNhYzRjNDdjYTBiODQyNDNmNGUgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2Vy dmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL3Jlc291cmNlcy9mZXRjaC1ldmVudC1oYW5kbGVk LXdvcmtlci5qcworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9yZXNvdXJjZXMvZmV0Y2gtZXZlbnQt aGFuZGxlZC13b3JrZXIuanMKQEAgLTEsMjUgKzEsMTkgQEAKIC8vIFRoaXMgd29ya2VyIHJlcG9y dHMgYmFjayB0aGUgZmluYWwgc3RhdGUgb2YgRmV0Y2hFdmVudC5oYW5kbGVkIChSRVNPTFZFRCBv cgogLy8gUkVKRUNURUQpIHRvIHRoZSB0ZXN0LgogCi0vLyBTZW5kIGEgbWVzc2FnZSB0byB0aGUg Y2xpZW50IHdpdGggdGhlIGNsaWVudCBpZC4KLWZ1bmN0aW9uIHNlbmRfbWVzc2FnZV90b19jbGll bnQobWVzc2FnZSwgY2xpZW50SWQpIHsKLSAgY2xpZW50cy5nZXQoY2xpZW50SWQpLnRoZW4oKGNs aWVudCkgPT4gewotICAgIGNsaWVudC5wb3N0TWVzc2FnZShtZXNzYWdlKTsKLSAgfSk7Ci19Citz ZWxmLmFkZEV2ZW50TGlzdGVuZXIoJ21lc3NhZ2UnLCBmdW5jdGlvbihldmVudCkgeworICBzZWxm LnBvcnQgPSBldmVudC5kYXRhLnBvcnQ7Cit9KTsKIAogc2VsZi5hZGRFdmVudExpc3RlbmVyKCdm ZXRjaCcsIGZ1bmN0aW9uKGV2ZW50KSB7Ci0gIGNvbnN0IGNsaWVudElkID0gKGV2ZW50LnJlcXVl c3QubW9kZSA9PT0gJ25hdmlnYXRlJykgPwotICAgICAgZXZlbnQucmVzdWx0aW5nQ2xpZW50SWQg OiBldmVudC5jbGllbnRJZDsKLQogICB0cnkgewogICAgIGV2ZW50LmhhbmRsZWQudGhlbigoKSA9 PiB7Ci0gICAgICBzZW5kX21lc3NhZ2VfdG9fY2xpZW50KCdSRVNPTFZFRCcsIGNsaWVudElkKTsK KyAgICAgIHNlbGYucG9ydC5wb3N0TWVzc2FnZSgnUkVTT0xWRUQnKTsKICAgICB9LCAoKSA9PiB7 Ci0gICAgICBzZW5kX21lc3NhZ2VfdG9fY2xpZW50KCdSRUpFQ1RFRCcsIGNsaWVudElkKTsKKyAg ICAgIHNlbGYucG9ydC5wb3N0TWVzc2FnZSgnUkVKRUNURUQnKTsKICAgICB9KTsKICAgfSBjYXRj aCAoZSkgewotICAgIHNlbmRfbWVzc2FnZV90b19jbGllbnQoJ0ZBSUxFRCcsIGNsaWVudElkKTsK KyAgICBzZWxmLnBvcnQucG9zdE1lc3NhZ2UoJ0ZBSUxFRCcpOwogICAgIHJldHVybjsKICAgfQog Cg==