200712 2019-08-14 06:17:30 -0700 Remove use of emptySessionID from NetworkLoadParameters 2019-08-14 10:25:17 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson cdumez cgarcia commit-queue ews-watchlist webkit-bug-importer oldest_to_newest 1561140 0 youennf 2019-08-14 06:17:30 -0700 Remove use of emptySessionID from NetworkLoadParameters 1561141 1 376260 youennf 2019-08-14 06:19:46 -0700 Created attachment 376260 Patch 1561226 2 376260 commit-queue 2019-08-14 10:24:24 -0700 Comment on attachment 376260 Patch Clearing flags on attachment: 376260 Committed r248677: <https://trac.webkit.org/changeset/248677> 1561227 3 commit-queue 2019-08-14 10:24:26 -0700 All reviewed patches have been landed. Closing bug. 1561229 4 webkit-bug-importer 2019-08-14 10:25:17 -0700 <rdar://problem/54307467> 376260 2019-08-14 06:19:46 -0700 2019-08-14 10:24:24 -0700 Patch bug-200712-20190814151934.patch text/plain 19294 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5NzFiNjViNWEzNzQ0YjA3 YzFiMThhODMwMjc3ZDQwYTMxNDM1YWUuLjgyYzBhNWFlMGQ3YzE5YjJjZWIxMGNhMGMxOTVlY2I5 YjJjYWQ2YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTktMDgtMTQgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB1c2Ugb2YgZW1wdHlT ZXNzaW9uSUQgZnJvbSBOZXR3b3JrTG9hZFBhcmFtZXRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDcxMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgTmV0d29ya0xvYWRQYXJhbWV0ZXJzIGNv bnN0cnVjdG9yIHRha2UgYSBzZXNzaW9uIElELgorICAgICAgICBVcGRhdGUgY2FsbCBzaXRlcyBh Y2NvcmRpbmdseS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0FkQ2xpY2tBdHRyaWJ1dGlv bk1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpBZENsaWNrQXR0cmlidXRpb25NYW5hZ2Vy OjpmaXJlQ29udmVyc2lvblJlcXVlc3QpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0Rvd25s b2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZE1hbmFn ZXI6OnN0YXJ0RG93bmxvYWQpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtDT1JT UHJlZmxpZ2h0Q2hlY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDT1JTUHJlZmxp Z2h0Q2hlY2tlcjo6c3RhcnRQcmVmbGlnaHQpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05l dHdvcmtMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZFBhcmFt ZXRlcnM6Ok5ldHdvcmtMb2FkUGFyYW1ldGVycyk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cHJl Y29ubmVjdFRvKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk UGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJh bWV0ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VM b2FkUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3Vy Y2VMb2FkUGFyYW1ldGVyczo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMpOgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVMb2FkOjpTcGVjdWxh dGl2ZUxvYWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVn eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRG cm9tTmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6 bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0 cmF0ZWd5OjpzdGFydFBpbmdMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRl Z3k6OnByZWNvbm5lY3RUbyk6CisKIDIwMTktMDgtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBBUEk6OlBhZ2VDb25maWd1cmF0aW9uOjptX3Nl c3Npb25JRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9BZENsaWNr QXR0cmlidXRpb25NYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQWRD bGlja0F0dHJpYnV0aW9uTWFuYWdlci5jcHAKaW5kZXggMWQ3YjEzM2ViYWI2OTBmMDM1ZjNhYzVi Nzc0MjcyZjdmNWY3YmQyYy4uOTA5ZWE1MzkxYTRlOGM5NmUzNDUxMjhmYjc0Yzk4N2Y4ZTlkZjRk ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9BZENsaWNrQXR0cmli dXRpb25NYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0FkQ2xp Y2tBdHRyaWJ1dGlvbk1hbmFnZXIuY3BwCkBAIC0xNjMsMTIgKzE2MywxMSBAQCB2b2lkIEFkQ2xp Y2tBdHRyaWJ1dGlvbk1hbmFnZXI6OmZpcmVDb252ZXJzaW9uUmVxdWVzdChjb25zdCBBZENsaWNr QXR0cmlidXRpb24mCiAKICAgICBzdGF0aWMgdWludDY0X3QgaWRlbnRpZmllciA9IDA7CiAgICAg Ci0gICAgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7CisgICAg TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnMgeyBQQUw6OlNlc3Np b25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpIH07CiAgICAgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmll ciA9ICsraWRlbnRpZmllcjsKICAgICBsb2FkUGFyYW1ldGVycy5yZXF1ZXN0ID0gcmVxdWVzdDsK ICAgICBsb2FkUGFyYW1ldGVycy5zb3VyY2VPcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRl KGNvbnZlcnNpb25SZWZlcnJlclVSTCk7CiAgICAgbG9hZFBhcmFtZXRlcnMucGFyZW50UElEID0g cHJlc2VudGluZ0FwcGxpY2F0aW9uUElEKCk7Ci0gICAgbG9hZFBhcmFtZXRlcnMuc2Vzc2lvbklE ID0gUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKTsKICAgICBsb2FkUGFyYW1ldGVy cy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSA9IFN0b3JlZENyZWRlbnRpYWxzUG9saWN5OjpFcGhl bWVyYWxTdGF0ZWxlc3NDb29raWVsZXNzOwogICAgIGxvYWRQYXJhbWV0ZXJzLm9wdGlvbnMgPSBv cHRpb25zOwogICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9I VFRQUmVkaXJlY3QgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5jcHAKaW5kZXggZmZmYjQ3MzVkYjIx ZWQ1NGE4MGI0ZDAzZjRkNGU3MDQ1NDZiZjlkYy4uZjRkNzVkOWRkMzE4MjAwNDQ5YTJhYjJlNThl ODg2MzEyMGM3Nzc0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9E b3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwCkBAIC00OSw4ICs0OSw3IEBAIHZv aWQgRG93bmxvYWRNYW5hZ2VyOjpzdGFydERvd25sb2FkKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25J RCwgRG93bmxvYWRJRCBkb3dubG9hCiAgICAgaWYgKCFuZXR3b3JrU2Vzc2lvbikKICAgICAgICAg cmV0dXJuOwogCi0gICAgTmV0d29ya0xvYWRQYXJhbWV0ZXJzIHBhcmFtZXRlcnM7Ci0gICAgcGFy YW1ldGVycy5zZXNzaW9uSUQgPSBzZXNzaW9uSUQ7CisgICAgTmV0d29ya0xvYWRQYXJhbWV0ZXJz IHBhcmFtZXRlcnMgeyBzZXNzaW9uSUQgfTsKICAgICBwYXJhbWV0ZXJzLnJlcXVlc3QgPSByZXF1 ZXN0OwogICAgIHBhcmFtZXRlcnMuY2xpZW50Q3JlZGVudGlhbFBvbGljeSA9IENsaWVudENyZWRl bnRpYWxQb2xpY3k6Ok1heUFza0NsaWVudEZvckNyZWRlbnRpYWxzOwogICAgIGlmIChyZXF1ZXN0 LnVybCgpLnByb3RvY29sSXNCbG9iKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlci5jcHAKaW5kZXggOTRm MTI3NzI4MmI5NTMyMWY2NjY1Y2Q0ZmI2NmI3OTJkYzgzNDliZi4uNGFkZjFkMzJjNGM4ODc5NGEw OWU3NzBjM2I0YTE3OTIwMWZhNDk0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrQ09SU1ByZWZsaWdodENoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0NPUlNQcmVmbGlnaHRDaGVja2VyLmNwcApAQCAtNjMs OCArNjMsNyBAQCB2b2lkIE5ldHdvcmtDT1JTUHJlZmxpZ2h0Q2hlY2tlcjo6c3RhcnRQcmVmbGln aHQoKQogewogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0UHJlZmxpZ2h0Iik7CiAK LSAgICBOZXR3b3JrTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7Ci0gICAgbG9hZFBhcmFt ZXRlcnMuc2Vzc2lvbklEID0gbV9wYXJhbWV0ZXJzLnNlc3Npb25JRDsKKyAgICBOZXR3b3JrTG9h ZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnMgeyBtX3BhcmFtZXRlcnMuc2Vzc2lvbklEIH07CiAg ICAgbG9hZFBhcmFtZXRlcnMucmVxdWVzdCA9IGNyZWF0ZUFjY2Vzc0NvbnRyb2xQcmVmbGlnaHRS ZXF1ZXN0KG1fcGFyYW1ldGVycy5vcmlnaW5hbFJlcXVlc3QsIG1fcGFyYW1ldGVycy5zb3VyY2VP cmlnaW4sIG1fcGFyYW1ldGVycy5yZWZlcnJlcik7CiAgICAgaWYgKCFtX3BhcmFtZXRlcnMudXNl ckFnZW50LmlzTnVsbCgpKQogICAgICAgICBsb2FkUGFyYW1ldGVycy5yZXF1ZXN0LnNldEhUVFBI ZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6VXNlckFnZW50LCBtX3BhcmFtZXRlcnMudXNlckFn ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xv YWRQYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2Fk UGFyYW1ldGVycy5oCmluZGV4IGNmYjJjNzVjMGNkNzkyYTAwYTUwNWM4MGI2OThjMTYwYTgwMjEz NTQuLmM0M2U1ZGNkNzUwMTFhNTU5MWU2ZTY4MjcyNGMxYTY5NTY1ZWNmMTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRQYXJhbWV0ZXJzLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMuaApA QCAtMzksMTAgKzM5LDE1IEBAIGVudW0gY2xhc3MgUHJlY29ubmVjdE9ubHkgeyBObywgWWVzIH07 CiAKIGNsYXNzIE5ldHdvcmtMb2FkUGFyYW1ldGVycyB7CiBwdWJsaWM6CisgICAgZXhwbGljaXQg TmV0d29ya0xvYWRQYXJhbWV0ZXJzKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKKyAgICAgICAg OiBzZXNzaW9uSUQoc2Vzc2lvbklEKQorICAgIHsKKyAgICB9CisKKyAgICBQQUw6OlNlc3Npb25J RCBzZXNzaW9uSUQ7CiAgICAgV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIgd2ViUGFnZUlEOwogICAg IHVpbnQ2NF90IHdlYkZyYW1lSUQgeyAwIH07CiAgICAgV1RGOjpQcm9jZXNzSUQgcGFyZW50UElE IHsgMCB9OwotICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCB7IFBBTDo6U2Vzc2lvbklEOjpl bXB0eVNlc3Npb25JRCgpIH07CiAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3Q7 CiAgICAgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5IGNvbnRlbnRTbmlmZmluZ1BvbGlj eSB7IFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeTo6U25pZmZDb250ZW50IH07CiAgICAg V2ViQ29yZTo6Q29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3kgY29udGVudEVuY29kaW5nU25p ZmZpbmdQb2xpY3kgeyBXZWJDb3JlOjpDb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGljeTo6U25p ZmYgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By b2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5j cHAKaW5kZXggMzQwMTNmODViYWZjOGE5NTkxOTIyYjJlMjY4ZGE0YjM5OGFjMTk3Yy4uOTNkOWZj ZjQ1OGM2OGEyODdkZmFhMWI5MzA1MDYwOTdhMmU2ZjFmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTIyMTQsOSArMjIxNCw4IEBA IHZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldENhY2hlU3RvcmFnZVBhcmFtZXRlcnMoUEFMOjpTZXNz aW9uSUQgc2Vzc2lvbklELCBTdHJpbmcmCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwcmVjb25uZWN0 VG8oY29uc3QgVVJMJiB1cmwsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5IHN0b3Jl ZENyZWRlbnRpYWxzUG9saWN5KQogewogI2lmIEVOQUJMRShTRVJWRVJfUFJFQ09OTkVDVCkKLSAg ICBOZXR3b3JrTG9hZFBhcmFtZXRlcnMgcGFyYW1ldGVyczsKKyAgICBOZXR3b3JrTG9hZFBhcmFt ZXRlcnMgcGFyYW1ldGVycyB7IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkgfTsK ICAgICBwYXJhbWV0ZXJzLnJlcXVlc3QgPSBSZXNvdXJjZVJlcXVlc3QgeyB1cmwgfTsKLSAgICBw YXJhbWV0ZXJzLnNlc3Npb25JRCA9IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7 CiAgICAgcGFyYW1ldGVycy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSA9IHN0b3JlZENyZWRlbnRp YWxzUG9saWN5OwogICAgIHBhcmFtZXRlcnMuc2hvdWxkUHJlY29ubmVjdE9ubHkgPSBQcmVjb25u ZWN0T25seTo6WWVzOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCmluZGV4IGJmOGEwYTY4 ZDczYmEyNGZkZjNjMTUwOGVjN2RiMGQxNWRlNDE3YmQuLjRiZjJhYzBiMWU4MzAwYzZmMzQ0ZGQz NjMwNTFlMzYzNzZhMjUwOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCkBAIC0zMywx MSArMzMsMTEgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIHZvaWQgTmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7 CisgICAgZW5jb2RlciA8PCBzZXNzaW9uSUQ7CiAgICAgZW5jb2RlciA8PCBpZGVudGlmaWVyOwog ICAgIGVuY29kZXIgPDwgd2ViUGFnZUlEOwogICAgIGVuY29kZXIgPDwgd2ViRnJhbWVJRDsKICAg ICBlbmNvZGVyIDw8IHBhcmVudFBJRDsKLSAgICBlbmNvZGVyIDw8IHNlc3Npb25JRDsKICAgICBl bmNvZGVyIDw8IHJlcXVlc3Q7CiAKICAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KHJl cXVlc3QuaHR0cEJvZHkoKSk7CkBAIC0xMDMsNDMgKzEwMyw0OCBAQCB2b2lkIE5ldHdvcmtSZXNv dXJjZUxvYWRQYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAog I2VuZGlmCiB9CiAKLWJvb2wgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZShJ UEM6OkRlY29kZXImIGRlY29kZXIsIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiByZXN1 bHQpCitPcHRpb25hbDxOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycz4gTmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIpCiB7CisgICAg T3B0aW9uYWw8UEFMOjpTZXNzaW9uSUQ+IHNlc3Npb25JRDsKKyAgICBkZWNvZGVyID4+IHNlc3Np b25JRDsKKworICAgIGlmICghc2Vzc2lvbklEKQorICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0 OworCisgICAgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgcmVzdWx0IHsgKnNlc3Npb25J RCB9OworCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaWRlbnRpZmllcikpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgIE9w dGlvbmFsPFBhZ2VJZGVudGlmaWVyPiB3ZWJQYWdlSUQ7CiAgICAgZGVjb2RlciA+PiB3ZWJQYWdl SUQ7CiAgICAgaWYgKCF3ZWJQYWdlSUQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg cmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICByZXN1bHQud2ViUGFnZUlEID0gKndlYlBhZ2VJRDsK IAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LndlYkZyYW1lSUQpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHJlc3VsdC5wYXJlbnRQSUQpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zZXNzaW9uSUQpKQotICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHJlc3VsdC5yZXF1ZXN0KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgYm9vbCBoYXNIVFRQQm9keTsKICAgICBpZiAo IWRlY29kZXIuZGVjb2RlKGhhc0hUVFBCb2R5KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgaWYgKGhhc0hUVFBCb2R5KSB7CiAgICAg ICAgIFJlZlB0cjxGb3JtRGF0YT4gZm9ybURhdGEgPSBGb3JtRGF0YTo6ZGVjb2RlKGRlY29kZXIp OwogICAgICAgICBpZiAoIWZvcm1EYXRhKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICAgICAgcmVzdWx0LnJlcXVlc3Quc2V0 SFRUUEJvZHkoV1RGTW92ZShmb3JtRGF0YSkpOwogCiAgICAgICAgIE9wdGlvbmFsPFNhbmRib3hF eHRlbnNpb246OkhhbmRsZUFycmF5PiByZXF1ZXN0Qm9keVNhbmRib3hFeHRlbnNpb25IYW5kbGVz OwogICAgICAgICBkZWNvZGVyID4+IHJlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lvbkhhbmRsZXM7 CiAgICAgICAgIGlmICghcmVxdWVzdEJvZHlTYW5kYm94RXh0ZW5zaW9uSGFuZGxlcykKLSAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAg ICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcmVxdWVzdEJvZHlTYW5kYm94RXh0ZW5zaW9u SGFuZGxlcy0+c2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgIGlmIChhdXRvIGV4dGVuc2lvbiA9 IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZNb3ZlKHJlcXVlc3RCb2R5U2FuZGJveEV4dGVu c2lvbkhhbmRsZXMtPmF0KGkpKSkpCiAgICAgICAgICAgICAgICAgcmVzdWx0LnJlcXVlc3RCb2R5 U2FuZGJveEV4dGVuc2lvbnMuYXBwZW5kKFdURk1vdmUoZXh0ZW5zaW9uKSk7CkBAIC0xNTAsODcg KzE1NSw4NyBAQCBib29sIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUoSVBD OjpEZWNvZGVyJiBkZWNvZGVyLCBOZXR3b3JrUmVzb3VyYwogICAgICAgICBPcHRpb25hbDxTYW5k Ym94RXh0ZW5zaW9uOjpIYW5kbGU+IHJlc291cmNlU2FuZGJveEV4dGVuc2lvbkhhbmRsZTsKICAg ICAgICAgZGVjb2RlciA+PiByZXNvdXJjZVNhbmRib3hFeHRlbnNpb25IYW5kbGU7CiAgICAgICAg IGlmICghcmVzb3VyY2VTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICAgICAgcmVzdWx0 LnJlc291cmNlU2FuZGJveEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZN b3ZlKCpyZXNvdXJjZVNhbmRib3hFeHRlbnNpb25IYW5kbGUpKTsKICAgICB9CiAKICAgICBpZiAo IWRlY29kZXIuZGVjb2RlRW51bShyZXN1bHQuY29udGVudFNuaWZmaW5nUG9saWN5KSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGVFbnVtKHJlc3VsdC5jb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGljeSkp Ci0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAg ICBpZiAoIWRlY29kZXIuZGVjb2RlRW51bShyZXN1bHQuc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kp KQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0ocmVzdWx0LmNsaWVudENyZWRlbnRpYWxQb2xpY3kp KQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0ocmVzdWx0LnNob3VsZFByZWNvbm5lY3RPbmx5KSkK LSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAg IGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9I VFRQUmVkaXJlY3QpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubmVlZHNDZXJ0aWZpY2F0 ZUluZm8pKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxv cHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaXNNYWluRnJhbWVOYXZpZ2F0aW9u KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0Owog ICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmlzTWFpblJlc291cmNlTmF2aWdhdGlvbkZv ckFueUZyYW1lKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1heGltdW1CdWZmZXJpbmdU aW1lKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0 OwogCiAgICAgYm9vbCBoYXNTb3VyY2VPcmlnaW47CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZSho YXNTb3VyY2VPcmlnaW4pKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CiAgICAgaWYgKGhhc1NvdXJjZU9yaWdpbikgewogICAgICAgICByZXN1bHQu c291cmNlT3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmRlY29kZShkZWNvZGVyKTsKICAgICAgICAg aWYgKCFyZXN1bHQuc291cmNlT3JpZ2luKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICB9CiAKICAgICBPcHRpb25hbDxGZXRj aE9wdGlvbnM+IG9wdGlvbnM7CiAgICAgZGVjb2RlciA+PiBvcHRpb25zOwogICAgIGlmICghb3B0 aW9ucykKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0 OwogICAgIHJlc3VsdC5vcHRpb25zID0gKm9wdGlvbnM7CiAKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5jc3BSZXNwb25zZUhlYWRlcnMpKQotICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1 bHQub3JpZ2luYWxSZXF1ZXN0SGVhZGVycykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgIE9wdGlvbmFsPGJvb2w+IHNob3VsZFJlc3Ry aWN0SFRUUFJlc3BvbnNlQWNjZXNzOwogICAgIGRlY29kZXIgPj4gc2hvdWxkUmVzdHJpY3RIVFRQ UmVzcG9uc2VBY2Nlc3M7CiAgICAgaWYgKCFzaG91bGRSZXN0cmljdEhUVFBSZXNwb25zZUFjY2Vz cykKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0Owog ICAgIHJlc3VsdC5zaG91bGRSZXN0cmljdEhUVFBSZXNwb25zZUFjY2VzcyA9ICpzaG91bGRSZXN0 cmljdEhUVFBSZXNwb25zZUFjY2VzczsKIAogICAgIGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHJl c3VsdC5wcmVmbGlnaHRQb2xpY3kpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBPcHRpb25hbDxib29sPiBzaG91bGRFbmFibGVDcm9z c09yaWdpblJlc291cmNlUG9saWN5OwogICAgIGRlY29kZXIgPj4gc2hvdWxkRW5hYmxlQ3Jvc3NP cmlnaW5SZXNvdXJjZVBvbGljeTsKICAgICBpZiAoIXNob3VsZEVuYWJsZUNyb3NzT3JpZ2luUmVz b3VyY2VQb2xpY3kpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIFdURjo6 bnVsbG9wdDsKICAgICByZXN1bHQuc2hvdWxkRW5hYmxlQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGlj eSA9ICpzaG91bGRFbmFibGVDcm9zc09yaWdpblJlc291cmNlUG9saWN5OwogCiAgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShyZXN1bHQuZnJhbWVBbmNlc3Rvck9yaWdpbnMpKQotICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBPcHRpb25hbDxi b29sPiBpc0hUVFBTVXBncmFkZUVuYWJsZWQ7CiAgICAgZGVjb2RlciA+PiBpc0hUVFBTVXBncmFk ZUVuYWJsZWQ7CiAgICAgaWYgKCFpc0hUVFBTVXBncmFkZUVuYWJsZWQpCi0gICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICByZXN1bHQuaXNIVFRQ U1VwZ3JhZGVFbmFibGVkID0gKmlzSFRUUFNVcGdyYWRlRW5hYmxlZDsKICAgICAKICNpZiBFTkFC TEUoQ09OVEVOVF9FWFRFTlNJT05TKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1h aW5Eb2N1bWVudFVSTCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIFdU Rjo6bnVsbG9wdDsKIAogICAgIE9wdGlvbmFsPE9wdGlvbmFsPFVzZXJDb250ZW50Q29udHJvbGxl cklkZW50aWZpZXI+PiB1c2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyOwogICAgIGRlY29k ZXIgPj4gdXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllcjsKICAgICBpZiAoIXVzZXJDb250 ZW50Q29udHJvbGxlcklkZW50aWZpZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg cmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICByZXN1bHQudXNlckNvbnRlbnRDb250cm9sbGVySWRl bnRpZmllciA9ICp1c2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyOwogI2VuZGlmCiAKLSAg ICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gcmVzdWx0OwogfQogICAgIAogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKaW5kZXggYjA1ZmY4MDNmMTcxOTBhZGUz MTljZGEwNjNkYTAzMTQwNmU0ZjM3Ni4uZmNjOGJmNTU1MzdlYWRmYWRjNjEyZGFlNzllNGI4NWVh MWE0NTE0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaApAQCAtNDQsOCArNDQsMTMgQEAgdHlw ZWRlZiB1aW50NjRfdCBSZXNvdXJjZUxvYWRJZGVudGlmaWVyOwogCiBjbGFzcyBOZXR3b3JrUmVz b3VyY2VMb2FkUGFyYW1ldGVycyA6IHB1YmxpYyBOZXR3b3JrTG9hZFBhcmFtZXRlcnMgewogcHVi bGljOgorICAgIGV4cGxpY2l0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzKFBBTDo6U2Vz c2lvbklEIHNlc3Npb25JRCkKKyAgICAgICAgOiBOZXR3b3JrTG9hZFBhcmFtZXRlcnMoc2Vzc2lv bklEKQorICAgIHsKKyAgICB9CisKICAgICB2b2lkIGVuY29kZShJUEM6OkVuY29kZXImKSBjb25z dDsKLSAgICBzdGF0aWMgYm9vbCBkZWNvZGUoSVBDOjpEZWNvZGVyJiwgTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnMmKTsKKyAgICBzdGF0aWMgT3B0aW9uYWw8TmV0d29ya1Jlc291cmNlTG9h ZFBhcmFtZXRlcnM+IGRlY29kZShJUEM6OkRlY29kZXImKTsKIAogICAgIFJlc291cmNlTG9hZElk ZW50aWZpZXIgaWRlbnRpZmllciB7IDAgfTsKICAgICBWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRl bnNpb24+PiByZXF1ZXN0Qm9keVNhbmRib3hFeHRlbnNpb25zOyAvLyBDcmVhdGVkIGF1dG9tYXRp Y2FsbHkgZm9yIHRoZSBzZW5kZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAK aW5kZXggZTdmYzViODkzMjJiOTkxYzcwOWQwNjhiZTJkZTc3NzM4M2NiNGJjMC4uOTRiNjA2OGEw ZGZlZDc0MmZhZmZkZTU3Njg4NzA1YWU3YTQ2MjAxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3Vs YXRpdmVMb2FkLmNwcApAQCAtNTIsMTAgKzUyLDkgQEAgU3BlY3VsYXRpdmVMb2FkOjpTcGVjdWxh dGl2ZUxvYWQoQ2FjaGUmIGNhY2hlLCBjb25zdCBHbG9iYWxGcmFtZUlEJiBnbG9iYWxGcmFtZUkK IHsKICAgICBBU1NFUlQoIW1fY2FjaGVFbnRyeSB8fCBtX2NhY2hlRW50cnktPm5lZWRzVmFsaWRh dGlvbigpKTsKIAotICAgIE5ldHdvcmtMb2FkUGFyYW1ldGVycyBwYXJhbWV0ZXJzOworICAgIE5l dHdvcmtMb2FkUGFyYW1ldGVycyBwYXJhbWV0ZXJzIHsgUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRT ZXNzaW9uSUQoKSB9OwogICAgIHBhcmFtZXRlcnMud2ViUGFnZUlEID0gZ2xvYmFsRnJhbWVJRC5m aXJzdDsKICAgICBwYXJhbWV0ZXJzLndlYkZyYW1lSUQgPSBnbG9iYWxGcmFtZUlELnNlY29uZDsK LSAgICBwYXJhbWV0ZXJzLnNlc3Npb25JRCA9IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lv bklEKCk7CiAgICAgcGFyYW1ldGVycy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSA9IFN0b3JlZENy ZWRlbnRpYWxzUG9saWN5OjpVc2U7CiAgICAgcGFyYW1ldGVycy5jb250ZW50U25pZmZpbmdQb2xp Y3kgPSBDb250ZW50U25pZmZpbmdQb2xpY3k6OkRvTm90U25pZmZDb250ZW50OwogICAgIHBhcmFt ZXRlcnMuY29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3kgPSBDb250ZW50RW5jb2RpbmdTbmlm ZmluZ1BvbGljeTo6U25pZmY7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv TmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv TmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggNTAyNjk1NDdiOTk1ZGYyNTg2M2Ew Y2Q5NDJjYzI5NWM4NzAzYmZkNi4uYzQ4Y2RkODU3OTRkOTIxNjk5NTIwYzJkODM4YTViNjcwZjNi MmZmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9h ZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtMjY2LDEyICsyNjYsMTEgQEAgdm9pZCBXZWJMb2FkZXJT dHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiBy ZXNvdXJjZUwKICAgICBDb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGljeSBjb250ZW50RW5jb2Rp bmdTbmlmZmluZ1BvbGljeSA9IHJlc291cmNlTG9hZGVyLnNob3VsZFNuaWZmQ29udGVudEVuY29k aW5nKCkgPyBDb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGljeTo6U25pZmYgOiBDb250ZW50RW5j b2RpbmdTbmlmZmluZ1BvbGljeTo6RG9Ob3RTbmlmZjsKICAgICBTdG9yZWRDcmVkZW50aWFsc1Bv bGljeSBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSA9IHJlc291cmNlTG9hZGVyLnNob3VsZFVzZUNy ZWRlbnRpYWxTdG9yYWdlKCkgPyBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlIDogU3RvcmVk Q3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlOwogCi0gICAgTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7CisgICAgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRl cnMgbG9hZFBhcmFtZXRlcnMgeyBzZXNzaW9uSUQgfTsKICAgICBsb2FkUGFyYW1ldGVycy5pZGVu dGlmaWVyID0gaWRlbnRpZmllcjsKICAgICBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQgPSB0cmFj a2luZ1BhcmFtZXRlcnMucGFnZUlEOwogICAgIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQgPSB0 cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRDsKICAgICBsb2FkUGFyYW1ldGVycy5wYXJlbnRQSUQg PSBwcmVzZW50aW5nQXBwbGljYXRpb25QSUQoKTsKLSAgICBsb2FkUGFyYW1ldGVycy5zZXNzaW9u SUQgPSBzZXNzaW9uSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMucmVxdWVzdCA9IHJlcXVlc3Q7CiAg ICAgbG9hZFBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID0gY29udGVudFNuaWZmaW5n UG9saWN5OwogICAgIGxvYWRQYXJhbWV0ZXJzLmNvbnRlbnRFbmNvZGluZ1NuaWZmaW5nUG9saWN5 ID0gY29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3k7CkBAIC01MzksMTIgKzUzOCwxMSBAQCB2 b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KEZyYW1lTG9h ZGVyJiBmcmFtZUxvYWRlciwgdW5zaQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgTmV0 d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7CisgICAgTmV0d29ya1Jl c291cmNlTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnMgeyBzZXNzaW9uSUQgfTsKICAgICBs b2FkUGFyYW1ldGVycy5pZGVudGlmaWVyID0gcmVzb3VyY2VMb2FkSWRlbnRpZmllcjsKICAgICBs b2FkUGFyYW1ldGVycy53ZWJQYWdlSUQgPSBwYWdlSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMud2Vi RnJhbWVJRCA9IGZyYW1lSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMucGFyZW50UElEID0gcHJlc2Vu dGluZ0FwcGxpY2F0aW9uUElEKCk7Ci0gICAgbG9hZFBhcmFtZXRlcnMuc2Vzc2lvbklEID0gc2Vz c2lvbklEOwogICAgIGxvYWRQYXJhbWV0ZXJzLnJlcXVlc3QgPSByZXF1ZXN0OwogICAgIGxvYWRQ YXJhbWV0ZXJzLmNvbnRlbnRTbmlmZmluZ1BvbGljeSA9IENvbnRlbnRTbmlmZmluZ1BvbGljeTo6 U25pZmZDb250ZW50OwogICAgIGxvYWRQYXJhbWV0ZXJzLmNvbnRlbnRFbmNvZGluZ1NuaWZmaW5n UG9saWN5ID0gQ29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3k6OlNuaWZmOwpAQCAtNjA3LDEy ICs2MDUsMTEgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c3RhcnRQaW5nTG9hZChGcmFtZSYg ZnJhbWUsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY28KICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzOwor ICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzIHsgZnJhbWUu cGFnZSgpID8gZnJhbWUucGFnZSgpLT5zZXNzaW9uSUQoKSA6IFBBTDo6U2Vzc2lvbklEOjpkZWZh dWx0U2Vzc2lvbklEKCkgfTsKICAgICBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyID0gZ2VuZXJh dGVMb2FkSWRlbnRpZmllcigpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnJlcXVlc3QgPSByZXF1ZXN0 OwogICAgIGxvYWRQYXJhbWV0ZXJzLnNvdXJjZU9yaWdpbiA9ICZkb2N1bWVudC0+c2VjdXJpdHlP cmlnaW4oKTsKICAgICBsb2FkUGFyYW1ldGVycy5wYXJlbnRQSUQgPSBwcmVzZW50aW5nQXBwbGlj YXRpb25QSUQoKTsKLSAgICBsb2FkUGFyYW1ldGVycy5zZXNzaW9uSUQgPSBmcmFtZS5wYWdlKCkg PyBmcmFtZS5wYWdlKCktPnNlc3Npb25JRCgpIDogUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNz aW9uSUQoKTsKICAgICBsb2FkUGFyYW1ldGVycy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSA9IG9w dGlvbnMuY3JlZGVudGlhbHMgPT0gRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFsczo6T21pdCA/IFN0 b3JlZENyZWRlbnRpYWxzUG9saWN5OjpEb05vdFVzZSA6IFN0b3JlZENyZWRlbnRpYWxzUG9saWN5 OjpVc2U7CiAgICAgbG9hZFBhcmFtZXRlcnMub3B0aW9ucyA9IG9wdGlvbnM7CiAgICAgbG9hZFBh cmFtZXRlcnMub3JpZ2luYWxSZXF1ZXN0SGVhZGVycyA9IG9yaWdpbmFsUmVxdWVzdEhlYWRlcnM7 CkBAIC02NjcsMTIgKzY2NCwxMSBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0 VG8oRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyLCBjb25zdCBVUkwmIHVybCwgUwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgcGFyYW1l dGVyczsKKyAgICBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyBwYXJhbWV0ZXJzIHsgd2Vi UGFnZS0+c2Vzc2lvbklEKCkgfTsKICAgICBwYXJhbWV0ZXJzLnJlcXVlc3QgPSBSZXNvdXJjZVJl cXVlc3QgeyB1cmwgfTsKICAgICBwYXJhbWV0ZXJzLndlYlBhZ2VJRCA9IHdlYlBhZ2UtPnBhZ2VJ RCgpOwogICAgIHBhcmFtZXRlcnMud2ViRnJhbWVJRCA9IHdlYkZyYW1lLT5mcmFtZUlEKCk7CiAg ICAgcGFyYW1ldGVycy5wYXJlbnRQSUQgPSBwcmVzZW50aW5nQXBwbGljYXRpb25QSUQoKTsKLSAg ICBwYXJhbWV0ZXJzLnNlc3Npb25JRCA9IHdlYlBhZ2UtPnNlc3Npb25JRCgpOwogICAgIHBhcmFt ZXRlcnMuc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgPSBzdG9yZWRDcmVkZW50aWFsc1BvbGljeTsK ICAgICBwYXJhbWV0ZXJzLnNob3VsZFByZWNvbm5lY3RPbmx5ID0gUHJlY29ubmVjdE9ubHk6Olll czsKICAgICBwYXJhbWV0ZXJzLnNob3VsZFJlc3RyaWN0SFRUUFJlc3BvbnNlQWNjZXNzID0gc2hv dWxkUGVyZm9ybVNlY3VyaXR5Q2hlY2tzKCk7Cg==