159221 2016-06-28 13:19:09 -0700 Remove ThreadableLoaderOptions origin 2016-06-28 23:26:25 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 151937 1 youennf youennf cdumez commit-queue japhet mkwst oldest_to_newest 1206138 0 youennf 2016-06-28 13:19:09 -0700 ThreadableLoaderOptions origin is always the origin of the client. The actual origin value should best be set by WorkerThreadableLoader. 1206144 1 282277 youennf 2016-06-28 13:26:10 -0700 Created attachment 282277 Patch 1206316 2 282277 commit-queue 2016-06-28 23:26:21 -0700 Comment on attachment 282277 Patch Clearing flags on attachment: 282277 Committed r202614: <http://trac.webkit.org/changeset/202614> 1206317 3 commit-queue 2016-06-28 23:26:25 -0700 All reviewed patches have been landed. Closing bug. 282277 2016-06-28 13:26:10 -0700 2016-06-28 23:26:21 -0700 Patch bug-159221-20160628222552.patch text/plain 19826 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWNhNzY3YTk0OTljZWQy MGVkMTg4NWYwMzJlNjk5MzRiZWZmZWI2MS4uNDY5ZTA3ZTQzZGE5ZmZjZWQzM2IzNTJmODBiZjVm MjVjZWEyZDZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE2LTA2LTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgUmVtb3ZlIFRocmVhZGFi bGVMb2FkZXJPcHRpb25zIG9yaWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU5MjIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gY2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAgICogbG9hZGVy L0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkpOiBBZGRpbmcgb3Jp Z2luZyBwYXJhbWV0ZXIuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2Fk ZXI6OmNyZWF0ZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxl TG9hZGVyOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6cmVkaXJlY3RSZWNlaXZlZCk6IFNldHRpbmcg bV9vcmlnaW4uCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OnNl Y3VyaXR5T3JpZ2luKTogQ2hlY2tpbmcgbV9vcmlnaW4uCisgICAgICAgICogbG9hZGVyL0RvY3Vt ZW50VGhyZWFkYWJsZUxvYWRlci5oOiBBZGRpbmcgbV9vcmlnaW4gbWVtYmVyLgorICAgICAgICAq IGxvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFi bGVMb2FkZXJPcHRpb25zOjpUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyk6IFJlbW92aW5nIG9yaWdp bi4KKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFibGVMb2FkZXJPcHRpb246Omlzb2xhdGVkQ29w eSk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuaDogUmVtb3Zp bmcgb3JpZ2luIHBhcmFtZXRlciBhbmQgaXNvbGF0ZWRDb3B5IGZ1bmN0aW9uLgorICAgICAgICAq IGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxv YWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyk6IFN0cnVjdHVyZSB0byBwYXNzIGxv YWRlciB0YXNrIG9wdGlvbnMgZnJvbSBvbmUgdGhyZWFkIHRvIGFub3RoZXIuCisgICAgICAgIChX ZWJDb3JlOjpXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhy ZWFkQnJpZGdlKToKKyAgICAgICAgKiBwYWdlL0V2ZW50U291cmNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkV2ZW50U291cmNlOjpjb25uZWN0KTogUmVtb3Zpbmcgc2V0dGluZyBvZiB0aGUgb3Jp Z2luLgorICAgICAgICAqIHdvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldvcmtlclNjcmlwdExvYWRlcjo6bG9hZFN5bmNocm9ub3VzbHkpOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OldvcmtlclNjcmlwdExvYWRlcjo6bG9hZEFzeW5jaHJvbm91c2x5 KTogRGl0dG8uCisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KTogRGl0dG8uCisKIDIwMTYtMDYt MjggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtH U3RyZWFtZXJdIGltcHJvdmVkIGR1cmF0aW9uIHF1ZXJ5IHN1cHBvcnQgaW4gdGhlIEhUVFAgc291 cmNlIGVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRo cmVhZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFk YWJsZUxvYWRlci5jcHAKaW5kZXggM2IyZGViYTVhZGIwZDY3NDIyZWU5NTVjNjdiNDAxMGNhMjBl ZGM0MS4uNjI2MmFlYzJiY2UwOTVhM2M5NGQyNzE1NjRhNGY5MjdmZmFmMGI4OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKQEAg LTU2LDIxICs1NiwyMSBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXZvaWQgRG9jdW1lbnRU aHJlYWRhYmxlTG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KERvY3VtZW50JiBkb2N1 bWVudCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBUaHJlYWRhYmxlTG9hZGVyQ2xp ZW50JiBjbGllbnQsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJiBvcHRpb25zLCBzdGQ6 OnVuaXF1ZV9wdHI8Q29udGVudFNlY3VyaXR5UG9saWN5PiYmIGNvbnRlbnRTZWN1cml0eVBvbGlj eSkKK3ZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91 c2x5KERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBU aHJlYWRhYmxlTG9hZGVyQ2xpZW50JiBjbGllbnQsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRp b25zJiBvcHRpb25zLCBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+JiYgb3JpZ2luLCBzdGQ6OnVuaXF1 ZV9wdHI8Q29udGVudFNlY3VyaXR5UG9saWN5PiYmIGNvbnRlbnRTZWN1cml0eVBvbGljeSkKIHsK ICAgICAvLyBUaGUgbG9hZGVyIHdpbGwgYmUgZGVsZXRlZCBhcyBzb29uIGFzIHRoaXMgZnVuY3Rp b24gZXhpdHMuCi0gICAgUmVmUHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcj4gbG9hZGVyID0g YWRvcHRSZWYobmV3IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcihkb2N1bWVudCwgY2xpZW50LCBM b2FkU3luY2hyb25vdXNseSwgcmVxdWVzdCwgb3B0aW9ucywgV1RGTW92ZShjb250ZW50U2VjdXJp dHlQb2xpY3kpKSk7CisgICAgUmVmUHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcj4gbG9hZGVy ID0gYWRvcHRSZWYobmV3IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcihkb2N1bWVudCwgY2xpZW50 LCBMb2FkU3luY2hyb25vdXNseSwgcmVxdWVzdCwgb3B0aW9ucywgV1RGTW92ZShvcmlnaW4pLCBX VEZNb3ZlKGNvbnRlbnRTZWN1cml0eVBvbGljeSkpKTsKICAgICBBU1NFUlQobG9hZGVyLT5oYXNP bmVSZWYoKSk7CiB9CiAKIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpsb2FkUmVzb3Vy Y2VTeW5jaHJvbm91c2x5KERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50JiBjbGllbnQsIGNvbnN0IFRocmVhZGFi bGVMb2FkZXJPcHRpb25zJiBvcHRpb25zKQogewotICAgIGxvYWRSZXNvdXJjZVN5bmNocm9ub3Vz bHkoZG9jdW1lbnQsIHJlcXVlc3QsIGNsaWVudCwgb3B0aW9ucywgbnVsbHB0cik7CisgICAgbG9h ZFJlc291cmNlU3luY2hyb25vdXNseShkb2N1bWVudCwgcmVxdWVzdCwgY2xpZW50LCBvcHRpb25z LCBudWxscHRyLCBudWxscHRyKTsKIH0KIAotUmVmUHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRl cj4gRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50LCBU aHJlYWRhYmxlTG9hZGVyQ2xpZW50JiBjbGllbnQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVx dWVzdCwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMsIHN0ZDo6dW5pcXVl X3B0cjxDb250ZW50U2VjdXJpdHlQb2xpY3k+JiYgY29udGVudFNlY3VyaXR5UG9saWN5KQorUmVm UHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcj4gRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpj cmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50LCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50JiBjbGllbnQs IGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9w dGlvbnMmIG9wdGlvbnMsIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4mJiBvcmlnaW4sIHN0ZDo6dW5p cXVlX3B0cjxDb250ZW50U2VjdXJpdHlQb2xpY3k+JiYgY29udGVudFNlY3VyaXR5UG9saWN5KQog ewotICAgIFJlZlB0cjxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+IGxvYWRlciA9IGFkb3B0UmVm KG5ldyBEb2N1bWVudFRocmVhZGFibGVMb2FkZXIoZG9jdW1lbnQsIGNsaWVudCwgTG9hZEFzeW5j aHJvbm91c2x5LCByZXF1ZXN0LCBvcHRpb25zLCBXVEZNb3ZlKGNvbnRlbnRTZWN1cml0eVBvbGlj eSkpKTsKKyAgICBSZWZQdHI8RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyPiBsb2FkZXIgPSBhZG9w dFJlZihuZXcgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKGRvY3VtZW50LCBjbGllbnQsIExvYWRB c3luY2hyb25vdXNseSwgcmVxdWVzdCwgb3B0aW9ucywgV1RGTW92ZShvcmlnaW4pLCBXVEZNb3Zl KGNvbnRlbnRTZWN1cml0eVBvbGljeSkpKTsKICAgICBpZiAoIWxvYWRlci0+aXNMb2FkaW5nKCkp CiAgICAgICAgIGxvYWRlciA9IG51bGxwdHI7CiAgICAgcmV0dXJuIGxvYWRlcjsKQEAgLTc4LDEz ICs3OCwxNCBAQCBSZWZQdHI8RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyPiBEb2N1bWVudFRocmVh ZGFibGVMb2FkZXI6OmNyZWF0ZShEb2N1bWVudCYgZG9jdQogCiBSZWZQdHI8RG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyPiBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmNyZWF0ZShEb2N1bWVudCYg ZG9jdW1lbnQsIFRocmVhZGFibGVMb2FkZXJDbGllbnQmIGNsaWVudCwgY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucykK IHsKLSAgICByZXR1cm4gY3JlYXRlKGRvY3VtZW50LCBjbGllbnQsIHJlcXVlc3QsIG9wdGlvbnMs IG51bGxwdHIpOworICAgIHJldHVybiBjcmVhdGUoZG9jdW1lbnQsIGNsaWVudCwgcmVxdWVzdCwg b3B0aW9ucywgbnVsbHB0ciwgbnVsbHB0cik7CiB9CiAKLURvY3VtZW50VGhyZWFkYWJsZUxvYWRl cjo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKERvY3VtZW50JiBkb2N1bWVudCwgVGhyZWFkYWJs ZUxvYWRlckNsaWVudCYgY2xpZW50LCBCbG9ja2luZ0JlaGF2aW9yIGJsb2NraW5nQmVoYXZpb3Is IGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9w dGlvbnMmIG9wdGlvbnMsIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50U2VjdXJpdHlQb2xpY3k+JiYg Y29udGVudFNlY3VyaXR5UG9saWN5KQorRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVu dFRocmVhZGFibGVMb2FkZXIoRG9jdW1lbnQmIGRvY3VtZW50LCBUaHJlYWRhYmxlTG9hZGVyQ2xp ZW50JiBjbGllbnQsIEJsb2NraW5nQmVoYXZpb3IgYmxvY2tpbmdCZWhhdmlvciwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0 aW9ucywgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiYmIG9yaWdpbiwgc3RkOjp1bmlxdWVfcHRyPENv bnRlbnRTZWN1cml0eVBvbGljeT4mJiBjb250ZW50U2VjdXJpdHlQb2xpY3kpCiAgICAgOiBtX2Ns aWVudCgmY2xpZW50KQogICAgICwgbV9kb2N1bWVudChkb2N1bWVudCkKICAgICAsIG1fb3B0aW9u cyhvcHRpb25zKQorICAgICwgbV9vcmlnaW4oV1RGTW92ZShvcmlnaW4pKQogICAgICwgbV9zYW1l T3JpZ2luUmVxdWVzdChzZWN1cml0eU9yaWdpbigpLT5jYW5SZXF1ZXN0KHJlcXVlc3QudXJsKCkp KQogICAgICwgbV9zaW1wbGVSZXF1ZXN0KHRydWUpCiAgICAgLCBtX2FzeW5jKGJsb2NraW5nQmVo YXZpb3IgPT0gTG9hZEFzeW5jaHJvbm91c2x5KQpAQCAtMjM5LDcgKzI0MCw3IEBAIHZvaWQgRG9j dW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpyZWRpcmVjdFJlY2VpdmVkKENhY2hlZFJlc291cmNlKiBy ZXNvdXJjZSwgUmVzb3VyCiAgICAgICAgICAgICAvLyBzZXQgdGhlIHNvdXJjZSBvcmlnaW4gdG8g YSBnbG9iYWxseSB1bmlxdWUgaWRlbnRpZmllci4gKElmIHRoZSBvcmlnaW5hbCByZXF1ZXN0IHdh cyBzYW1lLW9yaWdpbiwgdGhlIG9yaWdpbiBvZiB0aGUgbmV3IHJlcXVlc3QKICAgICAgICAgICAg IC8vIHNob3VsZCBiZSB0aGUgb3JpZ2luYWwgVVJMIG9yaWdpbi4pCiAgICAgICAgICAgICBpZiAo IW1fc2FtZU9yaWdpblJlcXVlc3QgJiYgIW9yaWdpbmFsT3JpZ2luLT5pc1NhbWVTY2hlbWVIb3N0 UG9ydChyZXF1ZXN0T3JpZ2luLmdldCgpKSkKLSAgICAgICAgICAgICAgICBtX29wdGlvbnMuc2Vj dXJpdHlPcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlVW5pcXVlKCk7CisgICAgICAgICAg ICAgICAgbV9vcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlVW5pcXVlKCk7CiAgICAgICAg ICAgICAvLyBGb3JjZSBhbnkgc3Vic2VxdWVudCByZXF1ZXN0IHRvIHVzZSB0aGVzZSBjaGVja3Mu CiAgICAgICAgICAgICBtX3NhbWVPcmlnaW5SZXF1ZXN0ID0gZmFsc2U7CiAKQEAgLTQ0NCw3ICs0 NDUsNyBAQCBib29sIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6aXNYTUxIdHRwUmVxdWVzdCgp IGNvbnN0CiAKIFNlY3VyaXR5T3JpZ2luKiBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OnNlY3Vy aXR5T3JpZ2luKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9vcHRpb25zLnNlY3VyaXR5T3JpZ2lu ID8gbV9vcHRpb25zLnNlY3VyaXR5T3JpZ2luLmdldCgpIDogbV9kb2N1bWVudC5zZWN1cml0eU9y aWdpbigpOworICAgIHJldHVybiBtX29yaWdpbiA/IG1fb3JpZ2luLmdldCgpIDogbV9kb2N1bWVu dC5zZWN1cml0eU9yaWdpbigpOwogfQogCiBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3kmIERv Y3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6Y29udGVudFNlY3VyaXR5UG9saWN5KCkgY29uc3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuaAppbmRl eCAxMmY4MzM2YTAyNTE2MzJjNWQzMDc2MWU3NzYxMDExNTFlYzNhNGVhLi42Y2M2YjBlMzdiOTk1 ODBkMTBlODU0ZGE2YTYyMDViNGNiZGE4MDJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5oCkBAIC0zMiwyMiArMzIsMjIgQEAKICNkZWZp bmUgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyX2gKIAogI2luY2x1ZGUgIkNyb3NzT3JpZ2luUHJl ZmxpZ2h0Q2hlY2tlci5oIgorI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAi VGhyZWFkYWJsZUxvYWRlci5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgQ2Fj aGVkUmF3UmVzb3VyY2U7CiAgICAgY2xhc3MgQ29udGVudFNlY3VyaXR5UG9saWN5OwogICAgIGNs YXNzIERvY3VtZW50OwotICAgIGNsYXNzIFNlY3VyaXR5T3JpZ2luOwogICAgIGNsYXNzIFRocmVh ZGFibGVMb2FkZXJDbGllbnQ7CiAKICAgICBjbGFzcyBEb2N1bWVudFRocmVhZGFibGVMb2FkZXIg OiBwdWJsaWMgUmVmQ291bnRlZDxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+LCBwdWJsaWMgVGhy ZWFkYWJsZUxvYWRlciwgcHJpdmF0ZSBDYWNoZWRSYXdSZXNvdXJjZUNsaWVudCAgewogICAgICAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBwdWJsaWM6Ci0gICAgICAgIHN0YXRpYyB2 b2lkIGxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoRG9jdW1lbnQmLCBjb25zdCBSZXNvdXJjZVJl cXVlc3QmLCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50JiwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9w dGlvbnMmLCBzdGQ6OnVuaXF1ZV9wdHI8Q29udGVudFNlY3VyaXR5UG9saWN5PiYmKTsKKyAgICAg ICAgc3RhdGljIHZvaWQgbG9hZFJlc291cmNlU3luY2hyb25vdXNseShEb2N1bWVudCYsIGNvbnN0 IFJlc291cmNlUmVxdWVzdCYsIFRocmVhZGFibGVMb2FkZXJDbGllbnQmLCBjb25zdCBUaHJlYWRh YmxlTG9hZGVyT3B0aW9ucyYsIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4mJiwgc3RkOjp1bmlxdWVf cHRyPENvbnRlbnRTZWN1cml0eVBvbGljeT4mJik7CiAgICAgICAgIHN0YXRpYyB2b2lkIGxvYWRS ZXNvdXJjZVN5bmNocm9ub3VzbHkoRG9jdW1lbnQmLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBU aHJlYWRhYmxlTG9hZGVyQ2xpZW50JiwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmKTsK IAotICAgICAgICBzdGF0aWMgUmVmUHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcj4gY3JlYXRl KERvY3VtZW50JiwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCYsIGNvbnN0IFJlc291cmNlUmVxdWVz dCYsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJiwgc3RkOjp1bmlxdWVfcHRyPENvbnRl bnRTZWN1cml0eVBvbGljeT4mJik7CisgICAgICAgIHN0YXRpYyBSZWZQdHI8RG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyPiBjcmVhdGUoRG9jdW1lbnQmLCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50Jiwg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmLCBS ZWZQdHI8U2VjdXJpdHlPcmlnaW4+JiYsIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50U2VjdXJpdHlQ b2xpY3k+JiYpOwogICAgICAgICBzdGF0aWMgUmVmUHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRl cj4gY3JlYXRlKERvY3VtZW50JiwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCYsIGNvbnN0IFJlc291 cmNlUmVxdWVzdCYsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJik7CiAKICAgICAgICAg dmlydHVhbCB+RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKCk7CkBAIC03MCw3ICs3MCw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIExvYWRBc3luY2hyb25vdXNseQogICAgICAg ICB9OwogCi0gICAgICAgIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcihEb2N1bWVudCYsIFRocmVh ZGFibGVMb2FkZXJDbGllbnQmLCBCbG9ja2luZ0JlaGF2aW9yLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmLCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYsIHN0ZDo6dW5pcXVlX3B0cjxDb250 ZW50U2VjdXJpdHlQb2xpY3k+JiYpOworICAgICAgICBEb2N1bWVudFRocmVhZGFibGVMb2FkZXIo RG9jdW1lbnQmLCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50JiwgQmxvY2tpbmdCZWhhdmlvciwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmLCBSZWZQ dHI8U2VjdXJpdHlPcmlnaW4+JiYsIHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50U2VjdXJpdHlQb2xp Y3k+JiYpOwogCiAgICAgICAgIHZvaWQgY2xlYXJSZXNvdXJjZSgpOwogCkBAIC0xMDgsNiArMTA4 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50 KiBtX2NsaWVudDsKICAgICAgICAgRG9jdW1lbnQmIG1fZG9jdW1lbnQ7CiAgICAgICAgIFRocmVh ZGFibGVMb2FkZXJPcHRpb25zIG1fb3B0aW9uczsKKyAgICAgICAgUmVmUHRyPFNlY3VyaXR5T3Jp Z2luPiBtX29yaWdpbjsKICAgICAgICAgYm9vbCBtX3NhbWVPcmlnaW5SZXF1ZXN0OwogICAgICAg ICBib29sIG1fc2ltcGxlUmVxdWVzdDsKICAgICAgICAgYm9vbCBtX2FzeW5jOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuY3BwCmluZGV4IGQ4ODlhZjU5YTZmN2NmODk0 YjFjM2UzMjhiY2ZmZTRmYTQxOTRkMWYuLjE3YmNkZDk3ZDRkZjdmZGNjYmM2OTgxN2E4OTBmZDk3 YzNkNjNmZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9h ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5jcHAK QEAgLTQ5LDI0ICs0OSwxNSBAQCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9uczo6flRocmVhZGFibGVM b2FkZXJPcHRpb25zKCkKIHsKIH0KIAotVGhyZWFkYWJsZUxvYWRlck9wdGlvbnM6OlRocmVhZGFi bGVMb2FkZXJPcHRpb25zKGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYgYmFzZU9wdGlvbnMs IFByZWZsaWdodFBvbGljeSBwcmVmbGlnaHRQb2xpY3ksIENyb3NzT3JpZ2luUmVxdWVzdFBvbGlj eSBjcm9zc09yaWdpblJlcXVlc3RQb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2Vt ZW50IGNvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBSZWZQdHI8U2VjdXJpdHlPcmln aW4+JiYgc2VjdXJpdHlPcmlnaW4sIFN0cmluZyYmIGluaXRpYXRvcikKK1RocmVhZGFibGVMb2Fk ZXJPcHRpb25zOjpUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyhjb25zdCBSZXNvdXJjZUxvYWRlck9w dGlvbnMmIGJhc2VPcHRpb25zLCBQcmVmbGlnaHRQb2xpY3kgcHJlZmxpZ2h0UG9saWN5LCBDcm9z c09yaWdpblJlcXVlc3RQb2xpY3kgY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5LCBDb250ZW50U2Vj dXJpdHlQb2xpY3lFbmZvcmNlbWVudCBjb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudCwg U3RyaW5nJiYgaW5pdGlhdG9yKQogICAgIDogUmVzb3VyY2VMb2FkZXJPcHRpb25zKGJhc2VPcHRp b25zKQogICAgICwgcHJlZmxpZ2h0UG9saWN5KHByZWZsaWdodFBvbGljeSkKICAgICAsIGNyb3Nz T3JpZ2luUmVxdWVzdFBvbGljeShjcm9zc09yaWdpblJlcXVlc3RQb2xpY3kpCiAgICAgLCBjb250 ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudChjb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNl bWVudCkKLSAgICAsIHNlY3VyaXR5T3JpZ2luKFdURk1vdmUoc2VjdXJpdHlPcmlnaW4pKQogICAg ICwgaW5pdGlhdG9yKFdURk1vdmUoaW5pdGlhdG9yKSkKIHsKIH0KIAotc3RkOjp1bmlxdWVfcHRy PFRocmVhZGFibGVMb2FkZXJPcHRpb25zPiBUaHJlYWRhYmxlTG9hZGVyT3B0aW9uczo6aXNvbGF0 ZWRDb3B5KCkgY29uc3QKLXsKLSAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3Jp Z2luQ29weTsKLSAgICBpZiAoc2VjdXJpdHlPcmlnaW4pCi0gICAgICAgIHNlY3VyaXR5T3JpZ2lu Q29weSA9IHNlY3VyaXR5T3JpZ2luLT5pc29sYXRlZENvcHkoKTsKLSAgICByZXR1cm4gc3RkOjpt YWtlX3VuaXF1ZTxUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucz4oKnRoaXMsIHByZWZsaWdodFBvbGlj eSwgY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5LCBjb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNl bWVudCwgV1RGTW92ZShzZWN1cml0eU9yaWdpbkNvcHkpLCBpbml0aWF0b3IuaXNvbGF0ZWRDb3B5 KCkpOwotfQotCiBSZWZQdHI8VGhyZWFkYWJsZUxvYWRlcj4gVGhyZWFkYWJsZUxvYWRlcjo6Y3Jl YXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFRocmVhZGFibGVMb2FkZXJDbGll bnQqIGNsaWVudCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBUaHJlYWRh YmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucykKIHsKICAgICBBU1NFUlQoY2xpZW50KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5oCmluZGV4IGI2MzEwYjhjZDFlOGRhMzE3 NzE4NWRkMjMzODNmY2JlYTVjNGNkMjEuLmUzNDNlZDMzM2FhZDE2ZDExMmZmZDRjYmQxNTRmNjJk NjY1ZDA4YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9h ZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuaApAQCAt NjcsMTEgKzY3LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgc3RydWN0IFRocmVhZGFi bGVMb2FkZXJPcHRpb25zIDogUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICAgICAgVGhyZWFk YWJsZUxvYWRlck9wdGlvbnMoKTsKLSAgICAgICAgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMoY29u c3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJiwgUHJlZmxpZ2h0UG9saWN5LCBDcm9zc09yaWdpblJl cXVlc3RQb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBSZWZQdHI8U2Vj dXJpdHlPcmlnaW4+JiYsIFN0cmluZyYmIGluaXRpYXRvcik7CisgICAgICAgIFRocmVhZGFibGVM b2FkZXJPcHRpb25zKGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYsIFByZWZsaWdodFBvbGlj eSwgQ3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5LCBDb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNl bWVudCwgU3RyaW5nJiYgaW5pdGlhdG9yKTsKICAgICAgICAgflRocmVhZGFibGVMb2FkZXJPcHRp b25zKCk7CiAKLSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFRocmVhZGFibGVMb2FkZXJPcHRpb25z PiBpc29sYXRlZENvcHkoKSBjb25zdDsKLQogICAgICAgICBQcmVmbGlnaHRQb2xpY3kgcHJlZmxp Z2h0UG9saWN5IHsgQ29uc2lkZXJQcmVmbGlnaHQgfTsKICAgICAgICAgQ3Jvc3NPcmlnaW5SZXF1 ZXN0UG9saWN5IGNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSB7IERlbnlDcm9zc09yaWdpblJlcXVl c3RzIH07CiAgICAgICAgIENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50IGNvbnRlbnRT ZWN1cml0eVBvbGljeUVuZm9yY2VtZW50IHsgQ29udGVudFNlY3VyaXR5UG9saWN5RW5mb3JjZW1l bnQ6OkVuZm9yY2VDb25uZWN0U3JjRGlyZWN0aXZlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKaW5kZXggYmQ2ZDMyMGE4MjNjMWM4Njhk ZGVlOTRlMTMzZjFkMWUyMmMyYWVhNy4uOTBjMDRkMmU4ZWYyOWU1MzJjMjI4ODQ1MzJkNGYwYjcx MjlkYmJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFi bGVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRhYmxl TG9hZGVyLmNwcApAQCAtODMsNiArODMsMjAgQEAgdm9pZCBXb3JrZXJUaHJlYWRhYmxlTG9hZGVy OjpjYW5jZWwoKQogICAgIG1fYnJpZGdlLmNhbmNlbCgpOwogfQogCitzdHJ1Y3QgTG9hZGVyVGFz a09wdGlvbnMgeworICAgIExvYWRlclRhc2tPcHRpb25zKGNvbnN0IFRocmVhZGFibGVMb2FkZXJP cHRpb25zJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU2VjdXJpdHlPcmlnaW4mKTsKKyAgICBUaHJl YWRhYmxlTG9hZGVyT3B0aW9ucyBvcHRpb25zOworICAgIFN0cmluZyByZWZlcnJlcjsKKyAgICBS ZWZQdHI8U2VjdXJpdHlPcmlnaW4+IG9yaWdpbjsKK307CisKK0xvYWRlclRhc2tPcHRpb25zOjpM b2FkZXJUYXNrT3B0aW9ucyhjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucywg Y29uc3QgU3RyaW5nJiByZWZlcnJlciwgY29uc3QgU2VjdXJpdHlPcmlnaW4mIG9yaWdpbikKKyAg ICA6IG9wdGlvbnMob3B0aW9ucywgb3B0aW9ucy5wcmVmbGlnaHRQb2xpY3ksIG9wdGlvbnMuY3Jv c3NPcmlnaW5SZXF1ZXN0UG9saWN5LCBvcHRpb25zLmNvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9y Y2VtZW50LCBvcHRpb25zLmluaXRpYXRvci5pc29sYXRlZENvcHkoKSkKKyAgICAsIHJlZmVycmVy KHJlZmVycmVyLmlzb2xhdGVkQ29weSgpKQorICAgICwgb3JpZ2luKG9yaWdpbi5pc29sYXRlZENv cHkoKSkKK3sKK30KKwogV29ya2VyVGhyZWFkYWJsZUxvYWRlcjo6TWFpblRocmVhZEJyaWRnZTo6 TWFpblRocmVhZEJyaWRnZShUaHJlYWRhYmxlTG9hZGVyQ2xpZW50V3JhcHBlciYgd29ya2VyQ2xp ZW50V3JhcHBlciwgV29ya2VyTG9hZGVyUHJveHkmIGxvYWRlclByb3h5LCBjb25zdCBTdHJpbmcm IHRhc2tNb2RlLAogICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgVGhy ZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IFN0cmluZyYgb3V0Z29pbmdSZWZl cnJlciwKICAgICBjb25zdCBTZWN1cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4sIGNvbnN0IENv bnRlbnRTZWN1cml0eVBvbGljeSogY29udGVudFNlY3VyaXR5UG9saWN5KQpAQCAtOTYsMTYgKzEx MCwxNyBAQCBXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhy ZWFkQnJpZGdlKFRocmVhZGFibGVMb2FkZXJDbGllbgogICAgIGF1dG8gY29udGVudFNlY3VyaXR5 UG9saWN5Q29weSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5Pigqc2Vj dXJpdHlPcmlnaW4pOwogICAgIGNvbnRlbnRTZWN1cml0eVBvbGljeUNvcHktPmNvcHlTdGF0ZUZy b20oY29udGVudFNlY3VyaXR5UG9saWN5KTsKIAotICAgIG1fbG9hZGVyUHJveHkucG9zdFRhc2tU b0xvYWRlcihbdGhpcywgcmVxdWVzdCA9IHJlcXVlc3QuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMg PSBvcHRpb25zLmlzb2xhdGVkQ29weSgpLCBjb250ZW50U2VjdXJpdHlQb2xpY3lDb3B5ID0gV1RG TW92ZShjb250ZW50U2VjdXJpdHlQb2xpY3lDb3B5KSwgb3V0Z29pbmdSZWZlcnJlciA9IG91dGdv aW5nUmVmZXJyZXIuaXNvbGF0ZWRDb3B5KCldKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRl eHQpIG11dGFibGUgeworICAgIGF1dG8gb3B0aW9uc0NvcHkgPSBzdGQ6Om1ha2VfdW5pcXVlPExv YWRlclRhc2tPcHRpb25zPihvcHRpb25zLCBvdXRnb2luZ1JlZmVycmVyLCAqc2VjdXJpdHlPcmln aW4pOworCisgICAgbV9sb2FkZXJQcm94eS5wb3N0VGFza1RvTG9hZGVyKFt0aGlzLCByZXF1ZXN0 ID0gcmVxdWVzdC5pc29sYXRlZENvcHkoKSwgb3B0aW9ucyA9IFdURk1vdmUob3B0aW9uc0NvcHkp LCBjb250ZW50U2VjdXJpdHlQb2xpY3lDb3B5ID0gV1RGTW92ZShjb250ZW50U2VjdXJpdHlQb2xp Y3lDb3B5KV0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCkgbXV0YWJsZSB7CiAgICAg ICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgICAgIERvY3VtZW50JiBkb2N1bWVudCA9 IGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KTsKIAotICAgICAgICByZXF1ZXN0LnNldEhUVFBS ZWZlcnJlcihvdXRnb2luZ1JlZmVycmVyKTsKKyAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJy ZXIob3B0aW9ucy0+cmVmZXJyZXIpOwogCi0gICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgYSBzaXRl IHJlcXVlc3RzIGEgbG9jYWwgcmVzb3VyY2UsIHRoZW4gdGhpcyB3aWxsIHJldHVybiBhIG5vbi16 ZXJvIHZhbHVlIGJ1dCB0aGUgc3luYyBwYXRoCi0gICAgICAgIC8vIHdpbGwgcmV0dXJuIGEgMCB2 YWx1ZS4gRWl0aGVyIHRoaXMgc2hvdWxkIHJldHVybiAwIG9yIHRoZSBvdGhlciBjb2RlIHBhdGgg c2hvdWxkIGRvIGEgY2FsbGJhY2sgd2l0aAotICAgICAgICAvLyBhIGZhaWx1cmUuCi0gICAgICAg IG1fbWFpblRocmVhZExvYWRlciA9IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6Y3JlYXRlKGRv Y3VtZW50LCAqdGhpcywgcmVxdWVzdCwgKm9wdGlvbnMsIFdURk1vdmUoY29udGVudFNlY3VyaXR5 UG9saWN5Q29weSkpOworICAgICAgICAvLyBGSVhNRTogSWYgdGhlIHNpdGUgcmVxdWVzdHMgYSBs b2NhbCByZXNvdXJjZSwgdGhlbiB0aGlzIHdpbGwgcmV0dXJuIGEgbm9uLXplcm8gdmFsdWUgYnV0 IHRoZSBzeW5jIHBhdGggd2lsbCByZXR1cm4gYSAwIHZhbHVlLgorICAgICAgICAvLyBFaXRoZXIg dGhpcyBzaG91bGQgcmV0dXJuIDAgb3IgdGhlIG90aGVyIGNvZGUgcGF0aCBzaG91bGQgY2FsbCBh IGZhaWx1cmUgY2FsbGJhY2suCisgICAgICAgIG1fbWFpblRocmVhZExvYWRlciA9IERvY3VtZW50 VGhyZWFkYWJsZUxvYWRlcjo6Y3JlYXRlKGRvY3VtZW50LCAqdGhpcywgcmVxdWVzdCwgb3B0aW9u cy0+b3B0aW9ucywgV1RGTW92ZShvcHRpb25zLT5vcmlnaW4pLCBXVEZNb3ZlKGNvbnRlbnRTZWN1 cml0eVBvbGljeUNvcHkpKTsKICAgICAgICAgQVNTRVJUKG1fbWFpblRocmVhZExvYWRlciB8fCBt X2xvYWRpbmdGaW5pc2hlZCk7CiAgICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50U291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2Uu Y3BwCmluZGV4IGJmNjhjM2UzMWFiYzQ4OGNhZmEyM2E4ZDRkNmNhZDVkYjNhZmQ0ODYuLjgwNzgy OTNhOThjZTcwY2VlN2Y0ZTE4NjM1NzQxZTc3NTkwZWIxZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRTb3VyY2UuY3BwCkBAIC0xMTMsNyArMTEzLDYgQEAgdm9pZCBFdmVudFNvdXJjZTo6Y29ubmVj dCgpCiAgICAgb3B0aW9ucy5wcmVmbGlnaHRQb2xpY3kgPSBQcmV2ZW50UHJlZmxpZ2h0OwogICAg IG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0gVXNlQWNjZXNzQ29udHJvbDsKICAg ICBvcHRpb25zLnNldERhdGFCdWZmZXJpbmdQb2xpY3koRG9Ob3RCdWZmZXJEYXRhKTsKLSAgICBv cHRpb25zLnNlY3VyaXR5T3JpZ2luID0gJm9yaWdpbjsKICAgICBvcHRpb25zLmNvbnRlbnRTZWN1 cml0eVBvbGljeUVuZm9yY2VtZW50ID0gc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zaG91bGRC eXBhc3NNYWluV29ybGRDb250ZW50U2VjdXJpdHlQb2xpY3koKSA/IENvbnRlbnRTZWN1cml0eVBv bGljeUVuZm9yY2VtZW50OjpEb05vdEVuZm9yY2UgOiBDb250ZW50U2VjdXJpdHlQb2xpY3lFbmZv cmNlbWVudDo6RW5mb3JjZUNvbm5lY3RTcmNEaXJlY3RpdmU7CiAKICAgICBtX2xvYWRlciA9IFRo cmVhZGFibGVMb2FkZXI6OmNyZWF0ZShzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHRoaXMsIHJl cXVlc3QsIG9wdGlvbnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3Jr ZXJTY3JpcHRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJTY3JpcHRM b2FkZXIuY3BwCmluZGV4IDk1NDdkYTJlMjMyZTk0NWEwM2MyMjY5ZDIyNGM4YTIzNGRhZTExZjMu LjE4ZGM1MGNkMDdmMzFiNzViYmMzZjcyOGU3Y2NjMDQ4ZDZiMmE5NDggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5jcHAKQEAgLTY4LDEyICs2OCwxMSBA QCB2b2lkIFdvcmtlclNjcmlwdExvYWRlcjo6bG9hZFN5bmNocm9ub3VzbHkoU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aQogICAgIG9wdGlvbnMuc2V0QWxsb3dDcmVkZW50aWFs cyhBbGxvd1N0b3JlZENyZWRlbnRpYWxzKTsKICAgICBvcHRpb25zLmNyb3NzT3JpZ2luUmVxdWVz dFBvbGljeSA9IGNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeTsKICAgICBvcHRpb25zLnNldFNlbmRM b2FkQ2FsbGJhY2tzKFNlbmRDYWxsYmFja3MpOwotICAgIG9wdGlvbnMuc2VjdXJpdHlPcmlnaW4g PSBzY3JpcHRFeGVjdXRpb25Db250ZXh0LT5zZWN1cml0eU9yaWdpbigpOwogICAgIG9wdGlvbnMu Y29udGVudFNlY3VyaXR5UG9saWN5RW5mb3JjZW1lbnQgPSBjb250ZW50U2VjdXJpdHlQb2xpY3lF bmZvcmNlbWVudDsKIAogICAgIFdvcmtlclRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5 bmNocm9ub3VzbHkoZG93bmNhc3Q8V29ya2VyR2xvYmFsU2NvcGU+KHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQpLCAqcmVxdWVzdCwgKnRoaXMsIG9wdGlvbnMpOwogfQotICAgIAorCiB2b2lkIFdvcmtl clNjcmlwdExvYWRlcjo6bG9hZEFzeW5jaHJvbm91c2x5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQq IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIGNvbnN0IFVSTCYgdXJsLCBDcm9zc09yaWdpblJlcXVl c3RQb2xpY3kgY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5LCBDb250ZW50U2VjdXJpdHlQb2xpY3lF bmZvcmNlbWVudCBjb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudCwgV29ya2VyU2NyaXB0 TG9hZGVyQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgQVNTRVJUKGNsaWVudCk7CkBAIC04OCw3ICs4 Nyw2IEBAIHZvaWQgV29ya2VyU2NyaXB0TG9hZGVyOjpsb2FkQXN5bmNocm9ub3VzbHkoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0CiAgICAgb3B0aW9ucy5zZXRBbGxvd0NyZWRl bnRpYWxzKEFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOwogICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5S ZXF1ZXN0UG9saWN5ID0gY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5OwogICAgIG9wdGlvbnMuc2V0 U2VuZExvYWRDYWxsYmFja3MoU2VuZENhbGxiYWNrcyk7Ci0gICAgb3B0aW9ucy5zZWN1cml0eU9y aWdpbiA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCk7CiAgICAgb3B0 aW9ucy5jb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudCA9IGNvbnRlbnRTZWN1cml0eVBv bGljeUVuZm9yY2VtZW50OwogCiAgICAgLy8gRHVyaW5nIGNyZWF0ZSwgY2FsbGJhY2tzIG1heSBo YXBwZW4gd2hpY2ggcmVtb3ZlIHRoZSBsYXN0IHJlZmVyZW5jZSB0byB0aGlzIG9iamVjdC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCmluZGV4IDgxYzYzZDdiZjE5M2RkYjA3OGNh YTk1NTYwZTVmZDlhMzQ4YjJiNDMuLjhkZjhjZTU0NWRiYzVkMmY5ZmMzMjhiNTQ5ZjM1YjUyNjc0 Mjk2MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcApAQCAtNzE1LDcgKzcx NSw2IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmNyZWF0ZVJlcXVlc3QoRXhjZXB0aW9uQ29kZSYg ZWMpCiAgICAgb3B0aW9ucy5zZXRBbGxvd0NyZWRlbnRpYWxzKChtX3NhbWVPcmlnaW5SZXF1ZXN0 IHx8IG1faW5jbHVkZUNyZWRlbnRpYWxzKSA/IEFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBEb05v dEFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOwogICAgIG9wdGlvbnMuc2V0Q3JlZGVudGlhbFJlcXVl c3QobV9pbmNsdWRlQ3JlZGVudGlhbHMgPyBDbGllbnRSZXF1ZXN0ZWRDcmVkZW50aWFscyA6IENs aWVudERpZE5vdFJlcXVlc3RDcmVkZW50aWFscyk7CiAgICAgb3B0aW9ucy5jcm9zc09yaWdpblJl cXVlc3RQb2xpY3kgPSBVc2VBY2Nlc3NDb250cm9sOwotICAgIG9wdGlvbnMuc2VjdXJpdHlPcmln aW4gPSBzZWN1cml0eU9yaWdpbigpOwogICAgIG9wdGlvbnMuY29udGVudFNlY3VyaXR5UG9saWN5 RW5mb3JjZW1lbnQgPSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNob3VsZEJ5cGFzc01haW5X b3JsZENvbnRlbnRTZWN1cml0eVBvbGljeSgpID8gQ29udGVudFNlY3VyaXR5UG9saWN5RW5mb3Jj ZW1lbnQ6OkRvTm90RW5mb3JjZSA6IENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50OjpF bmZvcmNlQ29ubmVjdFNyY0RpcmVjdGl2ZTsKICAgICBvcHRpb25zLmluaXRpYXRvciA9IGNhY2hl ZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS54bWxodHRwcmVxdWVzdDsKIAo=