223210 2021-03-15 12:45:44 -0700 PCM: Split attributionReportURL() into attributionReportSourceURL() and attributionReportAttributeOnURL() 2021-03-15 16:44:30 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander bfulgham cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim japhet webkit-bug-importer oldest_to_newest 1739602 0 wilander 2021-03-15 12:45:44 -0700 We should split WebCore::PrivateClickMeasurement::attributionReportURL() into WebCore::PrivateClickMeasurement::attributionReportSourceURL() and WebCore::PrivateClickMeasurement::attributionReportAttributeOnURL() to facilitate sending attribution reports to both the click source and destination. 1739603 1 webkit-bug-importer 2021-03-15 12:46:29 -0700 <rdar://problem/75442246> 1739657 2 423235 wilander 2021-03-15 14:03:44 -0700 Created attachment 423235 Patch 1739722 3 423235 bfulgham 2021-03-15 16:27:56 -0700 Comment on attachment 423235 Patch r=me 1739724 4 423235 wilander 2021-03-15 16:29:03 -0700 Comment on attachment 423235 Patch Thanks, Brent! 1739727 5 ews-feeder 2021-03-15 16:44:28 -0700 Committed r274453: <https://commits.webkit.org/r274453> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423235. 423235 2021-03-15 14:03:44 -0700 2021-03-15 16:44:29 -0700 Patch bug-223210-20210315140343.patch text/plain 18806 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWEyNTBmM2QwYmQ4Mzgx ZjRmZjc2ZDkwNjEzOTBkMDg3NTU5ZDBlNC4uOTU1NDdmN2IzM2FhOTdkMDhhMGY1NDBkM2VkYWJj MTMzZGRmNzEzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTAzLTE1ICBKb2hu IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFBDTTogU3BsaXQgYXR0 cmlidXRpb25SZXBvcnRVUkwoKSBpbnRvIGF0dHJpYnV0aW9uUmVwb3J0U291cmNlVVJMKCkgYW5k IGF0dHJpYnV0aW9uUmVwb3J0QXR0cmlidXRlT25VUkwoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzMjEwCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS83NTQ0MjI0Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIHBhdGNoIHNwbGl0cyBXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6 YXR0cmlidXRpb25SZXBvcnRVUkwoKSBpbnRvCisgICAgICAgIFByaXZhdGVDbGlja01lYXN1cmVt ZW50OjphdHRyaWJ1dGlvblJlcG9ydFNvdXJjZVVSTCgpIGFuZAorICAgICAgICBQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudDo6YXR0cmlidXRpb25SZXBvcnRBdHRyaWJ1dGVPblVSTCgpIHRvCisgICAg ICAgIGZhY2lsaXRhdGUgc2VuZGluZyBhdHRyaWJ1dGlvbiByZXBvcnRzIHRvIGJvdGggdGhlIGNs aWNrIHNvdXJjZSBhbmQgZGVzdGluYXRpb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlz IHBhdGNoIGRvZXNuJ3QgY2hhbmdlIGZ1bmN0aW9uYWxpdHkgYW5kIHRoZSBmdW5jdGlvbmFsaXR5 IGlzCisgICAgICAgIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBodG1s L0hUTUxBbmNob3JFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxBbmNob3JFbGVt ZW50OjpoYW5kbGVDbGljayk6CisgICAgICAgICAgICBDaGFuZ2VkIHRoZSBhc3NlcnRpb24gdG8g Y2hlY2sgYm90aCB0aGUgYXR0cmlidXRpb24gVVJMcy4KKyAgICAgICAgKiBsb2FkZXIvUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXR0cmlidXRpb25SZXBv cnRVUkwpOgorICAgICAgICAgICAgU3RhdGljIGNvbnZlbmllbmNlIGZ1bmN0aW9uIHRvIHNoYXJl IGNvZGUgYmV0d2VlbgorICAgICAgICAgICAgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OmF0dHJp YnV0aW9uUmVwb3J0U291cmNlVVJMKCkgYW5kCisgICAgICAgICAgICBQcml2YXRlQ2xpY2tNZWFz dXJlbWVudDo6YXR0cmlidXRpb25SZXBvcnRBdHRyaWJ1dGVPblVSTCgpLgorICAgICAgICAoV2Vi Q29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OmF0dHJpYnV0aW9uUmVwb3J0U291cmNlVVJM IGNvbnN0KToKKyAgICAgICAgICAgIEdlbmVyYXRlcyB0aGUgd2VsbC1rbm93biBsb2NhdGlvbiBm b3IgdGhlIGNsaWNrIHNvdXJjZS4KKyAgICAgICAgKFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1 cmVtZW50OjphdHRyaWJ1dGlvblJlcG9ydEF0dHJpYnV0ZU9uVVJMIGNvbnN0KToKKyAgICAgICAg ICAgIEdlbmVyYXRlcyB0aGUgd2VsbC1rbm93biBsb2NhdGlvbiBmb3IgdGhlIGNsaWNrIGRlc3Rp bmF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OmF0dHJp YnV0aW9uUmVwb3J0VVJMIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgICAgIE5vIG1vc3RseSBl eGlzdHMgYXMgYSBzdGF0aWMgY29udmVuaWVuY2UgZnVuY3Rpb24gKHNlZSBhYm92ZSkuCisgICAg ICAgICogbG9hZGVyL1ByaXZhdGVDbGlja01lYXN1cmVtZW50Lmg6CisKIDIwMjEtMDMtMTUgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXQtYm9yZGVyLXRvLWxp bmUgbWF5IGNoYW5nZSB0aGUgbGF5b3V0IGNvbnN0cmFpbnRzIGJldHdlZW4gMiBwYWdpbmF0ZWQg bGluZSBsYXlvdXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM3MmIxMmI0MzIxNGZhYmFlZDdiMDE1MDFmMTIxODk3 OGVlYjgxNTAuLmFjN2U2YTU3MWFhMWVkOGYzNWJkZTNkYzllOWI5YzA3YWM4YjE4NWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDMtMTUgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRl ckBhcHBsZS5jb20+CisKKyAgICAgICAgUENNOiBTcGxpdCBhdHRyaWJ1dGlvblJlcG9ydFVSTCgp IGludG8gYXR0cmlidXRpb25SZXBvcnRTb3VyY2VVUkwoKSBhbmQgYXR0cmlidXRpb25SZXBvcnRB dHRyaWJ1dGVPblVSTCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjMyMTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc1NDQyMjQ2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggc3Bs aXRzIFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjphdHRyaWJ1dGlvblJlcG9ydFVS TCgpIGludG8KKyAgICAgICAgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OmF0dHJp YnV0aW9uUmVwb3J0U291cmNlVVJMKCkgYW5kCisgICAgICAgIFdlYkNvcmU6OlByaXZhdGVDbGlj a01lYXN1cmVtZW50OjphdHRyaWJ1dGlvblJlcG9ydEF0dHJpYnV0ZU9uVVJMKCkgdG8KKyAgICAg ICAgZmFjaWxpdGF0ZSBzZW5kaW5nIGF0dHJpYnV0aW9uIHJlcG9ydHMgdG8gYm90aCB0aGUgY2xp Y2sgc291cmNlIGFuZCBkZXN0aW5hdGlvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1By aXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByaXZh dGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6c3RvcmVVbmF0dHJpYnV0ZWQpOgorICAgICAgICAg ICAgUmVtb3ZlZCBhIHJlZmVyZW5jZSB0byBhZHMgaW4gYSBsb2cgc3RhdGVtZW50LgorICAgICAg ICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVDb252ZXJzaW9u UmVxdWVzdEltcGwpOgorICAgICAgICAgICAgTm93IHVzZXMgIFdlYkNvcmU6OlByaXZhdGVDbGlj a01lYXN1cmVtZW50OjphdHRyaWJ1dGlvblJlcG9ydFNvdXJjZVVSTCgpLgorCiAyMDIxLTAzLTE1 ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OKHIyMzM4NDUpOiBFTUUgS2V5c3lzdGVtIHBlcm1pc3Npb24gd2hlbiBNZWRpYVN0cmVh bSBpcyBkaXNhYmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQW5jaG9y RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVtZW50LmNwcApp bmRleCAwMWJiMWQxN2Q1MmY5Y2ZlZWE4YzAxYmU5MGQzMzY4NzU2OWVkMmFlLi4zNTI5MmMyMTBk OTYyNWZkYWZhMTk5N2JiZmRjNjAyMTM4NjgxNjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxBbmNob3JFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxBbmNob3JFbGVtZW50LmNwcApAQCAtNTI1LDkgKzUyNSw5IEBAIHZvaWQgSFRNTEFuY2hvckVs ZW1lbnQ6OmhhbmRsZUNsaWNrKEV2ZW50JiBldmVudCkKICAgICAgICAgbmV3RnJhbWVPcGVuZXJQ b2xpY3kgPSBOZXdGcmFtZU9wZW5lclBvbGljeTo6U3VwcHJlc3M7CiAKICAgICBhdXRvIHByaXZh dGVDbGlja01lYXN1cmVtZW50ID0gcGFyc2VQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCgpOwotICAg IC8vIEEgbWF0Y2hpbmcgY29udmVyc2lvbiBldmVudCBuZWVkcyB0byBoYXBwZW4gYmVmb3JlIHRo ZSBjb21wbGV0ZSBwcml2YXRlIGNsaWNrIG1lYXN1cmVtZW50Ci0gICAgLy8gVVJMIGNhbiBiZSBj cmVhdGVkLiBUaHVzLCBpdCBzaG91bGQgYmUgZW1wdHkgZm9yIG5vdy4KLSAgICBBU1NFUlQoIXBy aXZhdGVDbGlja01lYXN1cmVtZW50IHx8IHByaXZhdGVDbGlja01lYXN1cmVtZW50LT5hdHRyaWJ1 dGlvblJlcG9ydFVSTCgpLmlzTnVsbCgpKTsKKyAgICAvLyBBIG1hdGNoaW5nIHRyaWdnZXJpbmcg ZXZlbnQgbmVlZHMgdG8gaGFwcGVuIGJlZm9yZSBhbiBhdHRyaWJ1dGlvbiByZXBvcnQgY2FuIGJl IHNlbnQuCisgICAgLy8gVGh1cywgVVJMcyBzaG91bGQgYmUgZW1wdHkgZm9yIG5vdy4KKyAgICBB U1NFUlQoIXByaXZhdGVDbGlja01lYXN1cmVtZW50IHx8IChwcml2YXRlQ2xpY2tNZWFzdXJlbWVu dC0+YXR0cmlidXRpb25SZXBvcnRTb3VyY2VVUkwoKS5pc051bGwoKSAmJiBwcml2YXRlQ2xpY2tN ZWFzdXJlbWVudC0+YXR0cmlidXRpb25SZXBvcnRBdHRyaWJ1dGVPblVSTCgpLmlzTnVsbCgpKSk7 CiAgICAgCiAgICAgZnJhbWUtPmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKGNvbXBsZXRlZFVSTCwg ZWZmZWN0aXZlVGFyZ2V0LCAmZXZlbnQsIHJlZmVycmVyUG9saWN5LCBkb2N1bWVudCgpLnNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpLCBuZXdGcmFtZU9wZW5lclBvbGlj eSwgZG93bmxvYWRBdHRyaWJ1dGUsIHN5c3RlbVByZXZpZXdJbmZvLCBXVEZNb3ZlKHByaXZhdGVD bGlja01lYXN1cmVtZW50KSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Q cml2YXRlQ2xpY2tNZWFzdXJlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQuY3BwCmluZGV4IDU4NDdiOTkzMmJjZDg3NGFjMDJkMjlmZGMwZTg0 ZjRmYTZmNTc2YTIuLjg2Y2EzOWRlMTAxZDBmNTk3YzkwMmE2Yjk2YzliOGVmZmQyMzYxMTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1ByaXZhdGVDbGlja01lYXN1cmVtZW50LmNw cApAQCAtMTE2LDE0ICsxMTYsMTEgQEAgYm9vbCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6aGFz SGlnaGVyUHJpb3JpdHlUaGFuKGNvbnN0IFByaXZhdGVDbGlja01lYXN1cmVtZW4KICAgICByZXR1 cm4gbV9hdHRyaWJ1dGlvblRyaWdnZXJEYXRhLT5wcmlvcml0eSA+IG90aGVyLm1fYXR0cmlidXRp b25UcmlnZ2VyRGF0YS0+cHJpb3JpdHk7CiB9CiAKLVVSTCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dDo6YXR0cmlidXRpb25SZXBvcnRVUkwoKSBjb25zdAorc3RhdGljIFVSTCBhdHRyaWJ1dGlvblJl cG9ydFVSTChjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4pCiB7Ci0g ICAgaWYgKCFpc1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiBVUkwoKTsKLQogICAgIFN0cmluZ0J1 aWxkZXIgYnVpbGRlcjsKICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoImh0dHBzOi8vIik7Ci0g ICAgYnVpbGRlci5hcHBlbmQobV9zb3VyY2VTaXRlLnJlZ2lzdHJhYmxlRG9tYWluLnN0cmluZygp KTsKKyAgICBidWlsZGVyLmFwcGVuZChyZWdpc3RyYWJsZURvbWFpbi5zdHJpbmcoKSk7CiAgICAg YnVpbGRlci5hcHBlbmRMaXRlcmFsKHByaXZhdGVDbGlja01lYXN1cmVtZW50UmVwb3J0QXR0cmli dXRpb25QYXRoKTsKIAogICAgIFVSTCB1cmwgeyBVUkwoKSwgYnVpbGRlci50b1N0cmluZygpIH07 CkBAIC0xMzMsNiArMTMwLDIyIEBAIFVSTCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6YXR0cmli dXRpb25SZXBvcnRVUkwoKSBjb25zdAogICAgIHJldHVybiBVUkwoKTsKIH0KIAorVVJMIFByaXZh dGVDbGlja01lYXN1cmVtZW50OjphdHRyaWJ1dGlvblJlcG9ydFNvdXJjZVVSTCgpIGNvbnN0Cit7 CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBVUkwoKTsKKworICAgIHJldHVy biBhdHRyaWJ1dGlvblJlcG9ydFVSTChtX3NvdXJjZVNpdGUucmVnaXN0cmFibGVEb21haW4pOwor fQorCitVUkwgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OmF0dHJpYnV0aW9uUmVwb3J0QXR0cmli dXRlT25VUkwoKSBjb25zdAoreworICAgIGlmICghaXNWYWxpZCgpKQorICAgICAgICByZXR1cm4g VVJMKCk7CisKKyAgICByZXR1cm4gYXR0cmlidXRpb25SZXBvcnRVUkwobV9hdHRyaWJ1dGVPblNp dGUucmVnaXN0cmFibGVEb21haW4pOworfQorCiBSZWY8SlNPTjo6T2JqZWN0PiBQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudDo6YXR0cmlidXRpb25SZXBvcnRKU09OKCkgY29uc3QKIHsKICAgICBhdXRv IHJlcG9ydERldGFpbHMgPSBKU09OOjpPYmplY3Q6OmNyZWF0ZSgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL1ByaXZhdGVDbGlja01lYXN1cmVtZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuaAppbmRleCBmN2M0MWU2NmMzN2My MDZkMjI5MGM1NjNkYTFkZWYwZDk4NDEyNmIwLi5jNzExZjY5ZWQwNGEwZmUwOWJlYWQ4NWFhNzhm NmFlYWE4NGRkNjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnQuaApAQCAtMjYyLDcgKzI2Miw4IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VY UE9SVCBzdGF0aWMgRXhwZWN0ZWQ8QXR0cmlidXRpb25UcmlnZ2VyRGF0YSwgU3RyaW5nPiBwYXJz ZUF0dHJpYnV0aW9uUmVxdWVzdChjb25zdCBVUkwmIHJlZGlyZWN0VVJMKTsKICAgICBXRUJDT1JF X0VYUE9SVCBPcHRpb25hbDxTZWNvbmRzPiBhdHRyaWJ1dGVBbmRHZXRFYXJsaWVzdFRpbWVUb1Nl bmQoQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGhh c0hpZ2hlclByaW9yaXR5VGhhbihjb25zdCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCYpIGNvbnN0 OwotICAgIFdFQkNPUkVfRVhQT1JUIFVSTCBhdHRyaWJ1dGlvblJlcG9ydFVSTCgpIGNvbnN0Owor ICAgIFdFQkNPUkVfRVhQT1JUIFVSTCBhdHRyaWJ1dGlvblJlcG9ydFNvdXJjZVVSTCgpIGNvbnN0 OworICAgIFdFQkNPUkVfRVhQT1JUIFVSTCBhdHRyaWJ1dGlvblJlcG9ydEF0dHJpYnV0ZU9uVVJM KCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgUmVmPEpTT046Ok9iamVjdD4gYXR0cmlidXRp b25SZXBvcnRKU09OKCkgY29uc3Q7CiAgICAgY29uc3QgU291cmNlU2l0ZSYgc291cmNlU2l0ZSgp IGNvbnN0IHsgcmV0dXJuIG1fc291cmNlU2l0ZTsgfTsKICAgICBjb25zdCBBdHRyaWJ1dGVPblNp dGUmIGF0dHJpYnV0ZU9uU2l0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fYXR0cmlidXRlT25TaXRlOyB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tN ZWFzdXJlbWVudE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwCmluZGV4IDc0YmI1Y2JlNTg3MzQ0Y2QxZTE4 MmQwZDdhOGM0ZTIxYWFkNTNiNTAuLmMzZGY2M2Q5OWJjNzE1YWM2NWQ5YWY4MDgzOGIzNzRmOWUy ZmZmMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAKQEAgLTk3LDcgKzk3LDcgQEAg dm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnN0b3JlVW5hdHRyaWJ1dGVkKFBy aXZhdGVDbGlja01lYXN1cmVtZW50JiYKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgbV9uZXR3 b3JrUHJvY2Vzcy0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UobV9zZXNzaW9uSUQsIE1lc3NhZ2VT b3VyY2U6OlByaXZhdGVDbGlja01lYXN1cmVtZW50LCBNZXNzYWdlTGV2ZWw6OkxvZywgIltQcml2 YXRlIENsaWNrIE1lYXN1cmVtZW50XSBTdG9yaW5nIGFuIGFkIGNsaWNrLiJfcyk7CisgICAgbV9u ZXR3b3JrUHJvY2Vzcy0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UobV9zZXNzaW9uSUQsIE1lc3Nh Z2VTb3VyY2U6OlByaXZhdGVDbGlja01lYXN1cmVtZW50LCBNZXNzYWdlTGV2ZWw6OkxvZywgIltQ cml2YXRlIENsaWNrIE1lYXN1cmVtZW50XSBTdG9yaW5nIGEgY2xpY2suIl9zKTsKIAogI2lmIEVO QUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgaWYgKGF1dG8qIHJlc291cmNlTG9h ZFN0YXRpc3RpY3MgPSBtX25ldHdvcmtTZXNzaW9uLT5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkp CkBAIC0zMjQsNyArMzI0LDcgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6 OmZpcmVDb252ZXJzaW9uUmVxdWVzdChjb25zdCBQcml2YXRlQ2xpY2tNZWEKIAogdm9pZCBQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVDb252ZXJzaW9uUmVxdWVzdEltcGwoY29u c3QgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQmIGF0dHJpYnV0aW9uKQogewotICAgIGF1dG8gYXR0 cmlidXRpb25VUkwgPSBtX2F0dHJpYnV0aW9uUmVwb3J0QmFzZVVSTEZvclRlc3RpbmcgPyAqbV9h dHRyaWJ1dGlvblJlcG9ydEJhc2VVUkxGb3JUZXN0aW5nIDogYXR0cmlidXRpb24uYXR0cmlidXRp b25SZXBvcnRVUkwoKTsKKyAgICBhdXRvIGF0dHJpYnV0aW9uVVJMID0gbV9hdHRyaWJ1dGlvblJl cG9ydEJhc2VVUkxGb3JUZXN0aW5nID8gKm1fYXR0cmlidXRpb25SZXBvcnRCYXNlVVJMRm9yVGVz dGluZyA6IGF0dHJpYnV0aW9uLmF0dHJpYnV0aW9uUmVwb3J0U291cmNlVVJMKCk7CiAgICAgaWYg KGF0dHJpYnV0aW9uVVJMLmlzRW1wdHkoKSB8fCAhYXR0cmlidXRpb25VUkwuaXNWYWxpZCgpKQog ICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCA5MzE5MjQ1NzcwZjFmOGE1Yzk1OTcxZWNhN2IxMDlkNjgwZWFlMDlhLi4y NjNjNTQxYzViZjAzYTIxNDZjYWFjYmJkNjg1MGRkNzlmZTZhN2Y0IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEt MDMtMTUgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUENN OiBTcGxpdCBhdHRyaWJ1dGlvblJlcG9ydFVSTCgpIGludG8gYXR0cmlidXRpb25SZXBvcnRTb3Vy Y2VVUkwoKSBhbmQgYXR0cmlidXRpb25SZXBvcnRBdHRyaWJ1dGVPblVSTCgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjMyMTAKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzc1NDQyMjQ2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggc3BsaXRzIFdlYkNvcmU6OlByaXZhdGVDbGlja01l YXN1cmVtZW50OjphdHRyaWJ1dGlvblJlcG9ydFVSTCgpIGludG8KKyAgICAgICAgV2ViQ29yZTo6 UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OmF0dHJpYnV0aW9uUmVwb3J0U291cmNlVVJMKCkgYW5k CisgICAgICAgIFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjphdHRyaWJ1dGlvblJl cG9ydEF0dHJpYnV0ZU9uVVJMKCkgdG8KKyAgICAgICAgZmFjaWxpdGF0ZSBzZW5kaW5nIGF0dHJp YnV0aW9uIHJlcG9ydHMgdG8gYm90aCB0aGUgY2xpY2sgc291cmNlIGFuZCBkZXN0aW5hdGlvbi4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Qcml2YXRlQ2xpY2tNZWFz dXJlbWVudC5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKyAgICAgICAgICAg IFVwZGF0ZWQgdG8gdXNlIHRoZSBuZXcgZnVuY3Rpb25zIGFuZCBhbHNvIG5vdCByZXBlYXQgdGVz dHMgb2Ygc3RhdGljCisgICAgICAgICAgICBkYXRhLgorCiAyMDIxLTAzLTE1ICBMYXVybyBNb3Vy YSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBGaWx0ZXIgY3BwZmlsdCBv dXRwdXQgd2hlbiBnZW5lcmF0aW5nIGNyYXNoIGxvZ3MKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5jcHAgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuY3Bw CmluZGV4IDRmNjdhNjFjNmViYzQ0NzBiZDkwOTRmOGJiMmUzMDEzZDcxNTFlM2QuLjZjOTE0ZWVm NTZhYjdjYTQyNzFkMGQwZTE5Mzk0NjQyZWU5NmQ0YzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5jcHAKKysrIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1ByaXZhdGVDbGlja01lYXN1cmVtZW50 LmNwcApAQCAtNDIsMTQgKzQyLDIxIEBAIGNvbnN0IFVSTCBlbXB0eVVSTCB7IH07CiAKIC8vIFBv c2l0aXZlIHRlc3QgY2FzZXMuCiAKLVRFU1QoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIFZhbGlk TWluVmFsdWVzKQorVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgV2VsbEtub3duVVJMcykK IHsKICAgICBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCBhdHRyaWJ1dGlvbiB7IFByaXZhdGVDbGlj a01lYXN1cmVtZW50OjpTb3VyY2VJRChtaW42Qml0VmFsdWUpLCBQcml2YXRlQ2xpY2tNZWFzdXJl bWVudDo6U291cmNlU2l0ZSB7IHdlYktpdFVSTCB9LCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6 QXR0cmlidXRlT25TaXRlIHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uYXR0cmli dXRlQW5kR2V0RWFybGllc3RUaW1lVG9TZW5kKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRy aWJ1dGlvblRyaWdnZXJEYXRhKG1pbjZCaXRWYWx1ZSwgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6 OlByaW9yaXR5KG1pbjZCaXRWYWx1ZSkpKTsKIAotICAgIGF1dG8gYXR0cmlidXRpb25VUkwgPSBh dHRyaWJ1dGlvbi5hdHRyaWJ1dGlvblJlcG9ydFVSTCgpOwotICAgIAotICAgIEFTU0VSVF9FUShh dHRyaWJ1dGlvblVSTC5zdHJpbmcoKSwgImh0dHBzOi8vd2Via2l0Lm9yZy8ud2VsbC1rbm93bi9w cml2YXRlLWNsaWNrLW1lYXN1cmVtZW50L3JlcG9ydC1hdHRyaWJ1dGlvbi8iKTsKKyAgICBhdXRv IGF0dHJpYnV0aW9uU291cmNlVVJMID0gYXR0cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRTb3Vy Y2VVUkwoKTsKKyAgICBBU1NFUlRfRVEoYXR0cmlidXRpb25Tb3VyY2VVUkwuc3RyaW5nKCksICJo dHRwczovL3dlYmtpdC5vcmcvLndlbGwta25vd24vcHJpdmF0ZS1jbGljay1tZWFzdXJlbWVudC9y ZXBvcnQtYXR0cmlidXRpb24vIik7CisgICAgYXV0byBhdHRyaWJ1dGlvbkF0dHJpYnV0ZU9uVVJM ID0gYXR0cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRBdHRyaWJ1dGVPblVSTCgpOworICAgIEFT U0VSVF9FUShhdHRyaWJ1dGlvbkF0dHJpYnV0ZU9uVVJMLnN0cmluZygpLCAiaHR0cHM6Ly9leGFt cGxlLmNvbS8ud2VsbC1rbm93bi9wcml2YXRlLWNsaWNrLW1lYXN1cmVtZW50L3JlcG9ydC1hdHRy aWJ1dGlvbi8iKTsKK30KKworVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgVmFsaWRNaW5W YWx1ZXMpCit7CisgICAgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQgYXR0cmlidXRpb24geyBQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudDo6U291cmNlSUQobWluNkJpdFZhbHVlKSwgUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnQ6OlNvdXJjZVNpdGUgeyB3ZWJLaXRVUkwgfSwgUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnQ6OkF0dHJpYnV0ZU9uU2l0ZSB7IGV4YW1wbGVVUkwgfSB9OworICAgIGF0dHJpYnV0aW9u LmF0dHJpYnV0ZUFuZEdldEVhcmxpZXN0VGltZVRvU2VuZChQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dDo6QXR0cmlidXRpb25UcmlnZ2VyRGF0YShtaW42Qml0VmFsdWUsIFByaXZhdGVDbGlja01lYXN1 cmVtZW50OjpQcmlvcml0eShtaW42Qml0VmFsdWUpKSk7CiAKICAgICBBU1NFUlRfRVEoYXR0cmli dXRpb24uYXR0cmlidXRpb25SZXBvcnRKU09OKCktPnRvSlNPTlN0cmluZygpLCAie1wic291cmNl X2VuZ2FnZW1lbnRfdHlwZVwiOlwiY2xpY2tcIixcInNvdXJjZV9zaXRlXCI6XCJ3ZWJraXQub3Jn XCIsXCJzb3VyY2VfaWRcIjowLFwiYXR0cmlidXRlZF9vbl9zaXRlXCI6XCJleGFtcGxlLmNvbVwi LFwidHJpZ2dlcl9kYXRhXCI6MCxcInZlcnNpb25cIjoyfSIpOwogfQpAQCAtNTksMTAgKzY2LDYg QEAgVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgVmFsaWRNaWRWYWx1ZXMpCiAgICAgUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQgYXR0cmlidXRpb24geyBQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dDo6U291cmNlSUQoKHVpbnQzMl90KTE5MiksIFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3Vy Y2VTaXRlIHsgd2ViS2l0VVJMIH0sIFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGVP blNpdGUgeyBleGFtcGxlVVJMIH0gfTsKICAgICBhdHRyaWJ1dGlvbi5hdHRyaWJ1dGVBbmRHZXRF YXJsaWVzdFRpbWVUb1NlbmQoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OkF0dHJpYnV0aW9uVHJp Z2dlckRhdGEoKHVpbnQzMl90KTksIFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpQcmlvcml0eSgo dWludDMyX3QpMjIpKSk7CiAKLSAgICBhdXRvIGF0dHJpYnV0aW9uVVJMID0gYXR0cmlidXRpb24u YXR0cmlidXRpb25SZXBvcnRVUkwoKTsKLSAgICAKLSAgICBBU1NFUlRfRVEoYXR0cmlidXRpb25V Ukwuc3RyaW5nKCksICJodHRwczovL3dlYmtpdC5vcmcvLndlbGwta25vd24vcHJpdmF0ZS1jbGlj ay1tZWFzdXJlbWVudC9yZXBvcnQtYXR0cmlidXRpb24vIik7Ci0KICAgICBBU1NFUlRfRVEoYXR0 cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRKU09OKCktPnRvSlNPTlN0cmluZygpLCAie1wic291 cmNlX2VuZ2FnZW1lbnRfdHlwZVwiOlwiY2xpY2tcIixcInNvdXJjZV9zaXRlXCI6XCJ3ZWJraXQu b3JnXCIsXCJzb3VyY2VfaWRcIjoxOTIsXCJhdHRyaWJ1dGVkX29uX3NpdGVcIjpcImV4YW1wbGUu Y29tXCIsXCJ0cmlnZ2VyX2RhdGFcIjo5LFwidmVyc2lvblwiOjJ9Iik7CiB9CiAKQEAgLTcxLDEw ICs3NCw2IEBAIFRFU1QoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIFZhbGlkTWF4VmFsdWVzKQog ICAgIFByaXZhdGVDbGlja01lYXN1cmVtZW50IGF0dHJpYnV0aW9uIHsgUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnQ6OlNvdXJjZUlEKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VJRDo6TWF4 RW50cm9weSksIFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VTaXRlIHsgd2ViS2l0VVJM IH0sIFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGVPblNpdGUgeyBleGFtcGxlVVJM IH0gfTsKICAgICBhdHRyaWJ1dGlvbi5hdHRyaWJ1dGVBbmRHZXRFYXJsaWVzdFRpbWVUb1NlbmQo UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OkF0dHJpYnV0aW9uVHJpZ2dlckRhdGEoUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnQ6OkF0dHJpYnV0aW9uVHJpZ2dlckRhdGE6Ok1heEVudHJvcHksIFByaXZh dGVDbGlja01lYXN1cmVtZW50OjpQcmlvcml0eShQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6UHJp b3JpdHk6Ok1heEVudHJvcHkpKSk7CiAKLSAgICBhdXRvIGF0dHJpYnV0aW9uVVJMID0gYXR0cmli dXRpb24uYXR0cmlidXRpb25SZXBvcnRVUkwoKTsKLSAgICAKLSAgICBBU1NFUlRfRVEoYXR0cmli dXRpb25VUkwuc3RyaW5nKCksICJodHRwczovL3dlYmtpdC5vcmcvLndlbGwta25vd24vcHJpdmF0 ZS1jbGljay1tZWFzdXJlbWVudC9yZXBvcnQtYXR0cmlidXRpb24vIik7Ci0KICAgICBBU1NFUlRf RVEoYXR0cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRKU09OKCktPnRvSlNPTlN0cmluZygpLCAi e1wic291cmNlX2VuZ2FnZW1lbnRfdHlwZVwiOlwiY2xpY2tcIixcInNvdXJjZV9zaXRlXCI6XCJ3 ZWJraXQub3JnXCIsXCJzb3VyY2VfaWRcIjoyNTUsXCJhdHRyaWJ1dGVkX29uX3NpdGVcIjpcImV4 YW1wbGUuY29tXCIsXCJ0cmlnZ2VyX2RhdGFcIjoxNSxcInZlcnNpb25cIjoyfSIpOwogfQogCkBA IC0xMzcsNyArMTM2LDggQEAgVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgSW52YWxpZFNv dXJjZUlEKQogICAgIFByaXZhdGVDbGlja01lYXN1cmVtZW50IGF0dHJpYnV0aW9uIHsgUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQ6OlNvdXJjZUlEKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3Vy Y2VJRDo6TWF4RW50cm9weSArIDEpLCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6U291cmNlU2l0 ZSB7IHdlYktpdFVSTCB9LCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6QXR0cmlidXRlT25TaXRl IHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uYXR0cmlidXRlQW5kR2V0RWFybGll c3RUaW1lVG9TZW5kKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlvblRyaWdnZXJE YXRhKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlvblRyaWdnZXJEYXRhOjpNYXhF bnRyb3B5LCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6UHJpb3JpdHkoUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnQ6OlByaW9yaXR5OjpNYXhFbnRyb3B5KSkpOwogCi0gICAgQVNTRVJUX1RSVUUoYXR0 cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRVUkwoKS5pc0VtcHR5KCkpOworICAgIEFTU0VSVF9U UlVFKGF0dHJpYnV0aW9uLmF0dHJpYnV0aW9uUmVwb3J0U291cmNlVVJMKCkuaXNFbXB0eSgpKTsK KyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlvbi5hdHRyaWJ1dGlvblJlcG9ydEF0dHJpYnV0ZU9u VVJMKCkuaXNFbXB0eSgpKTsKIH0KIAogVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgSW52 YWxpZFNvdXJjZUhvc3QpCkBAIC0xNDUsNyArMTQ1LDggQEAgVEVTVChQcml2YXRlQ2xpY2tNZWFz dXJlbWVudCwgSW52YWxpZFNvdXJjZUhvc3QpCiAgICAgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQg YXR0cmlidXRpb24geyBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6U291cmNlSUQoUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnQ6OlNvdXJjZUlEOjpNYXhFbnRyb3B5KSwgUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnQ6OlNvdXJjZVNpdGUgeyBlbXB0eVVSTCB9LCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6 QXR0cmlidXRlT25TaXRlIHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uYXR0cmli dXRlQW5kR2V0RWFybGllc3RUaW1lVG9TZW5kKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRy aWJ1dGlvblRyaWdnZXJEYXRhKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlvblRy aWdnZXJEYXRhOjpNYXhFbnRyb3B5LCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6UHJpb3JpdHko UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlByaW9yaXR5OjpNYXhFbnRyb3B5KSkpOwogCi0gICAg QVNTRVJUX1RSVUUoYXR0cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRVUkwoKS5pc0VtcHR5KCkp OworICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLmF0dHJpYnV0aW9uUmVwb3J0U291cmNlVVJM KCkuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlvbi5hdHRyaWJ1dGlvblJl cG9ydEF0dHJpYnV0ZU9uVVJMKCkuaXNFbXB0eSgpKTsKIH0KIAogVEVTVChQcml2YXRlQ2xpY2tN ZWFzdXJlbWVudCwgSW52YWxpZERlc3RpbmF0aW9uSG9zdCkKQEAgLTE1Myw3ICsxNTQsOCBAQCBU RVNUKFByaXZhdGVDbGlja01lYXN1cmVtZW50LCBJbnZhbGlkRGVzdGluYXRpb25Ib3N0KQogICAg IFByaXZhdGVDbGlja01lYXN1cmVtZW50IGF0dHJpYnV0aW9uIHsgUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnQ6OlNvdXJjZUlEKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VJRDo6TWF4RW50 cm9weSArIDEpLCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6U291cmNlU2l0ZSB7IHdlYktpdFVS TCB9LCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6QXR0cmlidXRlT25TaXRlIHsgZW1wdHlVUkwg fSB9OwogICAgIGF0dHJpYnV0aW9uLmF0dHJpYnV0ZUFuZEdldEVhcmxpZXN0VGltZVRvU2VuZChQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6QXR0cmlidXRpb25UcmlnZ2VyRGF0YShQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudDo6QXR0cmlidXRpb25UcmlnZ2VyRGF0YTo6TWF4RW50cm9weSwgUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQ6OlByaW9yaXR5KFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpQcmlv cml0eTo6TWF4RW50cm9weSkpKTsKIAotICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLmF0dHJp YnV0aW9uUmVwb3J0VVJMKCkuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlv bi5hdHRyaWJ1dGlvblJlcG9ydFNvdXJjZVVSTCgpLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUX1RS VUUoYXR0cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRBdHRyaWJ1dGVPblVSTCgpLmlzRW1wdHko KSk7CiB9CiAKIFRFU1QoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIEF0dHJpYnV0aW9uVHJpZ2dl ckRhdGEpCkBAIC0xNjEsNyArMTYzLDggQEAgVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwg QXR0cmlidXRpb25UcmlnZ2VyRGF0YSkKICAgICBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCBhdHRy aWJ1dGlvbiB7IFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VJRChQcml2YXRlQ2xpY2tN ZWFzdXJlbWVudDo6U291cmNlSUQ6Ok1heEVudHJvcHkpLCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dDo6U291cmNlU2l0ZSB7IHdlYktpdFVSTCB9LCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6QXR0 cmlidXRlT25TaXRlIHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uYXR0cmlidXRl QW5kR2V0RWFybGllc3RUaW1lVG9TZW5kKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1 dGlvblRyaWdnZXJEYXRhKChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6QXR0cmlidXRpb25Ucmln Z2VyRGF0YTo6TWF4RW50cm9weSArIDEpLCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6UHJpb3Jp dHkoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlByaW9yaXR5OjpNYXhFbnRyb3B5KSkpOwogCi0g ICAgQVNTRVJUX1RSVUUoYXR0cmlidXRpb24uYXR0cmlidXRpb25SZXBvcnRVUkwoKS5pc0VtcHR5 KCkpOworICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLmF0dHJpYnV0aW9uUmVwb3J0U291cmNl VVJMKCkuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlvbi5hdHRyaWJ1dGlv blJlcG9ydEF0dHJpYnV0ZU9uVVJMKCkuaXNFbXB0eSgpKTsKIH0KIAogVEVTVChQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudCwgSW52YWxpZFByaW9yaXR5KQpAQCAtMTY5LDE0ICsxNzIsMTYgQEAgVEVT VChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgSW52YWxpZFByaW9yaXR5KQogICAgIFByaXZhdGVD bGlja01lYXN1cmVtZW50IGF0dHJpYnV0aW9uIHsgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlNv dXJjZUlEKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VJRDo6TWF4RW50cm9weSksIFBy aXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VTaXRlIHsgd2ViS2l0VVJMIH0sIFByaXZhdGVD bGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGVPblNpdGUgeyBleGFtcGxlVVJMIH0gfTsKICAgICBh dHRyaWJ1dGlvbi5hdHRyaWJ1dGVBbmRHZXRFYXJsaWVzdFRpbWVUb1NlbmQoUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnQ6OkF0dHJpYnV0aW9uVHJpZ2dlckRhdGEoUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnQ6OkF0dHJpYnV0aW9uVHJpZ2dlckRhdGE6Ok1heEVudHJvcHksIFByaXZhdGVDbGlja01lYXN1 cmVtZW50OjpQcmlvcml0eShQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6UHJpb3JpdHk6Ok1heEVu dHJvcHkgKyAxKSkpOwogCi0gICAgQVNTRVJUX1RSVUUoYXR0cmlidXRpb24uYXR0cmlidXRpb25S ZXBvcnRVUkwoKS5pc0VtcHR5KCkpOworICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLmF0dHJp YnV0aW9uUmVwb3J0U291cmNlVVJMKCkuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlRfVFJVRShhdHRy aWJ1dGlvbi5hdHRyaWJ1dGlvblJlcG9ydEF0dHJpYnV0ZU9uVVJMKCkuaXNFbXB0eSgpKTsKIH0K IAogVEVTVChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgSW52YWxpZE1pc3NpbmdDb252ZXJzaW9u KQogewogICAgIFByaXZhdGVDbGlja01lYXN1cmVtZW50IGF0dHJpYnV0aW9uIHsgUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnQ6OlNvdXJjZUlEKFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VJ RDo6TWF4RW50cm9weSksIFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VTaXRlIHsgd2Vi S2l0VVJMIH0sIFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGVPblNpdGUgeyBleGFt cGxlVVJMIH0gfTsKIAotICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLmF0dHJpYnV0aW9uUmVw b3J0VVJMKCkuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlvbi5hdHRyaWJ1 dGlvblJlcG9ydFNvdXJjZVVSTCgpLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUX1RSVUUoYXR0cmli dXRpb24uYXR0cmlidXRpb25SZXBvcnRBdHRyaWJ1dGVPblVSTCgpLmlzRW1wdHkoKSk7CiAgICAg QVNTRVJUX0ZBTFNFKGF0dHJpYnV0aW9uLmVhcmxpZXN0VGltZVRvU2VuZCgpKTsKIH0KIAo=