218634 2020-11-05 14:29:25 -0800 PCM: Switch to JSON report format 2020-11-05 16:17:05 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander achristensen annulen bfulgham cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim japhet ryuan.choi sergio webkit-bug-importer oldest_to_newest 1705013 0 wilander 2020-11-05 14:29:25 -0800 The standards conversation has landed in attribution reports in a JSON format as opposed to the currently implemented URL format. Discussion here: https://github.com/privacycg/private-click-measurement/issues/30 1705014 1 wilander 2020-11-05 14:31:34 -0800 <rdar://problem/70469923> 1705021 2 413354 wilander 2020-11-05 14:47:44 -0800 Created attachment 413354 Patch 1705037 3 413354 bfulgham 2020-11-05 15:46:54 -0800 Comment on attachment 413354 Patch LGTM. r=me 1705038 4 wilander 2020-11-05 15:47:16 -0800 Thanks, Brent! 1705042 5 413354 wilander 2020-11-05 16:04:14 -0800 Comment on attachment 413354 Patch ios-wk2 failures unrelated. 1705049 6 ews-feeder 2020-11-05 16:17:03 -0800 Committed r269489: <https://trac.webkit.org/changeset/269489> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413354. 413354 2020-11-05 14:47:44 -0800 2020-11-05 16:17:04 -0800 Patch bug-218634-20201105144744.patch text/plain 28044 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFhNDczNTQ2NmVmMGE3 NDJmOWE5ZWM3M2MwODcyZDI0NmEyODRlMi4uODRiOGY1Mjg2Y2I3ZGNmNzY0YTFhZDAyZGYzOTIy NTY1N2EyNjI3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDIwLTExLTA1ICBKb2hu IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFBDTTogU3dpdGNoIHRv IEpTT04gcmVwb3J0IGZvcm1hdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NjM0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MDQ2OTkyMz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgc3RhbmRh cmRzIGNvbnZlcnNhdGlvbiBoYXMgbGFuZGVkIGluIGF0dHJpYnV0aW9uIHJlcG9ydHMgaW4gYSBK U09OCisgICAgICAgIGZvcm1hdCBhcyBvcHBvc2VkIHRvIHRoZSBjdXJyZW50bHkgaW1wbGVtZW50 ZWQgVVJMIGZvcm1hdC4gRGlzY3Vzc2lvbgorICAgICAgICBoZXJlOiBodHRwczovL2dpdGh1Yi5j b20vcHJpdmFjeWNnL3ByaXZhdGUtY2xpY2stbWVhc3VyZW1lbnQvaXNzdWVzLzMwCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiBFeGlzdGluZyBsYXlvdXQgYW5kIEFQSSB0ZXN0cyB3ZXJlIHVwZGF0 ZWQuCisKKyAgICAgICAgKiBIZWFkZXJzLmNtYWtlOgorICAgICAgICAgICAgQWRkZWQgcGxhdGZv cm0vbmV0d29yay9IVFRQSGVhZGVyVmFsdWVzLmggdG8gYmUgYWJsZSB0byBleHBvc2UgaXQKKyAg ICAgICAgICAgIHRvIFdlYktpdC4KKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2o6CisgICAgICAgICAgICBOb3cgZXhwb3J0aW5nIHBsYXRmb3JtL25ldHdvcmsvSFRU UEhlYWRlclZhbHVlcy5oLgorICAgICAgICAqIGh0bWwvSFRNTEFuY2hvckVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTEFuY2hvckVsZW1lbnQ6OmhhbmRsZUNsaWNrKToKKyAgICAg ICAgICAgIENoYW5nZWQgYSBmdW5jdGlvbiBjYWxsIGZyb20gQWRDbGlja0F0dHJpYnV0aW9uOjp1 cmwoKSB0bworICAgICAgICAgICAgQWRDbGlja0F0dHJpYnV0aW9uOjpyZXBvcnRVUkwoKS4KKyAg ICAgICAgKiBsb2FkZXIvQWRDbGlja0F0dHJpYnV0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFkQ2xpY2tBdHRyaWJ1dGlvbjo6cmVwb3J0VVJMIGNvbnN0KToKKyAgICAgICAgICAgIFRoZSBV Ukwgbm8gbG9uZ2VyIGNhcnJpZXMgdGhlIHJlcG9ydCB2YWx1ZXMuCisgICAgICAgICAgICBSZW5h bWVkIGZyb20gQWRDbGlja0F0dHJpYnV0aW9uOjp1cmwoKS4KKyAgICAgICAgKFdlYkNvcmU6OkFk Q2xpY2tBdHRyaWJ1dGlvbjo6anNvbiBjb25zdCk6CisgICAgICAgICAgICBOZXcgZnVuY3Rpb24g dG8gZ2VuZXJhdGUgYW5kIHJldHVybiB0aGUgcmVwb3J0IEpTT04uCisgICAgICAgIChXZWJDb3Jl OjpBZENsaWNrQXR0cmlidXRpb246OnVybCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICAgICBS ZW5hbWVkIHRvIEFkQ2xpY2tBdHRyaWJ1dGlvbjo6cmVwb3J0VVJMKCkuCisgICAgICAgIChXZWJD b3JlOjpBZENsaWNrQXR0cmlidXRpb246OnJlZmVycmVyIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgICAgIFRoZSByZWZlcnJlciBpcyBub3cgcGFydCBvZiB0aGUgcmVwb3J0IEpTT04uCisgICAg ICAgIChXZWJDb3JlOjpBZENsaWNrQXR0cmlidXRpb246OnVybEZvclRlc3RpbmcgY29uc3QpOiBE ZWxldGVkLgorICAgICAgICAgICAgVGhpcyBjbGFzcyBubyBsb25nZXIgbmVlZHMgdG8gaGVscCBn ZW5lcmF0ZSB0ZXN0IFVSTHMKKyAgICAgICAgICAgIHNpbmNlIHJlcG9ydCB2YWx1ZXMgYXJlIG5v dyBpbiBKU09OLgorICAgICAgICAqIGxvYWRlci9BZENsaWNrQXR0cmlidXRpb24uaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmg6CisgICAgICAgICAgICBBZGRlZCBleHBv cnQgb2YgY3JlYXRlKGNvbnN0IENTdHJpbmcmKS4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L0hUVFBIZWFkZXJWYWx1ZXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRUUEhlYWRlclZhbHVl czo6YXBwbGljYXRpb25KU09OQ29udGVudFR5cGUpOgorICAgICAgICAgICAgVXNlZCBjcmVhdGUg dGhlIG5ldyBKU09OIHJlcG9ydCByZXF1ZXN0LgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv SFRUUEhlYWRlclZhbHVlcy5oOgorICAgICAgICAgICAgQWRkZWQgZXhwb3J0IG9mIG1heEFnZTAo KS4KKwogMjAyMC0xMS0wNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIENyYXNoIGluIEF1ZGlvQnVmZmVyOjpzYW1wbGVSYXRlKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMWUzMTE0 MTZmMmMyOTVlZGNiNTA4ZWU0YTM0NzYwN2U4YmZiZDk2NS4uNDAwZTFmMGI2ODlmMGM0NDA1ODY1 Mjg0ZGE2NGJmZDIxNzdhNGM3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0xMS0w NSAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBQQ006IFN3 aXRjaCB0byBKU09OIHJlcG9ydCBmb3JtYXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxODYzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzA0Njk5 MjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHN0YW5kYXJkcyBjb252ZXJzYXRpb24gaGFzIGxhbmRlZCBpbiBhdHRyaWJ1dGlvbiByZXBvcnRz IGluIGEgSlNPTgorICAgICAgICBmb3JtYXQgYXMgb3Bwb3NlZCB0byB0aGUgY3VycmVudGx5IGlt cGxlbWVudGVkIFVSTCBmb3JtYXQuIERpc2N1c3Npb24KKyAgICAgICAgaGVyZTogaHR0cHM6Ly9n aXRodWIuY29tL3ByaXZhY3ljZy9wcml2YXRlLWNsaWNrLW1lYXN1cmVtZW50L2lzc3Vlcy8zMAor CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQWRDbGlja0F0dHJpYnV0aW9uTWFuYWdlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkFkQ2xpY2tBdHRyaWJ1dGlvbk1hbmFnZXI6OmZpcmVDb252ZXJz aW9uUmVxdWVzdCk6CisKIDIwMjAtMTEtMDUgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFttYWNPU10gVXBkYXRlIG1lc3NhZ2UgZmlsdGVycyBpbiB0aGUg V2ViQ29udGVudCBzYW5kYm94CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNt YWtlIGIvU291cmNlL1dlYkNvcmUvSGVhZGVycy5jbWFrZQppbmRleCA2ZjhhMDg3NjQ5OTA1NWJh NDhhZmViN2EzNGExZjRlODg2NWZmYTUyLi5iMzUxNWQzZDViN2Y3M2Y3OTYxMzk2MGJlMDRiMzdi NDU3OTIyOTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCisrKyBi L1NvdXJjZS9XZWJDb3JlL0hlYWRlcnMuY21ha2UKQEAgLTEzNDMsNiArMTM0Myw3IEBAIHNldChX ZWJDb3JlX1BSSVZBVEVfRlJBTUVXT1JLX0hFQURFUlMKICAgICBwbGF0Zm9ybS9uZXR3b3JrL0Zv cm1EYXRhLmgKICAgICBwbGF0Zm9ybS9uZXR3b3JrL0hUVFBDb29raWVBY2NlcHRQb2xpY3kuaAog ICAgIHBsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1hcC5oCisgICAgcGxhdGZvcm0vbmV0d29y ay9IVFRQSGVhZGVyVmFsdWVzLmgKICAgICBwbGF0Zm9ybS9uZXR3b3JrL0hUVFBQYXJzZXJzLmgK ICAgICBwbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtMb2FkSW5mb3JtYXRpb24uaAogICAgIHBsYXRm b3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA4NmYxODU5OWJmNjMwMmM0MmFh M2RhYzc0ZDVhNDQyYWQ5NWJjYzlmLi44NWQ2MmUyMjEzMWIyY2QwZDk3MTk0YjVkOWI0ZDBiNmQ3 YTc3YmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCkBAIC0xMDY3LDcgKzEwNjcsNyBAQAogCQk0MTU3RUJGQjFFM0FCNjdGMDBBQzlG RTkgLyogTW9ja0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MTU3RUJGODFFM0FCMDY4MDBBQzlGRTkgLyogTW9j a0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uLmggKi87IH07CiAJCTQxNTg2NEEwMjNCRjdDQkYwMEEw QTYxRSAvKiBSZWFsdGltZVZpZGVvVXRpbGl0aWVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MUQxOTM4RjIxNTJDNTYxMDA2RjE0Q0EgLyogUmVhbHRp bWVWaWRlb1V0aWxpdGllcy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUs ICk7IH07IH07CiAJCTQxNUNEQUY1MUU2QjhGOEIwMDRGMTFFRSAvKiBDYW52YXNDYXB0dXJlTWVk aWFTdHJlYW1UcmFjay5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNDFDN0UxMDYxRTZBNTQzNjAwMjdCNERFIC8qIENhbnZhc0NhcHR1cmVNZWRpYVN0cmVh bVRyYWNrLmggKi87IH07Ci0JCTQxNjE0QTc5MURBNjQyNDEwMDRBRDA2RiAvKiBIVFRQSGVhZGVy VmFsdWVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0 MTYxNEE3NzFEQTY0MjM2MDA0QUQwNkYgLyogSFRUUEhlYWRlclZhbHVlcy5oICovOyB9OworCQk0 MTYxNEE3OTFEQTY0MjQxMDA0QUQwNkYgLyogSFRUUEhlYWRlclZhbHVlcy5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDE2MTRBNzcxREE2NDIzNjAwNEFE MDZGIC8qIEhUVFBIZWFkZXJWYWx1ZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQ cml2YXRlLCApOyB9OyB9OwogCQk0MTYxRTJENTFGRTQ4REM1MDBFQzJFOTYgLyogRmV0Y2hMb2Fk ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxNDdF MkI1MUM4OTkxMjYwMEE3RTcxNSAvKiBGZXRjaExvYWRlci5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTQxNjJBNDUxMTAxMTQ1QUUwMERGRjNFRCAv KiBEZWRpY2F0ZWRXb3JrZXJHbG9iYWxTY29wZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gNDE2MkE0NEUxMDExNDVBRTAwREZGM0VEIC8qIERlZGljYXRl ZFdvcmtlckdsb2JhbFNjb3BlLmggKi87IH07CiAJCTQxNjJBNDU4MTAxMTQ2NDcwMERGRjNFRCAv KiBKU0RlZGljYXRlZFdvcmtlckdsb2JhbFNjb3BlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MTYyQTQ1NjEwMTE0NjQ3MDBERkYzRUQgLyogSlNEZWRp Y2F0ZWRXb3JrZXJHbG9iYWxTY29wZS5oICovOyB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MQW5jaG9yRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxB bmNob3JFbGVtZW50LmNwcAppbmRleCBlZDEyYWQxMjNmMzVkN2I3YjVjYzlmNDVkNGM5ZmYwNDU1 MDY1MDMyLi45Y2M4YjY0ODJhNzI2ZWZlZjIwOGNlMjk5YWNkMjEzYjZmZDM0ZjY2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVtZW50LmNwcApAQCAtNTIxLDcgKzUyMSw3IEBA IHZvaWQgSFRNTEFuY2hvckVsZW1lbnQ6OmhhbmRsZUNsaWNrKEV2ZW50JiBldmVudCkKICAgICBh dXRvIGFkQ2xpY2tBdHRyaWJ1dGlvbiA9IHBhcnNlQWRDbGlja0F0dHJpYnV0aW9uKCk7CiAgICAg Ly8gQSBtYXRjaGluZyBjb252ZXJzaW9uIGV2ZW50IG5lZWRzIHRvIGhhcHBlbiBiZWZvcmUgdGhl IGNvbXBsZXRlIGFkIGNsaWNrIGF0dHJpYnV0aW9uVVJMIGNhbiBiZQogICAgIC8vIGNyZWF0ZWQu IFRodXMsIGl0IHNob3VsZCBiZSBlbXB0eSBmb3Igbm93LgotICAgIEFTU0VSVCghYWRDbGlja0F0 dHJpYnV0aW9uIHx8IGFkQ2xpY2tBdHRyaWJ1dGlvbi0+dXJsKCkuaXNOdWxsKCkpOworICAgIEFT U0VSVCghYWRDbGlja0F0dHJpYnV0aW9uIHx8IGFkQ2xpY2tBdHRyaWJ1dGlvbi0+cmVwb3J0VVJM KCkuaXNOdWxsKCkpOwogICAgIAogICAgIGZyYW1lLT5sb2FkZXIoKS5jaGFuZ2VMb2NhdGlvbihj b21wbGV0ZWRVUkwsIGVmZmVjdGl2ZVRhcmdldCwgJmV2ZW50LCBMb2NrSGlzdG9yeTo6Tm8sIExv Y2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCByZWZlcnJlclBvbGljeSwgZG9jdW1lbnQoKS5zaG91bGRP cGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUoKSwgbmV3RnJhbWVPcGVuZXJQb2xpY3ks IGRvd25sb2FkQXR0cmlidXRlLCBzeXN0ZW1QcmV2aWV3SW5mbywgV1RGTW92ZShhZENsaWNrQXR0 cmlidXRpb24pKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0FkQ2xpY2tB dHRyaWJ1dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQWRDbGlja0F0dHJpYnV0aW9u LmNwcAppbmRleCA3NmQ0YWZiOTVmZjRiNDZkYzAyYWNjZTA3ZGY0YWVjOWM1NGJmMTViLi40MjMx MWJlOGQ5OWEyMzFiOWE0NjU1MWIwZTQ5M2EwNWFlODE4NGQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvQWRDbGlja0F0dHJpYnV0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvQWRDbGlja0F0dHJpYnV0aW9uLmNwcApAQCAtMTQ3LDcgKzE0Nyw3IEBAIGJvb2wg QWRDbGlja0F0dHJpYnV0aW9uOjpoYXNIaWdoZXJQcmlvcml0eVRoYW4oY29uc3QgQWRDbGlja0F0 dHJpYnV0aW9uJiBvdGhlcikKICAgICByZXR1cm4gbV9jb252ZXJzaW9uLT5wcmlvcml0eSA+IG90 aGVyLm1fY29udmVyc2lvbi0+cHJpb3JpdHk7CiB9CiAKLVVSTCBBZENsaWNrQXR0cmlidXRpb246 OnVybCgpIGNvbnN0CitVUkwgQWRDbGlja0F0dHJpYnV0aW9uOjpyZXBvcnRVUkwoKSBjb25zdAog ewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm4gVVJMKCk7CkBAIC0xNTYsOSAr MTU2LDYgQEAgVVJMIEFkQ2xpY2tBdHRyaWJ1dGlvbjo6dXJsKCkgY29uc3QKICAgICBidWlsZGVy LmFwcGVuZExpdGVyYWwoImh0dHBzOi8vIik7CiAgICAgYnVpbGRlci5hcHBlbmQobV9zb3VyY2Uu cmVnaXN0cmFibGVEb21haW4uc3RyaW5nKCkpOwogICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbChh ZENsaWNrQXR0cmlidXRpb25QYXRoUHJlZml4KTsKLSAgICBidWlsZGVyLmFwcGVuZE51bWJlciht X2NvbnZlcnNpb24udmFsdWUoKS5kYXRhKTsKLSAgICBidWlsZGVyLmFwcGVuZCgnLycpOwotICAg IGJ1aWxkZXIuYXBwZW5kTnVtYmVyKG1fY2FtcGFpZ24uaWQpOwogCiAgICAgVVJMIHVybCB7IFVS TCgpLCBidWlsZGVyLnRvU3RyaW5nKCkgfTsKICAgICBpZiAodXJsLmlzVmFsaWQoKSkKQEAgLTE2 NywzNCArMTY0LDE5IEBAIFVSTCBBZENsaWNrQXR0cmlidXRpb246OnVybCgpIGNvbnN0CiAgICAg cmV0dXJuIFVSTCgpOwogfQogCi1VUkwgQWRDbGlja0F0dHJpYnV0aW9uOjpyZWZlcnJlcigpIGNv bnN0Ci17Ci0gICAgaWYgKCFpc1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiBVUkwoKTsKLQotICAg IFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKLSAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoImh0dHBz Oi8vIik7Ci0gICAgYnVpbGRlci5hcHBlbmQobV9kZXN0aW5hdGlvbi5yZWdpc3RyYWJsZURvbWFp bi5zdHJpbmcoKSk7Ci0gICAgYnVpbGRlci5hcHBlbmQoJy8nKTsKLQotICAgIFVSTCB1cmwgeyBV UkwoKSwgYnVpbGRlci50b1N0cmluZygpIH07Ci0gICAgaWYgKHVybC5pc1ZhbGlkKCkpCi0gICAg ICAgIHJldHVybiB1cmw7Ci0gICAgCi0gICAgcmV0dXJuIFVSTCgpOwotfQotCi1VUkwgQWRDbGlj a0F0dHJpYnV0aW9uOjp1cmxGb3JUZXN0aW5nKGNvbnN0IFVSTCYgYmFzZVVSTCkgY29uc3QKK1Jl ZjxKU09OOjpPYmplY3Q+IEFkQ2xpY2tBdHRyaWJ1dGlvbjo6anNvbigpIGNvbnN0CiB7Ci0gICAg YXV0byBob3N0ID0gbV9zb3VyY2UucmVnaXN0cmFibGVEb21haW4uc3RyaW5nKCk7Ci0gICAgaWYg KGhvc3QgIT0gImxvY2FsaG9zdCIgJiYgaG9zdCAhPSAiMTI3LjAuMC4xIikKLSAgICAgICAgcmV0 dXJuIFVSTCgpOwotICAgIFN0cmluZyByZWxhdGl2ZVVSTDsKLSAgICBpZiAoIWJhc2VVUkwuaGFz UXVlcnkoKSkKLSAgICAgICAgcmVsYXRpdmVVUkwgPSBtYWtlU3RyaW5nKCI/Y29udmVyc2lvbj0i LCBtX2NvbnZlcnNpb24udmFsdWUoKS5kYXRhLCAiJmNhbXBhaWduPSIsIG1fY2FtcGFpZ24uaWQp OwotICAgIGVsc2UKLSAgICAgICAgcmVsYXRpdmVVUkwgPSBtYWtlU3RyaW5nKCI/Y29udmVyc2lv bj0iLCBtX2NvbnZlcnNpb24udmFsdWUoKS5kYXRhLCAiJmNhbXBhaWduPSIsIG1fY2FtcGFpZ24u aWQsICcmJywgYmFzZVVSTC5xdWVyeSgpKTsKLSAgICByZXR1cm4gVVJMKGJhc2VVUkwsIHJlbGF0 aXZlVVJMKTsKKyAgICBhdXRvIHJlcG9ydERldGFpbHMgPSBKU09OOjpPYmplY3Q6OmNyZWF0ZSgp OworICAgIGlmICghbV9jb252ZXJzaW9uKQorICAgICAgICByZXR1cm4gcmVwb3J0RGV0YWlsczsK KworICAgIHJlcG9ydERldGFpbHMtPnNldFN0cmluZygiY29udGVudC10eXBlIl9zLCAiY2xpY2si X3MpOworICAgIHJlcG9ydERldGFpbHMtPnNldFN0cmluZygiY29udGVudC1zaXRlIl9zLCBtX3Nv dXJjZS5yZWdpc3RyYWJsZURvbWFpbi5zdHJpbmcoKSk7CisgICAgcmVwb3J0RGV0YWlscy0+c2V0 SW50ZWdlcigiY29udGVudC1pZCJfcywgbV9jYW1wYWlnbi5pZCk7CisgICAgcmVwb3J0RGV0YWls cy0+c2V0U3RyaW5nKCJjb252ZXJzaW9uLXNpdGUiX3MsIG1fZGVzdGluYXRpb24ucmVnaXN0cmFi bGVEb21haW4uc3RyaW5nKCkpOworICAgIHJlcG9ydERldGFpbHMtPnNldEludGVnZXIoImNvbnZl cnNpb24tZGF0YSJfcywgbV9jb252ZXJzaW9uLT5kYXRhKTsKKyAgICByZXBvcnREZXRhaWxzLT5z ZXRJbnRlZ2VyKCJyZXBvcnQtdmVyc2lvbiJfcywgMSk7CisgICAgcmV0dXJuIHJlcG9ydERldGFp bHM7CiB9CiAKIHZvaWQgQWRDbGlja0F0dHJpYnV0aW9uOjptYXJrQ29udmVyc2lvbkFzU2VudCgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQWRDbGlja0F0dHJpYnV0aW9uLmgg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQWRDbGlja0F0dHJpYnV0aW9uLmgKaW5kZXggYzgzYzNl NTUyNTM5YmMyNzBjYTg5MGUxYjdjYTQzNTU5ZmVmYWU4OS4uN2QxOWVjYTAwYmE0M2MxODFkZDE0 ZjRhMzcwNTViODA4OTRmYTc4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Fk Q2xpY2tBdHRyaWJ1dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9BZENsaWNrQXR0 cmlidXRpb24uaApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIlJlZ2lzdHJhYmxlRG9tYWlu LmgiCiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+CiAjaW5jbHVkZSA8d3RmL0Zv cndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvSlNPTlZhbHVlcy5oPgogI2luY2x1ZGUgPHd0Zi9PcHRp b25hbC5oPgogI2luY2x1ZGUgPHd0Zi9VUkwuaD4KICNpbmNsdWRlIDx3dGYvV2FsbFRpbWUuaD4K QEAgLTI0Myw5ICsyNDQsOCBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIEV4 cGVjdGVkPENvbnZlcnNpb24sIFN0cmluZz4gcGFyc2VDb252ZXJzaW9uUmVxdWVzdChjb25zdCBV UkwmIHJlZGlyZWN0VVJMKTsKICAgICBXRUJDT1JFX0VYUE9SVCBPcHRpb25hbDxTZWNvbmRzPiBj b252ZXJ0QW5kR2V0RWFybGllc3RUaW1lVG9TZW5kKENvbnZlcnNpb24mJik7CiAgICAgV0VCQ09S RV9FWFBPUlQgYm9vbCBoYXNIaWdoZXJQcmlvcml0eVRoYW4oY29uc3QgQWRDbGlja0F0dHJpYnV0 aW9uJikgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQgVVJMIHVybCgpIGNvbnN0OwotICAgIFdF QkNPUkVfRVhQT1JUIFVSTCB1cmxGb3JUZXN0aW5nKGNvbnN0IFVSTCYgYmFzZVVSTEZvclRlc3Rp bmcpIGNvbnN0OwotICAgIFdFQkNPUkVfRVhQT1JUIFVSTCByZWZlcnJlcigpIGNvbnN0OworICAg IFdFQkNPUkVfRVhQT1JUIFVSTCByZXBvcnRVUkwoKSBjb25zdDsKKyAgICBXRUJDT1JFX0VYUE9S VCBSZWY8SlNPTjo6T2JqZWN0PiBqc29uKCkgY29uc3Q7CiAgICAgY29uc3QgU291cmNlJiBzb3Vy Y2UoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZTsgfTsKICAgICBjb25zdCBEZXN0aW5hdGlvbiYg ZGVzdGluYXRpb24oKSBjb25zdCB7IHJldHVybiBtX2Rlc3RpbmF0aW9uOyB9OwogICAgIE9wdGlv bmFsPFdhbGxUaW1lPiBlYXJsaWVzdFRpbWVUb1NlbmQoKSBjb25zdCB7IHJldHVybiBtX2Vhcmxp ZXN0VGltZVRvU2VuZDsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvRm9ybURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURh dGEuaAppbmRleCA2YWQwN2VjYzU3NmM2ZmI4ODNiODIyMGE0ODY4ZmU3ZGM1ZDgxMTAxLi5hOWY0 M2MxMjlhNTdlYTNjODQwODQ1NjkzNDU2NWNmN2VlNGQ0Y2U2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCkBAIC0xOTIsNyArMTkyLDcgQEAgcHVibGljOgog CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFJlZjxGb3JtRGF0YT4gY3JlYXRlKCk7CiAgICAg V0VCQ09SRV9FWFBPUlQgc3RhdGljIFJlZjxGb3JtRGF0YT4gY3JlYXRlKGNvbnN0IHZvaWQqLCBz aXplX3QpOwotICAgIHN0YXRpYyBSZWY8Rm9ybURhdGE+IGNyZWF0ZShjb25zdCBDU3RyaW5nJik7 CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFJlZjxGb3JtRGF0YT4gY3JlYXRlKGNvbnN0IENT dHJpbmcmKTsKICAgICBzdGF0aWMgUmVmPEZvcm1EYXRhPiBjcmVhdGUoVmVjdG9yPGNoYXI+JiYp OwogICAgIHN0YXRpYyBSZWY8Rm9ybURhdGE+IGNyZWF0ZShjb25zdCBWZWN0b3I8Y2hhcj4mKTsK ICAgICBzdGF0aWMgUmVmPEZvcm1EYXRhPiBjcmVhdGUoY29uc3QgVmVjdG9yPHVpbnQ4X3Q+Jik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJW YWx1ZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyVmFs dWVzLmNwcAppbmRleCA1NTk1ZWIzYTE4MThkOGU0MjIyYWM1YTU4MjNmYmUwYTNiNjU0MTU0Li5i NDg2OWU4NDZlZGZmMGNiM2NkOGRhZWM1NTg0NDlhOGNiNjNhMDUxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJWYWx1ZXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlclZhbHVlcy5jcHAKQEAgLTQ0 LDYgKzQ0LDEzIEBAIGNvbnN0IFN0cmluZyYgZm9ybVVSTEVuY29kZWRDb250ZW50VHlwZSgpCiAg ICAgcmV0dXJuIGNvbnRlbnRUeXBlOwogfQogCitjb25zdCBTdHJpbmcmIGFwcGxpY2F0aW9uSlNP TkNvbnRlbnRUeXBlKCkKK3sKKyAgICAvLyBUaGUgZGVmYXVsdCBlbmNvZGluZyBpcyBVVEYtODog aHR0cHM6Ly93d3cuaWV0Zi5vcmcvcmZjL3JmYzQ2MjcudHh0LgorICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxjb25zdCBTdHJpbmc+IGNvbnRlbnRUeXBlKE1BS0VfU1RBVElDX1NUUklOR19JTVBM KCJhcHBsaWNhdGlvbi9qc29uIikpOworICAgIHJldHVybiBjb250ZW50VHlwZTsKK30KKwogY29u c3QgU3RyaW5nJiBub0NhY2hlKCkKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3Qg U3RyaW5nPiB2YWx1ZShNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgibm8tY2FjaGUiKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJWYWx1ZXMu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlclZhbHVlcy5oCmlu ZGV4IDlkODVmOTYxYmE0ZTg0MjlmODQ3NDYwZmEwNDFhNTEwNzhmNGVlYTkuLjYzNDVhOWE4ZmNh NWE5M2JkMDU5ZGEwNjc1Mjk0OGM3NGIyZDljOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlclZhbHVlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlclZhbHVlcy5oCkBAIC0zMiw4ICszMiw5IEBAIG5h bWVzcGFjZSBIVFRQSGVhZGVyVmFsdWVzIHsKIAogY29uc3QgU3RyaW5nJiB0ZXh0UGxhaW5Db250 ZW50VHlwZSgpOwogY29uc3QgU3RyaW5nJiBmb3JtVVJMRW5jb2RlZENvbnRlbnRUeXBlKCk7CitX RUJDT1JFX0VYUE9SVCBjb25zdCBTdHJpbmcmIGFwcGxpY2F0aW9uSlNPTkNvbnRlbnRUeXBlKCk7 CiBjb25zdCBTdHJpbmcmIG5vQ2FjaGUoKTsKLWNvbnN0IFN0cmluZyYgbWF4QWdlMCgpOworV0VC Q09SRV9FWFBPUlQgY29uc3QgU3RyaW5nJiBtYXhBZ2UwKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQWRDbGlja0F0dHJpYnV0aW9uTWFuYWdlci5j cHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0FkQ2xpY2tBdHRyaWJ1dGlvbk1hbmFn ZXIuY3BwCmluZGV4IGQ4YjEwZjZmYmVhMjgzMjUzYzIxYzk1M2E1YzM2ZGU0YzRiMzI2ZmYuLjA3 NDYyZTY1MGI0MDUyZWFiMWU0NzY3NmQwMWIyY2M0ZGU3NDdlMjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQWRDbGlja0F0dHJpYnV0aW9uTWFuYWdlci5jcHAKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9BZENsaWNrQXR0cmlidXRpb25NYW5hZ2Vy LmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0NvbnNvbGVU eXBlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRmV0Y2hPcHRpb25zLmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9Gb3JtRGF0YS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvSFRUUEhlYWRlclZhbHVlcy5oPgog I2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VFcnJvci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVz b3VyY2VSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlc3BvbnNlLmg+CkBA IC0xNzEsMTkgKzE3MiwxNyBAQCB2b2lkIEFkQ2xpY2tBdHRyaWJ1dGlvbk1hbmFnZXI6OmNvbnZl cnQoY29uc3QgU291cmNlJiBzb3VyY2UsIGNvbnN0IERlc3RpbmF0aW9uJgogCiB2b2lkIEFkQ2xp Y2tBdHRyaWJ1dGlvbk1hbmFnZXI6OmZpcmVDb252ZXJzaW9uUmVxdWVzdChjb25zdCBBZENsaWNr QXR0cmlidXRpb24mIGF0dHJpYnV0aW9uKQogewotICAgIGF1dG8gY29udmVyc2lvblVSTCA9IG1f Y29udmVyc2lvbkJhc2VVUkxGb3JUZXN0aW5nID8gYXR0cmlidXRpb24udXJsRm9yVGVzdGluZygq bV9jb252ZXJzaW9uQmFzZVVSTEZvclRlc3RpbmcpIDogYXR0cmlidXRpb24udXJsKCk7CisgICAg YXV0byBjb252ZXJzaW9uVVJMID0gbV9jb252ZXJzaW9uQmFzZVVSTEZvclRlc3RpbmcgPyAqbV9j b252ZXJzaW9uQmFzZVVSTEZvclRlc3RpbmcgOiBhdHRyaWJ1dGlvbi5yZXBvcnRVUkwoKTsKICAg ICBpZiAoY29udmVyc2lvblVSTC5pc0VtcHR5KCkgfHwgIWNvbnZlcnNpb25VUkwuaXNWYWxpZCgp KQogICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIGNvbnZlcnNpb25SZWZlcnJlclVSTCA9IGF0 dHJpYnV0aW9uLnJlZmVycmVyKCk7Ci0gICAgaWYgKGNvbnZlcnNpb25SZWZlcnJlclVSTC5pc0Vt cHR5KCkgfHwgIWNvbnZlcnNpb25SZWZlcnJlclVSTC5pc1ZhbGlkKCkpCi0gICAgICAgIHJldHVy bjsKLQotICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0IHsgY29udmVyc2lvblVSTCB9OworICAg IFJlc291cmNlUmVxdWVzdCByZXF1ZXN0IHsgV1RGTW92ZShjb252ZXJzaW9uVVJMKSB9OwogICAg IAogICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZCgiUE9TVCJfcyk7Ci0gICAgcmVxdWVzdC5zZXRI VFRQSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNhY2hlQ29udHJvbCwgIm1heC1hZ2U9MCJf cyk7Ci0gICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIoY29udmVyc2lvblJlZmVycmVyVVJMLnN0 cmluZygpKTsKKyAgICByZXF1ZXN0LnNldEhUVFBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6 Q2FjaGVDb250cm9sLCBXZWJDb3JlOjpIVFRQSGVhZGVyVmFsdWVzOjptYXhBZ2UwKCkpOworCisg ICAgcmVxdWVzdC5zZXRIVFRQQ29udGVudFR5cGUoV2ViQ29yZTo6SFRUUEhlYWRlclZhbHVlczo6 YXBwbGljYXRpb25KU09OQ29udGVudFR5cGUoKSk7CisgICAgcmVxdWVzdC5zZXRIVFRQQm9keShX ZWJDb3JlOjpGb3JtRGF0YTo6Y3JlYXRlKGF0dHJpYnV0aW9uLmpzb24oKS0+dG9KU09OU3RyaW5n KCkudXRmOCgpLmRhdGEoKSkpOwogCiAgICAgRmV0Y2hPcHRpb25zIG9wdGlvbnM7CiAgICAgb3B0 aW9ucy5jcmVkZW50aWFscyA9IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6Ok9taXQ7CkBAIC0x OTQsMTcgKzE5MywxMiBAQCB2b2lkIEFkQ2xpY2tBdHRyaWJ1dGlvbk1hbmFnZXI6OmZpcmVDb252 ZXJzaW9uUmVxdWVzdChjb25zdCBBZENsaWNrQXR0cmlidXRpb24mCiAgICAgTmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7CiAgICAgbG9hZFBhcmFtZXRlcnMuaWRl bnRpZmllciA9ICsraWRlbnRpZmllcjsKICAgICBsb2FkUGFyYW1ldGVycy5yZXF1ZXN0ID0gcmVx dWVzdDsKLSAgICBsb2FkUGFyYW1ldGVycy5zb3VyY2VPcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6 Y3JlYXRlKGNvbnZlcnNpb25SZWZlcnJlclVSTCk7CiAgICAgbG9hZFBhcmFtZXRlcnMucGFyZW50 UElEID0gcHJlc2VudGluZ0FwcGxpY2F0aW9uUElEKCk7CiAgICAgbG9hZFBhcmFtZXRlcnMuc3Rv cmVkQ3JlZGVudGlhbHNQb2xpY3kgPSBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RXBoZW1lcmFs U3RhdGVsZXNzOwogICAgIGxvYWRQYXJhbWV0ZXJzLm9wdGlvbnMgPSBvcHRpb25zOwogICAgIGxv YWRQYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QgPSB0 cnVlOwogICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZFJlc3RyaWN0SFRUUFJlc3BvbnNlQWNjZXNz ID0gZmFsc2U7CiAKLSNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQotICAgIGxvYWRQYXJh bWV0ZXJzLm1haW5Eb2N1bWVudFVSTCA9IFdURk1vdmUoY29udmVyc2lvblJlZmVycmVyVVJMKTsK LSNlbmRpZgotCiAgICAgaWYgKFVOTElLRUxZKGRlYnVnTW9kZUVuYWJsZWQoKSkpIHsKICAgICAg ICAgUkVMRUFTRV9MT0dfSU5GTyhBZENsaWNrQXR0cmlidXRpb24sICJBYm91dCB0byBmaXJlIGFu IGF0dHJpYnV0aW9uIHJlcXVlc3QgZm9yIGEgY29udmVyc2lvbi4iKTsKICAgICAgICAgbV9uZXR3 b3JrUHJvY2Vzcy0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UobV9zZXNzaW9uSUQsIE1lc3NhZ2VT b3VyY2U6OkFkQ2xpY2tBdHRyaWJ1dGlvbiwgTWVzc2FnZUxldmVsOjpFcnJvciwgIltBZCBDbGlj ayBBdHRyaWJ1dGlvbl0gQWJvdXQgdG8gZmlyZSBhbiBhdHRyaWJ1dGlvbiByZXF1ZXN0IGZvciBh IGNvbnZlcnNpb24uIl9zKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCAxMDFlNjJmMTk3N2Q5MDczNjU3NjBhMWU4YjRhYWMxODc5MGI3ZWFjLi5k MjUzNzgzNmQ0YzY1OGZhYmVkN2E1MTk4NTFjM2FkMzczOTMzMDg5IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAt MTEtMDUgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUENN OiBTd2l0Y2ggdG8gSlNPTiByZXBvcnQgZm9ybWF0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg2MzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcw NDY5OTIzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSBzdGFuZGFyZHMgY29udmVyc2F0aW9uIGhhcyBsYW5kZWQgaW4gYXR0cmlidXRpb24gcmVw b3J0cyBpbiBhIEpTT04KKyAgICAgICAgZm9ybWF0IGFzIG9wcG9zZWQgdG8gdGhlIGN1cnJlbnRs eSBpbXBsZW1lbnRlZCBVUkwgZm9ybWF0LiBEaXNjdXNzaW9uCisgICAgICAgIGhlcmU6IGh0dHBz Oi8vZ2l0aHViLmNvbS9wcml2YWN5Y2cvcHJpdmF0ZS1jbGljay1tZWFzdXJlbWVudC9pc3N1ZXMv MzAKKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9BZENsaWNrQXR0cmli dXRpb24uY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMTEtMDUg IEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtidWlsZC53 ZWJraXQub3JnXSBSZW5hbWUgQlVJTERfV0VCS0lUX1VSTCB0byBDVVJSRU5UX0hPU1ROQU1FCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQWRDbGlja0F0dHJp YnV0aW9uLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9BZENsaWNrQXR0 cmlidXRpb24uY3BwCmluZGV4IGZhMGE3ODZiZmEzNTU4YjFlOWMxNzNkYTgwODQzNjBlZGYxNDY0 ODQuLmQxMTFmMGVhMGMwZTFkMTk1ODBmZDNjNjQ1YmQzN2MwMmU1YWY5N2MgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9BZENsaWNrQXR0cmlidXRpb24uY3Bw CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9BZENsaWNrQXR0cmlidXRp b24uY3BwCkBAIC00NiwxMSArNDYsMTEgQEAgVEVTVChBZENsaWNrQXR0cmlidXRpb24sIFZhbGlk TWluVmFsdWVzKQogICAgIEFkQ2xpY2tBdHRyaWJ1dGlvbiBhdHRyaWJ1dGlvbiB7IEFkQ2xpY2tB dHRyaWJ1dGlvbjo6Q2FtcGFpZ24obWluNkJpdFZhbHVlKSwgQWRDbGlja0F0dHJpYnV0aW9uOjpT b3VyY2UgeyB3ZWJLaXRVUkwgfSwgQWRDbGlja0F0dHJpYnV0aW9uOjpEZXN0aW5hdGlvbiB7IGV4 YW1wbGVVUkwgfSB9OwogICAgIGF0dHJpYnV0aW9uLmNvbnZlcnRBbmRHZXRFYXJsaWVzdFRpbWVU b1NlbmQoQWRDbGlja0F0dHJpYnV0aW9uOjpDb252ZXJzaW9uKG1pbjZCaXRWYWx1ZSwgQWRDbGlj a0F0dHJpYnV0aW9uOjpQcmlvcml0eShtaW42Qml0VmFsdWUpKSk7CiAKLSAgICBhdXRvIGF0dHJp YnV0aW9uVVJMID0gYXR0cmlidXRpb24udXJsKCk7Ci0gICAgYXV0byByZWZlcnJlclVSTCA9IGF0 dHJpYnV0aW9uLnJlZmVycmVyKCk7CisgICAgYXV0byBhdHRyaWJ1dGlvblVSTCA9IGF0dHJpYnV0 aW9uLnJlcG9ydFVSTCgpOwogICAgIAotICAgIEFTU0VSVF9FUShhdHRyaWJ1dGlvblVSTC5zdHJp bmcoKSwgImh0dHBzOi8vd2Via2l0Lm9yZy8ud2VsbC1rbm93bi9hZC1jbGljay1hdHRyaWJ1dGlv bi8wLzAiKTsKLSAgICBBU1NFUlRfRVEocmVmZXJyZXJVUkwuc3RyaW5nKCksICJodHRwczovL2V4 YW1wbGUuY29tLyIpOworICAgIEFTU0VSVF9FUShhdHRyaWJ1dGlvblVSTC5zdHJpbmcoKSwgImh0 dHBzOi8vd2Via2l0Lm9yZy8ud2VsbC1rbm93bi9hZC1jbGljay1hdHRyaWJ1dGlvbi8iKTsKKwor ICAgIEFTU0VSVF9FUShhdHRyaWJ1dGlvbi5qc29uKCktPnRvSlNPTlN0cmluZygpLCAie1wiY29u dGVudC10eXBlXCI6XCJjbGlja1wiLFwiY29udGVudC1zaXRlXCI6XCJ3ZWJraXQub3JnXCIsXCJj b250ZW50LWlkXCI6MCxcImNvbnZlcnNpb24tc2l0ZVwiOlwiZXhhbXBsZS5jb21cIixcImNvbnZl cnNpb24tZGF0YVwiOjAsXCJyZXBvcnQtdmVyc2lvblwiOjF9Iik7CiB9CiAKIFRFU1QoQWRDbGlj a0F0dHJpYnV0aW9uLCBWYWxpZE1pZFZhbHVlcykKQEAgLTU4LDExICs1OCwxMSBAQCBURVNUKEFk Q2xpY2tBdHRyaWJ1dGlvbiwgVmFsaWRNaWRWYWx1ZXMpCiAgICAgQWRDbGlja0F0dHJpYnV0aW9u IGF0dHJpYnV0aW9uIHsgQWRDbGlja0F0dHJpYnV0aW9uOjpDYW1wYWlnbigodWludDMyX3QpMTIp LCBBZENsaWNrQXR0cmlidXRpb246OlNvdXJjZSB7IHdlYktpdFVSTCB9LCBBZENsaWNrQXR0cmli dXRpb246OkRlc3RpbmF0aW9uIHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uY29u dmVydEFuZEdldEVhcmxpZXN0VGltZVRvU2VuZChBZENsaWNrQXR0cmlidXRpb246OkNvbnZlcnNp b24oKHVpbnQzMl90KTQ0LCBBZENsaWNrQXR0cmlidXRpb246OlByaW9yaXR5KCh1aW50MzJfdCky MikpKTsKIAotICAgIGF1dG8gYXR0cmlidXRpb25VUkwgPSBhdHRyaWJ1dGlvbi51cmwoKTsKLSAg ICBhdXRvIHJlZmVycmVyVVJMID0gYXR0cmlidXRpb24ucmVmZXJyZXIoKTsKKyAgICBhdXRvIGF0 dHJpYnV0aW9uVVJMID0gYXR0cmlidXRpb24ucmVwb3J0VVJMKCk7CisgICAgCisgICAgQVNTRVJU X0VRKGF0dHJpYnV0aW9uVVJMLnN0cmluZygpLCAiaHR0cHM6Ly93ZWJraXQub3JnLy53ZWxsLWtu b3duL2FkLWNsaWNrLWF0dHJpYnV0aW9uLyIpOwogCi0gICAgQVNTRVJUX0VRKGF0dHJpYnV0aW9u VVJMLnN0cmluZygpLCAiaHR0cHM6Ly93ZWJraXQub3JnLy53ZWxsLWtub3duL2FkLWNsaWNrLWF0 dHJpYnV0aW9uLzQ0LzEyIik7Ci0gICAgQVNTRVJUX0VRKHJlZmVycmVyVVJMLnN0cmluZygpLCAi aHR0cHM6Ly9leGFtcGxlLmNvbS8iKTsKKyAgICBBU1NFUlRfRVEoYXR0cmlidXRpb24uanNvbigp LT50b0pTT05TdHJpbmcoKSwgIntcImNvbnRlbnQtdHlwZVwiOlwiY2xpY2tcIixcImNvbnRlbnQt c2l0ZVwiOlwid2Via2l0Lm9yZ1wiLFwiY29udGVudC1pZFwiOjEyLFwiY29udmVyc2lvbi1zaXRl XCI6XCJleGFtcGxlLmNvbVwiLFwiY29udmVyc2lvbi1kYXRhXCI6NDQsXCJyZXBvcnQtdmVyc2lv blwiOjF9Iik7CiB9CiAKIFRFU1QoQWRDbGlja0F0dHJpYnV0aW9uLCBWYWxpZE1heFZhbHVlcykK QEAgLTcwLDExICs3MCwxMSBAQCBURVNUKEFkQ2xpY2tBdHRyaWJ1dGlvbiwgVmFsaWRNYXhWYWx1 ZXMpCiAgICAgQWRDbGlja0F0dHJpYnV0aW9uIGF0dHJpYnV0aW9uIHsgQWRDbGlja0F0dHJpYnV0 aW9uOjpDYW1wYWlnbihBZENsaWNrQXR0cmlidXRpb246Ok1heEVudHJvcHkpLCBBZENsaWNrQXR0 cmlidXRpb246OlNvdXJjZSB7IHdlYktpdFVSTCB9LCBBZENsaWNrQXR0cmlidXRpb246OkRlc3Rp bmF0aW9uIHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uY29udmVydEFuZEdldEVh cmxpZXN0VGltZVRvU2VuZChBZENsaWNrQXR0cmlidXRpb246OkNvbnZlcnNpb24oQWRDbGlja0F0 dHJpYnV0aW9uOjpNYXhFbnRyb3B5LCBBZENsaWNrQXR0cmlidXRpb246OlByaW9yaXR5KEFkQ2xp Y2tBdHRyaWJ1dGlvbjo6TWF4RW50cm9weSkpKTsKIAotICAgIGF1dG8gYXR0cmlidXRpb25VUkwg PSBhdHRyaWJ1dGlvbi51cmwoKTsKLSAgICBhdXRvIHJlZmVycmVyVVJMID0gYXR0cmlidXRpb24u cmVmZXJyZXIoKTsKKyAgICBhdXRvIGF0dHJpYnV0aW9uVVJMID0gYXR0cmlidXRpb24ucmVwb3J0 VVJMKCk7CisgICAgCisgICAgQVNTRVJUX0VRKGF0dHJpYnV0aW9uVVJMLnN0cmluZygpLCAiaHR0 cHM6Ly93ZWJraXQub3JnLy53ZWxsLWtub3duL2FkLWNsaWNrLWF0dHJpYnV0aW9uLyIpOwogCi0g ICAgQVNTRVJUX0VRKGF0dHJpYnV0aW9uVVJMLnN0cmluZygpLCAiaHR0cHM6Ly93ZWJraXQub3Jn Ly53ZWxsLWtub3duL2FkLWNsaWNrLWF0dHJpYnV0aW9uLzYzLzYzIik7Ci0gICAgQVNTRVJUX0VR KHJlZmVycmVyVVJMLnN0cmluZygpLCAiaHR0cHM6Ly9leGFtcGxlLmNvbS8iKTsKKyAgICBBU1NF UlRfRVEoYXR0cmlidXRpb24uanNvbigpLT50b0pTT05TdHJpbmcoKSwgIntcImNvbnRlbnQtdHlw ZVwiOlwiY2xpY2tcIixcImNvbnRlbnQtc2l0ZVwiOlwid2Via2l0Lm9yZ1wiLFwiY29udGVudC1p ZFwiOjYzLFwiY29udmVyc2lvbi1zaXRlXCI6XCJleGFtcGxlLmNvbVwiLFwiY29udmVyc2lvbi1k YXRhXCI6NjMsXCJyZXBvcnQtdmVyc2lvblwiOjF9Iik7CiB9CiAKIFRFU1QoQWRDbGlja0F0dHJp YnV0aW9uLCBFYXJsaWVzdFRpbWVUb1NlbmRBdHRyaWJ1dGlvbk1pbmltdW1EZWxheSkKQEAgLTEz MCwxMSArMTMwLDcgQEAgVEVTVChBZENsaWNrQXR0cmlidXRpb24sIEludmFsaWRDYW1wYWlnbklk KQogICAgIEFkQ2xpY2tBdHRyaWJ1dGlvbiBhdHRyaWJ1dGlvbiB7IEFkQ2xpY2tBdHRyaWJ1dGlv bjo6Q2FtcGFpZ24oQWRDbGlja0F0dHJpYnV0aW9uOjpNYXhFbnRyb3B5ICsgMSksIEFkQ2xpY2tB dHRyaWJ1dGlvbjo6U291cmNlIHsgd2ViS2l0VVJMIH0sIEFkQ2xpY2tBdHRyaWJ1dGlvbjo6RGVz dGluYXRpb24geyBleGFtcGxlVVJMIH0gfTsKICAgICBhdHRyaWJ1dGlvbi5jb252ZXJ0QW5kR2V0 RWFybGllc3RUaW1lVG9TZW5kKEFkQ2xpY2tBdHRyaWJ1dGlvbjo6Q29udmVyc2lvbihBZENsaWNr QXR0cmlidXRpb246Ok1heEVudHJvcHksIEFkQ2xpY2tBdHRyaWJ1dGlvbjo6UHJpb3JpdHkoQWRD bGlja0F0dHJpYnV0aW9uOjpNYXhFbnRyb3B5KSkpOwogCi0gICAgYXV0byBhdHRyaWJ1dGlvblVS TCA9IGF0dHJpYnV0aW9uLnVybCgpOwotICAgIGF1dG8gcmVmZXJyZXJVUkwgPSBhdHRyaWJ1dGlv bi5yZWZlcnJlcigpOwotCi0gICAgQVNTRVJUX1RSVUUoYXR0cmlidXRpb25VUkwuc3RyaW5nKCku aXNFbXB0eSgpKTsKLSAgICBBU1NFUlRfVFJVRShyZWZlcnJlclVSTC5zdHJpbmcoKS5pc0VtcHR5 KCkpOworICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLnJlcG9ydFVSTCgpLmlzRW1wdHkoKSk7 CiB9CiAKIFRFU1QoQWRDbGlja0F0dHJpYnV0aW9uLCBJbnZhbGlkU291cmNlSG9zdCkKQEAgLTE0 MiwxMSArMTM4LDcgQEAgVEVTVChBZENsaWNrQXR0cmlidXRpb24sIEludmFsaWRTb3VyY2VIb3N0 KQogICAgIEFkQ2xpY2tBdHRyaWJ1dGlvbiBhdHRyaWJ1dGlvbiB7IEFkQ2xpY2tBdHRyaWJ1dGlv bjo6Q2FtcGFpZ24oQWRDbGlja0F0dHJpYnV0aW9uOjpNYXhFbnRyb3B5KSwgQWRDbGlja0F0dHJp YnV0aW9uOjpTb3VyY2UgeyBlbXB0eVVSTCB9LCBBZENsaWNrQXR0cmlidXRpb246OkRlc3RpbmF0 aW9uIHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uY29udmVydEFuZEdldEVhcmxp ZXN0VGltZVRvU2VuZChBZENsaWNrQXR0cmlidXRpb246OkNvbnZlcnNpb24oQWRDbGlja0F0dHJp YnV0aW9uOjpNYXhFbnRyb3B5LCBBZENsaWNrQXR0cmlidXRpb246OlByaW9yaXR5KEFkQ2xpY2tB dHRyaWJ1dGlvbjo6TWF4RW50cm9weSkpKTsKIAotICAgIGF1dG8gYXR0cmlidXRpb25VUkwgPSBh dHRyaWJ1dGlvbi51cmwoKTsKLSAgICBhdXRvIHJlZmVycmVyVVJMID0gYXR0cmlidXRpb24ucmVm ZXJyZXIoKTsKLQotICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uVVJMLnN0cmluZygpLmlzRW1w dHkoKSk7Ci0gICAgQVNTRVJUX1RSVUUocmVmZXJyZXJVUkwuc3RyaW5nKCkuaXNFbXB0eSgpKTsK KyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlvbi5yZXBvcnRVUkwoKS5pc0VtcHR5KCkpOwogfQog CiBURVNUKEFkQ2xpY2tBdHRyaWJ1dGlvbiwgSW52YWxpZERlc3RpbmF0aW9uSG9zdCkKQEAgLTE1 NCwxMSArMTQ2LDcgQEAgVEVTVChBZENsaWNrQXR0cmlidXRpb24sIEludmFsaWREZXN0aW5hdGlv bkhvc3QpCiAgICAgQWRDbGlja0F0dHJpYnV0aW9uIGF0dHJpYnV0aW9uIHsgQWRDbGlja0F0dHJp YnV0aW9uOjpDYW1wYWlnbihBZENsaWNrQXR0cmlidXRpb246Ok1heEVudHJvcHkgKyAxKSwgQWRD bGlja0F0dHJpYnV0aW9uOjpTb3VyY2UgeyB3ZWJLaXRVUkwgfSwgQWRDbGlja0F0dHJpYnV0aW9u OjpEZXN0aW5hdGlvbiB7IGVtcHR5VVJMIH0gfTsKICAgICBhdHRyaWJ1dGlvbi5jb252ZXJ0QW5k R2V0RWFybGllc3RUaW1lVG9TZW5kKEFkQ2xpY2tBdHRyaWJ1dGlvbjo6Q29udmVyc2lvbihBZENs aWNrQXR0cmlidXRpb246Ok1heEVudHJvcHksIEFkQ2xpY2tBdHRyaWJ1dGlvbjo6UHJpb3JpdHko QWRDbGlja0F0dHJpYnV0aW9uOjpNYXhFbnRyb3B5KSkpOwogCi0gICAgYXV0byBhdHRyaWJ1dGlv blVSTCA9IGF0dHJpYnV0aW9uLnVybCgpOwotICAgIGF1dG8gcmVmZXJyZXJVUkwgPSBhdHRyaWJ1 dGlvbi5yZWZlcnJlcigpOwotCi0gICAgQVNTRVJUX1RSVUUoYXR0cmlidXRpb25VUkwuc3RyaW5n KCkuaXNFbXB0eSgpKTsKLSAgICBBU1NFUlRfVFJVRShyZWZlcnJlclVSTC5zdHJpbmcoKS5pc0Vt cHR5KCkpOworICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLnJlcG9ydFVSTCgpLmlzRW1wdHko KSk7CiB9CiAKIFRFU1QoQWRDbGlja0F0dHJpYnV0aW9uLCBJbnZhbGlkQ29udmVyc2lvbkRhdGEp CkBAIC0xNjYsMTEgKzE1NCw3IEBAIFRFU1QoQWRDbGlja0F0dHJpYnV0aW9uLCBJbnZhbGlkQ29u dmVyc2lvbkRhdGEpCiAgICAgQWRDbGlja0F0dHJpYnV0aW9uIGF0dHJpYnV0aW9uIHsgQWRDbGlj a0F0dHJpYnV0aW9uOjpDYW1wYWlnbihBZENsaWNrQXR0cmlidXRpb246Ok1heEVudHJvcHkpLCBB ZENsaWNrQXR0cmlidXRpb246OlNvdXJjZSB7IHdlYktpdFVSTCB9LCBBZENsaWNrQXR0cmlidXRp b246OkRlc3RpbmF0aW9uIHsgZXhhbXBsZVVSTCB9IH07CiAgICAgYXR0cmlidXRpb24uY29udmVy dEFuZEdldEVhcmxpZXN0VGltZVRvU2VuZChBZENsaWNrQXR0cmlidXRpb246OkNvbnZlcnNpb24o KEFkQ2xpY2tBdHRyaWJ1dGlvbjo6TWF4RW50cm9weSArIDEpLCBBZENsaWNrQXR0cmlidXRpb246 OlByaW9yaXR5KEFkQ2xpY2tBdHRyaWJ1dGlvbjo6TWF4RW50cm9weSkpKTsKIAotICAgIGF1dG8g YXR0cmlidXRpb25VUkwgPSBhdHRyaWJ1dGlvbi51cmwoKTsKLSAgICBhdXRvIHJlZmVycmVyVVJM ID0gYXR0cmlidXRpb24ucmVmZXJyZXIoKTsKLQotICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9u VVJMLnN0cmluZygpLmlzRW1wdHkoKSk7Ci0gICAgQVNTRVJUX1RSVUUocmVmZXJyZXJVUkwuc3Ry aW5nKCkuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlvbi5yZXBvcnRVUkwo KS5pc0VtcHR5KCkpOwogfQogCiBURVNUKEFkQ2xpY2tBdHRyaWJ1dGlvbiwgSW52YWxpZFByaW9y aXR5KQpAQCAtMTc4LDIyICsxNjIsMTQgQEAgVEVTVChBZENsaWNrQXR0cmlidXRpb24sIEludmFs aWRQcmlvcml0eSkKICAgICBBZENsaWNrQXR0cmlidXRpb24gYXR0cmlidXRpb24geyBBZENsaWNr QXR0cmlidXRpb246OkNhbXBhaWduKEFkQ2xpY2tBdHRyaWJ1dGlvbjo6TWF4RW50cm9weSksIEFk Q2xpY2tBdHRyaWJ1dGlvbjo6U291cmNlIHsgd2ViS2l0VVJMIH0sIEFkQ2xpY2tBdHRyaWJ1dGlv bjo6RGVzdGluYXRpb24geyBleGFtcGxlVVJMIH0gfTsKICAgICBhdHRyaWJ1dGlvbi5jb252ZXJ0 QW5kR2V0RWFybGllc3RUaW1lVG9TZW5kKEFkQ2xpY2tBdHRyaWJ1dGlvbjo6Q29udmVyc2lvbihB ZENsaWNrQXR0cmlidXRpb246Ok1heEVudHJvcHksIEFkQ2xpY2tBdHRyaWJ1dGlvbjo6UHJpb3Jp dHkoQWRDbGlja0F0dHJpYnV0aW9uOjpNYXhFbnRyb3B5ICsgMSkpKTsKIAotICAgIGF1dG8gYXR0 cmlidXRpb25VUkwgPSBhdHRyaWJ1dGlvbi51cmwoKTsKLSAgICBhdXRvIHJlZmVycmVyVVJMID0g YXR0cmlidXRpb24ucmVmZXJyZXIoKTsKLQotICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uVVJM LnN0cmluZygpLmlzRW1wdHkoKSk7Ci0gICAgQVNTRVJUX1RSVUUocmVmZXJyZXJVUkwuc3RyaW5n KCkuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlRfVFJVRShhdHRyaWJ1dGlvbi5yZXBvcnRVUkwoKS5p c0VtcHR5KCkpOwogfQogCiBURVNUKEFkQ2xpY2tBdHRyaWJ1dGlvbiwgSW52YWxpZE1pc3NpbmdD b252ZXJzaW9uKQogewogICAgIEFkQ2xpY2tBdHRyaWJ1dGlvbiBhdHRyaWJ1dGlvbiB7IEFkQ2xp Y2tBdHRyaWJ1dGlvbjo6Q2FtcGFpZ24oQWRDbGlja0F0dHJpYnV0aW9uOjpNYXhFbnRyb3B5KSwg QWRDbGlja0F0dHJpYnV0aW9uOjpTb3VyY2UgeyB3ZWJLaXRVUkwgfSwgQWRDbGlja0F0dHJpYnV0 aW9uOjpEZXN0aW5hdGlvbiB7IGV4YW1wbGVVUkwgfSB9OwogCi0gICAgYXV0byBhdHRyaWJ1dGlv blVSTCA9IGF0dHJpYnV0aW9uLnVybCgpOwotICAgIGF1dG8gcmVmZXJyZXJVUkwgPSBhdHRyaWJ1 dGlvbi5yZWZlcnJlcigpOwotCi0gICAgQVNTRVJUX1RSVUUoYXR0cmlidXRpb25VUkwuc3RyaW5n KCkuaXNFbXB0eSgpKTsKLSAgICBBU1NFUlRfVFJVRShyZWZlcnJlclVSTC5zdHJpbmcoKS5pc0Vt cHR5KCkpOworICAgIEFTU0VSVF9UUlVFKGF0dHJpYnV0aW9uLnJlcG9ydFVSTCgpLmlzRW1wdHko KSk7CiAgICAgQVNTRVJUX0ZBTFNFKGF0dHJpYnV0aW9uLmVhcmxpZXN0VGltZVRvU2VuZCgpKTsK IH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDE1Njg2NjBhN2Q1NzliYzM5YTFmNmYxMjU4NDFmZTQwMTI4YmZmMGMuLjJi MzBjNWI4ZmQxNjIzOTUxNzFhNmM3Yjk1MzA2OTdjYmI0MmUyMzAgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAyMC0xMS0wNSAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKwor ICAgICAgICBQQ006IFN3aXRjaCB0byBKU09OIHJlcG9ydCBmb3JtYXQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODYzNAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNzA0Njk5MjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIHN0YW5kYXJkcyBjb252ZXJzYXRpb24gaGFzIGxhbmRlZCBpbiBhdHRy aWJ1dGlvbiByZXBvcnRzIGluIGEgSlNPTgorICAgICAgICBmb3JtYXQgYXMgb3Bwb3NlZCB0byB0 aGUgY3VycmVudGx5IGltcGxlbWVudGVkIFVSTCBmb3JtYXQuIERpc2N1c3Npb24KKyAgICAgICAg aGVyZTogaHR0cHM6Ly9naXRodWIuY29tL3ByaXZhY3ljZy9wcml2YXRlLWNsaWNrLW1lYXN1cmVt ZW50L2lzc3Vlcy8zMAorCisgICAgICAgICogaHR0cC90ZXN0cy9hZENsaWNrQXR0cmlidXRpb24v cmVzb3VyY2VzL2NvbnZlcnNpb25SZXBvcnQucGhwOgorICAgICAgICAqIGh0dHAvdGVzdHMvYWRD bGlja0F0dHJpYnV0aW9uL3NlbmQtYXR0cmlidXRpb24tY29udmVyc2lvbi1yZXF1ZXN0LWV4cGVj dGVkLnR4dDoKKwogMjAyMC0xMS0wNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIENyYXNoIGluIEF1ZGlvQnVmZmVyOjpzYW1wbGVSYXRlKCkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYWRDbGlja0F0dHJpYnV0aW9uL3Jlc291cmNlcy9jb252 ZXJzaW9uUmVwb3J0LnBocCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYWRDbGlja0F0dHJpYnV0 aW9uL3Jlc291cmNlcy9jb252ZXJzaW9uUmVwb3J0LnBocAppbmRleCBlMzg0MjEyNTViYzVkNTIx MTg4NjMyYmE3M2E0ODk5MjMzNTRlZDJhLi5iNWMyMDI2OWM3ODQ5MDZmZmY3NDc0NDhiMzg4MWY0 MDYzN2FiYzAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FkQ2xpY2tBdHRy aWJ1dGlvbi9yZXNvdXJjZXMvY29udmVyc2lvblJlcG9ydC5waHAKKysrIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9hZENsaWNrQXR0cmlidXRpb24vcmVzb3VyY2VzL2NvbnZlcnNpb25SZXBvcnQu cGhwCkBAIC04LDcgKzgsNyBAQCBmb3JlYWNoICgkaHR0cEhlYWRlcnMgYXMgJG5hbWUgPT4gJHZh bHVlKSB7CiAgICAgaWYgKCRuYW1lID09PSAiSFRUUF9IT1NUIikgewogICAgICAgICBmd3JpdGUo JGNvbnZlcnNpb25GaWxlLCAiJG5hbWU6ICR2YWx1ZVxuIik7CiAgICAgfSBlbHNlIGlmICgkbmFt ZSA9PT0gIlJFUVVFU1RfVVJJIikgewotICAgICAgICAkcG9zaXRpb25PZk5vbmNlID0gc3RycG9z KCR2YWx1ZSwgIiZub25jZT0iKTsKKyAgICAgICAgJHBvc2l0aW9uT2ZOb25jZSA9IHN0cnBvcygk dmFsdWUsICI/bm9uY2U9Iik7CiAgICAgICAgIGlmICgkcG9zaXRpb25PZk5vbmNlID09PSBmYWxz ZSkKICAgICAgICAgICAgICRvdXRwdXRVUkwgPSAkdmFsdWU7CiAgICAgICAgIGVsc2UKQEAgLTE3 LDExICsxNywxNyBAQCBmb3JlYWNoICgkaHR0cEhlYWRlcnMgYXMgJG5hbWUgPT4gJHZhbHVlKSB7 CiAgICAgfSBlbHNlIGlmICgkbmFtZSA9PT0gIkhUVFBfQ09PS0lFIikgewogICAgICAgICBmd3Jp dGUoJGNvbnZlcnNpb25GaWxlLCAiQ29va2llcyBpbiBjb252ZXJzaW9uIHJlcXVlc3Q6ICR2YWx1 ZVxuIik7CiAgICAgICAgICRjb29raWVzRm91bmQgPSB0cnVlOworICAgIH0gZWxzZSBpZiAoJG5h bWUgPT09ICJDT05URU5UX1RZUEUiKSB7CisgICAgICAgIGZ3cml0ZSgkY29udmVyc2lvbkZpbGUs ICJDb250ZW50IHR5cGU6ICR2YWx1ZVxuIik7CiAgICAgfQogfQogaWYgKCEkY29va2llc0ZvdW5k KSB7CiAgICAgZndyaXRlKCRjb252ZXJzaW9uRmlsZSwgIk5vIGNvb2tpZXMgaW4gY29udmVyc2lv biByZXF1ZXN0LlxuIik7CiB9CisKKyRyZXF1ZXN0Qm9keSA9IGZpbGVfZ2V0X2NvbnRlbnRzKCdw aHA6Ly9pbnB1dCcpOworZndyaXRlKCRjb252ZXJzaW9uRmlsZSwgIlJlcXVlc3QgYm9keTpcbiRy ZXF1ZXN0Qm9keVxuIik7CisKIGZjbG9zZSgkY29udmVyc2lvbkZpbGUpOwogcmVuYW1lKCRjb252 ZXJzaW9uRmlsZVBhdGggLiAiLnRtcCIsICRjb252ZXJzaW9uRmlsZVBhdGgpOwogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FkQ2xpY2tBdHRyaWJ1dGlvbi9zZW5kLWF0dHJp YnV0aW9uLWNvbnZlcnNpb24tcmVxdWVzdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2FkQ2xpY2tBdHRyaWJ1dGlvbi9zZW5kLWF0dHJpYnV0aW9uLWNvbnZlcnNpb24tcmVx dWVzdC1leHBlY3RlZC50eHQKaW5kZXggNDc3YjQ3MTMwODM5YTE1OTY4ZjNiZmExZjJhM2Y5ZDhl ZDdmMjlhOS4uYTgyMzdkMTUzZmM3ZjBiODFiZDkwMTE0YmIyYTJlNzBlYThiYmQ5YiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hZENsaWNrQXR0cmlidXRpb24vc2VuZC1hdHRy aWJ1dGlvbi1jb252ZXJzaW9uLXJlcXVlc3QtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvYWRDbGlja0F0dHJpYnV0aW9uL3NlbmQtYXR0cmlidXRpb24tY29udmVyc2lv bi1yZXF1ZXN0LWV4cGVjdGVkLnR4dApAQCAtMTIsOCArMTIsMTEgQEAgRnJhbWU6ICc8IS0tZnJh bWUyLS0+JwogLS0tLS0tLS0KIENvbnZlcnNpb24gcmVjZWl2ZWQuCiBIVFRQX0hPU1Q6IDEyNy4w LjAuMTo4MDAwCi1SRVFVRVNUX1VSSTogL2FkQ2xpY2tBdHRyaWJ1dGlvbi9yZXNvdXJjZXMvY29u dmVyc2lvblJlcG9ydC5waHA/Y29udmVyc2lvbj0xMiZjYW1wYWlnbj0zCitDb250ZW50IHR5cGU6 IGFwcGxpY2F0aW9uL2pzb24KK1JFUVVFU1RfVVJJOiAvYWRDbGlja0F0dHJpYnV0aW9uL3Jlc291 cmNlcy9jb252ZXJzaW9uUmVwb3J0LnBocAogTm8gY29va2llcyBpbiBjb252ZXJzaW9uIHJlcXVl c3QuCitSZXF1ZXN0IGJvZHk6Cit7ImNvbnRlbnQtdHlwZSI6ImNsaWNrIiwiY29udGVudC1zaXRl IjoiMTI3LjAuMC4xIiwiY29udGVudC1pZCI6MywiY29udmVyc2lvbi1zaXRlIjoibG9jYWxob3N0 IiwiY29udmVyc2lvbi1kYXRhIjoxMiwicmVwb3J0LXZlcnNpb24iOjF9CiAKIAogLS0tLS0tLS0K