198088 2019-05-21 15:10:32 -0700 Web Inspector: Overlay: rulers/guides should be shown whenever element selection is enabled 2019-05-23 18:37:38 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam timothy webkit-bug-importer oldest_to_newest 1538007 0 hi 2019-05-21 15:10:32 -0700 This would be especially useful when element selection is started from the develop menu (⇧⌘C), instead of from the Web Inspector UI. 1538567 1 370488 hi 2019-05-22 22:36:56 -0700 Created attachment 370488 Patch 1538689 2 timothy 2019-05-23 10:45:14 -0700 I'm on the fence about this. If a developer hates rulers, they would be turned off by this. Maybe a setting in in order for this behavior? 1538858 3 370535 hi 2019-05-23 17:52:25 -0700 Created attachment 370535 Patch Added a setting that is enabled by default :) 1538859 4 370536 hi 2019-05-23 18:06:20 -0700 Created attachment 370536 Patch Rebase 1538860 5 ews-watchlist 2019-05-23 18:08:30 -0700 This patch modifies the inspector protocol. Please ensure that any frontend changes appropriately use feature checks for new protocol features. 1538872 6 370536 commit-queue 2019-05-23 18:34:38 -0700 Comment on attachment 370536 Patch Clearing flags on attachment: 370536 Committed r245730: <https://trac.webkit.org/changeset/245730> 1538873 7 commit-queue 2019-05-23 18:34:40 -0700 All reviewed patches have been landed. Closing bug. 1538877 8 webkit-bug-importer 2019-05-23 18:37:38 -0700 <rdar://problem/51091474> 370488 2019-05-22 22:36:56 -0700 2019-05-23 17:52:24 -0700 Patch bug-198088-20190522223655.patch text/plain 5457 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxODk1NWNmNTdkOWUyMjQwMzVjNTY1OGMwMjBiMTM1NmU0YjZhMGM2Li40 ZDg1NGEzMzY0MTg2NmYyYjNiYjMwNGYwMWQxNjBmZmFhNWJmYjE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzEgQEAKKzIwMTktMDUtMjIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE92ZXJsYXk6IHJ1bGVycy9ndWlkZXMgc2hvdWxk IGJlIHNob3duIHdoZW5ldmVyIGVsZW1lbnQgc2VsZWN0aW9uIGlzIGVuYWJsZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODA4OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdHJ5aW5nIHRvICJt ZWFzdXJlIiB0aGUgYWJzb2x1dGUgcG9zaXRpb24gKHRvIHRoZSB2aWV3cG9ydCkgb3IgcmVsYXRp dmUgcG9zaXRpb24gKHRvCisgICAgICAgIGFub3RoZXIgZWxlbWVudCkgb2YgYSBnaXZlbiBlbGVt ZW50LCBvZnRlbiB0aGUgZWFzaWVzdCB3YXkgaXMgdG8gZW5hYmxlIEVsZW1lbnQgU2VsZWN0aW9u CisgICAgICAgIGFuZCBTaG93IFJ1bGVycyBhdCB0aGUgc2FtZSB0aW1lLgorCisgICAgICAgIFRo aXMgY2FuIGhhdmUgdGhlIHVuZGVzaXJlZCAic2lkZS1lZmZlY3QiIG9mIGhhdmluZyB0aGUgcnVs ZXJzIGJlIGFsd2F5cyBwcmVzZW50LCBldmVuIHdoZW4KKyAgICAgICAgbm90IGhpZ2hsaWdodGlu ZyBhbnkgbm9kZXMuCisKKyAgICAgICAgVGhlIGlkZWFsIGZ1bmN0aW9uYWxpdHkgaXMgdGhhdCB0 aGUgU2hvdyBSdWxlcnMgdG9nZ2xlIGNoYW5nZXMgd2hldGhlciB0aGUgb3ZlcmxheSBydWxlcnMK KyAgICAgICAgYXJlIGFsd2F5cyBzaG93biwgYnV0IHRoZXkgYXJlIHNob3duIHJlZ2FyZGxlc3Mg d2hlbiBpbiBlbGVtZW50IHNlbGVjdGlvbi4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JPdmVybGF5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6cGFpbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6ZGlkU2V0U2VhcmNoaW5nRm9yTm9kZSk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpkcmF3Tm9kZUhpZ2hsaWdodCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpkcmF3UXVhZEhpZ2hsaWdodCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpkcmF3RWxlbWVudFRpdGxlKToKKworICAgICAg ICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnNldFNlYXJjaGluZ0Zvck5vZGUpOgorCiAyMDE5LTA1 LTIyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBTdWJzZWxl Y3RvcnMgbm90IHNlYXJjaGVkIHdoZW4gZGV0ZXJtaW5pbmcgcHJvcGVydHkgd2hpdGVsaXN0IGZv ciBzZWxlY3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ck92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXku Y3BwCmluZGV4IGMxYmI1NWFiM2U3YjE0OGUyNzIxMjA1OGM2ZTY5MWI4N2U0OGRiOWUuLmQ0NDQx YjZmMjkxMTlkN2E2ZWY5ZmUxYTViN2U0MGU0YTFmZmQ4ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKQEAgLTQwMyw3ICs0MDMsNyBAQCB2b2lk IEluc3BlY3Rvck92ZXJsYXk6OnBhaW50KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKICAgICBp ZiAoIW1fcGFpbnRSZWN0cy5pc0VtcHR5KCkpCiAgICAgICAgIGRyYXdQYWludFJlY3RzKGNvbnRl eHQsIG1fcGFpbnRSZWN0cyk7CiAKLSAgICBpZiAobV9zaG93UnVsZXJzKQorICAgIGlmIChtX3No b3dSdWxlcnMgfHwgbV9zZWFyY2hpbmdGb3JOb2RlKQogICAgICAgICBkcmF3UnVsZXJzKGNvbnRl eHQpOwogfQogCkBAIC00NjksNiArNDY5LDggQEAgTm9kZSogSW5zcGVjdG9yT3ZlcmxheTo6aGln aGxpZ2h0ZWROb2RlKCkgY29uc3QKIAogdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpkaWRTZXRTZWFy Y2hpbmdGb3JOb2RlKGJvb2wgZW5hYmxlZCkKIHsKKyAgICBtX3NlYXJjaGluZ0Zvck5vZGUgPSBl bmFibGVkOworCiAgICAgbV9jbGllbnQtPmRpZFNldFNlYXJjaGluZ0Zvck5vZGUoZW5hYmxlZCk7 CiB9CiAKQEAgLTU2OSw3ICs1NzEsNyBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdOb2Rl SGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgTm9kZSYgbm9kZSkKICAgICBpZiAo bV9ub2RlSGlnaGxpZ2h0Q29uZmlnLnNob3dJbmZvKQogICAgICAgICBkcmF3U2hhcGVIaWdobGln aHQoY29udGV4dCwgbm9kZSwgYm91bmRzKTsKIAotICAgIGlmIChtX3Nob3dSdWxlcnMpCisgICAg aWYgKG1fc2hvd1J1bGVycyB8fCBtX3NlYXJjaGluZ0Zvck5vZGUpCiAgICAgICAgIGRyYXdCb3Vu ZHMoY29udGV4dCwgYm91bmRzKTsKIAogICAgIC8vIEVuc3VyZSB0aGF0IHRoZSB0aXRsZSBpbmZv cm1hdGlvbiBpcyBkcmF3biBhZnRlciB0aGUgYm91bmRzLgpAQCAtNTg3LDcgKzU4OSw3IEBAIHZv aWQgSW5zcGVjdG9yT3ZlcmxheTo6ZHJhd1F1YWRIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiBj b250ZXh0LCBjb25zdCBGbG9hdFF1CiAKICAgICAgICAgZHJhd091dGxpbmVkUXVhZChjb250ZXh0 LCBoaWdobGlnaHQucXVhZHNbMF0sIGhpZ2hsaWdodC5jb250ZW50Q29sb3IsIGhpZ2hsaWdodC5j b250ZW50T3V0bGluZUNvbG9yLCBib3VuZHMpOwogCi0gICAgICAgIGlmIChtX3Nob3dSdWxlcnMp CisgICAgICAgIGlmIChtX3Nob3dSdWxlcnMgfHwgbV9zZWFyY2hpbmdGb3JOb2RlKQogICAgICAg ICAgICAgZHJhd0JvdW5kcyhjb250ZXh0LCBib3VuZHMpOwogICAgIH0KIH0KQEAgLTg5NSw3ICs4 OTcsNyBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdFbGVtZW50VGl0bGUoR3JhcGhpY3ND b250ZXh0JiBjb250ZXh0LCBOb2RlJiBub2RlLCBjbwogCiAgICAgRmxvYXRTaXplIGNvbnRlbnRJ bnNldCgwLCBwYWdlVmlldy0+dG9wQ29udGVudEluc2V0KFNjcm9sbFZpZXc6OlRvcENvbnRlbnRJ bnNldFR5cGU6OldlYkNvcmVPclBsYXRmb3JtQ29udGVudEluc2V0KSk7CiAgICAgY29udGVudElu c2V0LmV4cGFuZChlbGVtZW50RGF0YVNwYWNpbmcsIGVsZW1lbnREYXRhU3BhY2luZyk7Ci0gICAg aWYgKG1fc2hvd1J1bGVycykKKyAgICBpZiAobV9zaG93UnVsZXJzIHx8IG1fc2VhcmNoaW5nRm9y Tm9kZSkKICAgICAgICAgY29udGVudEluc2V0LmV4cGFuZChydWxlclNpemUsIHJ1bGVyU2l6ZSk7 CiAKICAgICBmbG9hdCBhbmNob3JUb3AgPSBib3VuZHMueSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmgKaW5kZXggZTVjZWExMThlODVkMGRiZGVlMmJmOWI3 MmQ1NTNiZDkyM2Y3Njk2ZC4uMmQ1NjY4Y2RmNGQ4ZTA4ZjM2NmRlOGZjZmQ4YzFjZDkxODM1NjJj YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXku aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oCkBAIC0x NDgsOSArMTQ4LDEwIEBAIHByaXZhdGU6CiAgICAgRGVxdWU8VGltZVJlY3RQYWlyPiBtX3BhaW50 UmVjdHM7CiAgICAgVGltZXIgbV9wYWludFJlY3RVcGRhdGVUaW1lcjsKIAotICAgIGJvb2wgbV9p bmRpY2F0aW5nIHtmYWxzZX07Ci0gICAgYm9vbCBtX3Nob3dQYWludFJlY3RzIHtmYWxzZX07Ci0g ICAgYm9vbCBtX3Nob3dSdWxlcnMge2ZhbHNlfTsKKyAgICBib29sIG1faW5kaWNhdGluZyB7IGZh bHNlIH07CisgICAgYm9vbCBtX3NlYXJjaGluZ0Zvck5vZGUgeyBmYWxzZSB9OworICAgIGJvb2wg bV9zaG93UGFpbnRSZWN0cyB7IGZhbHNlIH07CisgICAgYm9vbCBtX3Nob3dSdWxlcnMgeyBmYWxz ZSB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBmMzQ1ZjE1 YjdhZTViZjZjYzQ1ODIzYWRkMjllNGI2N2U0YWM2NzAwLi4zZDRmNTNkOTBhMDZmOWQ0OTQ0ZjI4 NmRkODJjYjQzNWVlN2UxYzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMTE1NCw3ICsxMTU0LDkgQEAgdm9p ZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9yTm9kZShFcnJvclN0cmluZyYgZXJy b3JTdHJpbmcsIGJvb2wgZW5hYmwKIAogICAgIG1fc2VhcmNoaW5nRm9yTm9kZSA9IGVuYWJsZWQ7 CiAKLSAgICBpZiAoZW5hYmxlZCkgeworICAgIG1fb3ZlcmxheS0+ZGlkU2V0U2VhcmNoaW5nRm9y Tm9kZShtX3NlYXJjaGluZ0Zvck5vZGUpOworCisgICAgaWYgKG1fc2VhcmNoaW5nRm9yTm9kZSkg ewogICAgICAgICBtX2luc3BlY3RNb2RlSGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29uZmln RnJvbUluc3BlY3Rvck9iamVjdChlcnJvclN0cmluZywgaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0 KTsKICAgICAgICAgaWYgKCFtX2luc3BlY3RNb2RlSGlnaGxpZ2h0Q29uZmlnKQogICAgICAgICAg ICAgcmV0dXJuOwpAQCAtMTE2Miw4ICsxMTY0LDYgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6 c2V0U2VhcmNoaW5nRm9yTm9kZShFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGJvb2wgZW5hYmwK ICAgICB9IGVsc2UKICAgICAgICAgaGlkZUhpZ2hsaWdodChlcnJvclN0cmluZyk7CiAKLSAgICBt X292ZXJsYXktPmRpZFNldFNlYXJjaGluZ0Zvck5vZGUobV9zZWFyY2hpbmdGb3JOb2RlKTsKLQog ICAgIGlmIChJbnNwZWN0b3JDbGllbnQqIGNsaWVudCA9IG1faW5zcGVjdGVkUGFnZS5pbnNwZWN0 b3JDb250cm9sbGVyKCkuaW5zcGVjdG9yQ2xpZW50KCkpCiAgICAgICAgIGNsaWVudC0+ZWxlbWVu dFNlbGVjdGlvbkNoYW5nZWQobV9zZWFyY2hpbmdGb3JOb2RlKTsKIH0K 370535 2019-05-23 17:52:25 -0700 2019-05-23 18:06:19 -0700 Patch bug-198088-20190523175224.patch text/plain 19054 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDVjNjk1NGJiNzliMDI2NGQ0YjAyYTU5ZTFlOGY1 YTZjOTExMjdjODUuLjVlYmNlNDVkY2E1NTYwODM3Y2Y5N2FjMDAzM2M3MjRjOTg5YTEwYmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA1LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBP dmVybGF5OiBydWxlcnMvZ3VpZGVzIHNob3VsZCBiZSBzaG93biB3aGVuZXZlciBlbGVtZW50IHNl bGVjdGlvbiBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTgwODgKKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIu CisKKyAgICAgICAgV2hlbiB0cnlpbmcgdG8gIm1lYXN1cmUiIHRoZSBhYnNvbHV0ZSBwb3NpdGlv biAodG8gdGhlIHZpZXdwb3J0KSBvciByZWxhdGl2ZSBwb3NpdGlvbiAodG8KKyAgICAgICAgYW5v dGhlciBlbGVtZW50KSBvZiBhIGdpdmVuIGVsZW1lbnQsIG9mdGVuIHRoZSBlYXNpZXN0IHdheSBp cyB0byBlbmFibGUgRWxlbWVudCBTZWxlY3Rpb24KKyAgICAgICAgYW5kIFNob3cgUnVsZXJzIGF0 IHRoZSBzYW1lIHRpbWUuCisKKyAgICAgICAgVGhpcyBjYW4gaGF2ZSB0aGUgdW5kZXNpcmVkICJz aWRlLWVmZmVjdCIgb2YgaGF2aW5nIHRoZSBydWxlcnMgYmUgYWx3YXlzIHByZXNlbnQsIGV2ZW4g d2hlbgorICAgICAgICBub3QgaGlnaGxpZ2h0aW5nIGFueSBub2Rlcy4KKworICAgICAgICBUaGUg aWRlYWwgZnVuY3Rpb25hbGl0eSBpcyB0byBhbGxvdyB0aGUgcnVsZXJzL2d1aWRlcyB0byBiZSBz aG93biB3aGVuIGVsZW1lbnQgc2VsZWN0aW9uIGlzCisgICAgICAgIGFjdGl2ZSBhbmQgYSBub2Rl IGlzIGhvdmVyZWQsIHJlZ2FyZGxlc3Mgb2Ygd2hldGhlciAiU2hvdyBSdWxlcnMiIGlzIGVuYWJs ZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb246CisgICAgICAgIEFk ZCBhbiBvcHRpb25hbCBgc2hvd1J1bGVyc2AgcGFyYW1ldGVyIHRvIGBET00uc2V0SW5zcGVjdE1v ZGVFbmFibGVkYCB0aGF0IHN1cGVyc2VkZXMgdGhlCisgICAgICAgIGN1cnJlbnQgdmFsdWUgb2Yg YFBhZ2Uuc2V0U2hvd1J1bGVyc2AgYXMgdG8gd2hldGhlciBydWxlcnMvZ3VpZGVzIGFyZSBzaG93 bi4KKwogMjAxOS0wNS0yMyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KIAog ICAgICAgICBERkc6Ok9TUkVudHJ5IHNob3VsZCBub3QgcGVyZm9ybSBhcml0eSBjaGVjawpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDVkMGU2ZWFjNmM1NjQ0ZDNkMjA1MTVlODliYWU3OTk4NGRhODQwN2UuLjZjNTky YWMxYWFiZTQzNjQxMzkyYTJiMTM5M2M5OWJmYzRmNDI2OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSw0MCBAQAorMjAxOS0wNS0yMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogT3ZlcmxheTogcnVsZXJzL2d1aWRlcyBzaG91bGQgYmUg c2hvd24gd2hlbmV2ZXIgZWxlbWVudCBzZWxlY3Rpb24gaXMgZW5hYmxlZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MDg4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgIFdoZW4gdHJ5aW5nIHRvICJtZWFz dXJlIiB0aGUgYWJzb2x1dGUgcG9zaXRpb24gKHRvIHRoZSB2aWV3cG9ydCkgb3IgcmVsYXRpdmUg cG9zaXRpb24gKHRvCisgICAgICAgIGFub3RoZXIgZWxlbWVudCkgb2YgYSBnaXZlbiBlbGVtZW50 LCBvZnRlbiB0aGUgZWFzaWVzdCB3YXkgaXMgdG8gZW5hYmxlIEVsZW1lbnQgU2VsZWN0aW9uCisg ICAgICAgIGFuZCBTaG93IFJ1bGVycyBhdCB0aGUgc2FtZSB0aW1lLgorCisgICAgICAgIFRoaXMg Y2FuIGhhdmUgdGhlIHVuZGVzaXJlZCAic2lkZS1lZmZlY3QiIG9mIGhhdmluZyB0aGUgcnVsZXJz IGJlIGFsd2F5cyBwcmVzZW50LCBldmVuIHdoZW4KKyAgICAgICAgbm90IGhpZ2hsaWdodGluZyBh bnkgbm9kZXMuCisKKyAgICAgICAgVGhlIGlkZWFsIGZ1bmN0aW9uYWxpdHkgaXMgdG8gYWxsb3cg dGhlIHJ1bGVycy9ndWlkZXMgdG8gYmUgc2hvd24gd2hlbiBlbGVtZW50IHNlbGVjdGlvbiBpcwor ICAgICAgICBhY3RpdmUgYW5kIGEgbm9kZSBpcyBob3ZlcmVkLCByZWdhcmRsZXNzIG9mIHdoZXRo ZXIgIlNob3cgUnVsZXJzIiBpcyBlbmFibGVkLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3Rvck92ZXJsYXkuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OnNldFNo b3dSdWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9uKTogQWRkZWQuCisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3Zl cmxheTo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6c2hvdWxk U2hvd092ZXJsYXkpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6ZHJhd05v ZGVIaWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6ZHJhd1F1 YWRIaWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6ZHJhd0Vs ZW1lbnRUaXRsZSk6CisgICAgICAgIElmIGBzaG93UnVsZXJzRHVyaW5nRWxlbWVudFNlbGVjdGlv bmAgaXMgZW5hYmxlZCwgZHJhdyBydWxlcnMgd2hlbmV2ZXIgYW55IGhpZ2hsaWdodCBib3VuZHMK KyAgICAgICAgYXJlIGNhbGN1bGF0ZWQsIGJ1dCBkb24ndCB1cGRhdGUgdGhlIG92ZXJsYXkgaWYg aXQncyB0aGUgb25seSB0aGluZyBlbmFibGVkIChlLmcuIGlmIHRoZXJlJ3MKKyAgICAgICAgbm8g Y3VycmVudGx5IGhvdmVyZWQgbm9kZSwgdGhlIG92ZXJsYXkgd2lsbCBkaXNhcHBlYXIpLgorCisg ICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6d2lsbERlc3Ryb3lGcm9udGVuZEFuZEJhY2tl bmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6Omluc3BlY3QpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnNldEluc3BlY3RNb2RlRW5hYmxlZCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9yTm9k ZSk6CisgICAgICAgIEFkZCBhbiBvcHRpb25hbCBgc2hvd1J1bGVyc2AgcGFyYW1ldGVyIHRvIGBE T00uc2V0SW5zcGVjdE1vZGVFbmFibGVkYCB0aGF0IHN1cGVyc2VkZXMgdGhlCisgICAgICAgIGN1 cnJlbnQgdmFsdWUgb2YgYFBhZ2Uuc2V0U2hvd1J1bGVyc2AgYXMgdG8gd2hldGhlciBydWxlcnMv Z3VpZGVzIGFyZSBzaG93bi4KKwogMjAxOS0wNS0yMyAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFw cGxlLmNvbT4KIAogICAgICAgICBbV0hMU0xdIERvbid0IHdyYXAgYW5vbnltb3VzIHZhcmlhYmxl cyBpbiBwYXJlbnMgaW4gdGhlIEFTVCBkdW1wZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4 IDgyMDViOTFiNjk0OTJhOTU4MWZhNTJkMmFkMTNjMmIxNGE5NGMwYzUuLjU5ZWI1MWJkNDcwOWM3 ZDFjMWI0MGFkYjQzYjk4NTNmNDBhNDE5MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMxIEBACisyMDE5LTA1LTIzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBPdmVybGF5OiBydWxlcnMvZ3VpZGVzIHNob3Vs ZCBiZSBzaG93biB3aGVuZXZlciBlbGVtZW50IHNlbGVjdGlvbiBpcyBlbmFibGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTgwODgKKworICAgICAg ICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgV2hlbiB0cnlpbmcgdG8g Im1lYXN1cmUiIHRoZSBhYnNvbHV0ZSBwb3NpdGlvbiAodG8gdGhlIHZpZXdwb3J0KSBvciByZWxh dGl2ZSBwb3NpdGlvbiAodG8KKyAgICAgICAgYW5vdGhlciBlbGVtZW50KSBvZiBhIGdpdmVuIGVs ZW1lbnQsIG9mdGVuIHRoZSBlYXNpZXN0IHdheSBpcyB0byBlbmFibGUgRWxlbWVudCBTZWxlY3Rp b24KKyAgICAgICAgYW5kIFNob3cgUnVsZXJzIGF0IHRoZSBzYW1lIHRpbWUuCisKKyAgICAgICAg VGhpcyBjYW4gaGF2ZSB0aGUgdW5kZXNpcmVkICJzaWRlLWVmZmVjdCIgb2YgaGF2aW5nIHRoZSBy dWxlcnMgYmUgYWx3YXlzIHByZXNlbnQsIGV2ZW4gd2hlbgorICAgICAgICBub3QgaGlnaGxpZ2h0 aW5nIGFueSBub2Rlcy4KKworICAgICAgICBUaGUgaWRlYWwgZnVuY3Rpb25hbGl0eSBpcyB0byBh bGxvdyB0aGUgcnVsZXJzL2d1aWRlcyB0byBiZSBzaG93biB3aGVuIGVsZW1lbnQgc2VsZWN0aW9u IGlzCisgICAgICAgIGFjdGl2ZSBhbmQgYSBub2RlIGlzIGhvdmVyZWQsIHJlZ2FyZGxlc3Mgb2Yg d2hldGhlciAiU2hvdyBSdWxlcnMiIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0Jhc2UvU2V0dGluZy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LnByb3RvdHlwZS5fY3JlYXRlR2VuZXJhbFNldHRpbmdzVmlldyk6CisgICAgICAgIEFkZCBhIHNl dHRpbmcgZm9yIGNvbnRyb2xsaW5nIHdoZXRoZXIgcnVsZXJzL2d1aWRlcyBhcmUgc2hvd24gZHVy aW5nIGVsZW1lbnQgc2VsZWN0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9s bGVycy9ET01NYW5hZ2VyLmpzOgorICAgICAgICAoV0kuRE9NTWFuYWdlci5wcm90b3R5cGUuc2V0 IGluc3BlY3RNb2RlRW5hYmxlZCk6CisgICAgICAgIFBhc3MgdGhlIHNldHRpbmcgdmFsdWUgYXMg YW4gb3B0aW9uYWwgcGFyYW1ldGVyIHdoZW4gY2FsbGluZyBgRE9NLnNldEluc3BlY3RNb2RlRW5h YmxlZGAuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanM6CisKIDIwMTktMDUtMjMgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSB1bnVzZWQgQ1NTIGNsYXNzICJvZmZzZXQt c2VjdGlvbnMiCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3By b3RvY29sL0RPTS5qc29uIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2Nv bC9ET00uanNvbgppbmRleCA3NzkxMGM5YjRjODJlZGI3NjBmZDkyNjQ2ZmRkNGY3MjcxMjExZDAw Li5iMzY3NGU3YTBmOGU2YjAyY2NlODg3NmM0ZDM3ZTUzZDQ0MjU5OTU4IDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RPTS5qc29uCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb24KQEAgLTQwMCw3 ICs0MDAsOCBAQAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkVudGVycyB0aGUgJ2luc3Bl Y3QnIG1vZGUuIEluIHRoaXMgbW9kZSwgZWxlbWVudHMgdGhhdCB1c2VyIGlzIGhvdmVyaW5nIG92 ZXIgYXJlIGhpZ2hsaWdodGVkLiBCYWNrZW5kIHRoZW4gZ2VuZXJhdGVzICdpbnNwZWN0JyBjb21t YW5kIHVwb24gZWxlbWVudCBzZWxlY3Rpb24uIiwKICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjog WwogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZW5hYmxlZCIsICJ0eXBlIjogImJvb2xlYW4i LCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSB0byBlbmFibGUgaW5zcGVjdGlvbiBtb2RlLCBmYWxzZSB0 byBkaXNhYmxlIGl0LiIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhpZ2hsaWdodENv bmZpZyIsICIkcmVmIjogIkhpZ2hsaWdodENvbmZpZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNj cmlwdGlvbiI6ICJBIGRlc2NyaXB0b3IgZm9yIHRoZSBoaWdobGlnaHQgYXBwZWFyYW5jZSBvZiBo b3ZlcmVkLW92ZXIgbm9kZXMuIE1heSBiZSBvbWl0dGVkIGlmIDxjb2RlPmVuYWJsZWQgPT0gZmFs c2U8L2NvZGU+LiIgfQorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaGlnaGxpZ2h0Q29uZmln IiwgIiRyZWYiOiAiSGlnaGxpZ2h0Q29uZmlnIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0 aW9uIjogIkEgZGVzY3JpcHRvciBmb3IgdGhlIGhpZ2hsaWdodCBhcHBlYXJhbmNlIG9mIGhvdmVy ZWQtb3ZlciBub2Rlcy4gTWF5IGJlIG9taXR0ZWQgaWYgPGNvZGU+ZW5hYmxlZCA9PSBmYWxzZTwv Y29kZT4uIiB9LAorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2hvd1J1bGVycyIsICJ0eXBl IjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiV2hldGhlciB0 aGUgcnVsZXJzIHNob3VsZCBiZSBzaG93biBkdXJpbmcgZWxlbWVudCBzZWxlY3Rpb24uIFRoaXMg b3ZlcnJpZGVzIFBhZ2Uuc2V0U2hvd1J1bGVycy4iIH0KICAgICAgICAgICAgIF0KICAgICAgICAg fSwKICAgICAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvck92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJs YXkuY3BwCmluZGV4IGMxYmI1NWFiM2U3YjE0OGUyNzIxMjA1OGM2ZTY5MWI4N2U0OGRiOWUuLjY2 YzVhYWQ1YTMyOGUzMDE1NjFlZTI4YTNlZWU4YzA1NTNjZjRlZjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKQEAgLTQwMyw3ICs0MDMsNyBAQCB2 b2lkIEluc3BlY3Rvck92ZXJsYXk6OnBhaW50KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKICAg ICBpZiAoIW1fcGFpbnRSZWN0cy5pc0VtcHR5KCkpCiAgICAgICAgIGRyYXdQYWludFJlY3RzKGNv bnRleHQsIG1fcGFpbnRSZWN0cyk7CiAKLSAgICBpZiAobV9zaG93UnVsZXJzKQorICAgIGlmICht X3Nob3dSdWxlcnMgfHwgbV9zaG93UnVsZXJzRHVyaW5nRWxlbWVudFNlbGVjdGlvbikKICAgICAg ICAgZHJhd1J1bGVycyhjb250ZXh0KTsKIH0KIApAQCAtNDg0LDYgKzQ4NCw4IEBAIHZvaWQgSW5z cGVjdG9yT3ZlcmxheTo6c2V0SW5kaWNhdGluZyhib29sIGluZGljYXRpbmcpCiAKIGJvb2wgSW5z cGVjdG9yT3ZlcmxheTo6c2hvdWxkU2hvd092ZXJsYXkoKSBjb25zdAogeworICAgIC8vIERvbid0 IHNob3cgdGhlIG92ZXJsYXkgd2hlbiBtX3Nob3dSdWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9u IGlzIHRydWUsIGFzIGl0J3Mgb25seSBzdXBwb3NlZAorICAgIC8vIHRvIGhhdmUgYW4gZWZmZWN0 IHdoZW4gZWxlbWVudCBzZWxlY3Rpb24gaXMgYWN0aXZlIChlLmcuIGEgbm9kZSBpcyBob3ZlcmVk KS4KICAgICByZXR1cm4gbV9oaWdobGlnaHROb2RlIHx8IG1faGlnaGxpZ2h0Tm9kZUxpc3QgfHwg bV9oaWdobGlnaHRRdWFkIHx8IG1faW5kaWNhdGluZyB8fCBtX3Nob3dQYWludFJlY3RzIHx8IG1f c2hvd1J1bGVyczsKIH0KIApAQCAtNTY5LDcgKzU3MSw3IEBAIHZvaWQgSW5zcGVjdG9yT3Zlcmxh eTo6ZHJhd05vZGVIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2RlJiBub2Rl KQogICAgIGlmIChtX25vZGVIaWdobGlnaHRDb25maWcuc2hvd0luZm8pCiAgICAgICAgIGRyYXdT aGFwZUhpZ2hsaWdodChjb250ZXh0LCBub2RlLCBib3VuZHMpOwogCi0gICAgaWYgKG1fc2hvd1J1 bGVycykKKyAgICBpZiAobV9zaG93UnVsZXJzIHx8IG1fc2hvd1J1bGVyc0R1cmluZ0VsZW1lbnRT ZWxlY3Rpb24pCiAgICAgICAgIGRyYXdCb3VuZHMoY29udGV4dCwgYm91bmRzKTsKIAogICAgIC8v IEVuc3VyZSB0aGF0IHRoZSB0aXRsZSBpbmZvcm1hdGlvbiBpcyBkcmF3biBhZnRlciB0aGUgYm91 bmRzLgpAQCAtNTg3LDcgKzU4OSw3IEBAIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6ZHJhd1F1YWRI aWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFF1CiAKICAgICAg ICAgZHJhd091dGxpbmVkUXVhZChjb250ZXh0LCBoaWdobGlnaHQucXVhZHNbMF0sIGhpZ2hsaWdo dC5jb250ZW50Q29sb3IsIGhpZ2hsaWdodC5jb250ZW50T3V0bGluZUNvbG9yLCBib3VuZHMpOwog Ci0gICAgICAgIGlmIChtX3Nob3dSdWxlcnMpCisgICAgICAgIGlmIChtX3Nob3dSdWxlcnMgfHwg bV9zaG93UnVsZXJzRHVyaW5nRWxlbWVudFNlbGVjdGlvbikKICAgICAgICAgICAgIGRyYXdCb3Vu ZHMoY29udGV4dCwgYm91bmRzKTsKICAgICB9CiB9CkBAIC04OTUsNyArODk3LDcgQEAgdm9pZCBJ bnNwZWN0b3JPdmVybGF5OjpkcmF3RWxlbWVudFRpdGxlKEdyYXBoaWNzQ29udGV4dCYgY29udGV4 dCwgTm9kZSYgbm9kZSwgY28KIAogICAgIEZsb2F0U2l6ZSBjb250ZW50SW5zZXQoMCwgcGFnZVZp ZXctPnRvcENvbnRlbnRJbnNldChTY3JvbGxWaWV3OjpUb3BDb250ZW50SW5zZXRUeXBlOjpXZWJD b3JlT3JQbGF0Zm9ybUNvbnRlbnRJbnNldCkpOwogICAgIGNvbnRlbnRJbnNldC5leHBhbmQoZWxl bWVudERhdGFTcGFjaW5nLCBlbGVtZW50RGF0YVNwYWNpbmcpOwotICAgIGlmIChtX3Nob3dSdWxl cnMpCisgICAgaWYgKG1fc2hvd1J1bGVycyB8fCBtX3Nob3dSdWxlcnNEdXJpbmdFbGVtZW50U2Vs ZWN0aW9uKQogICAgICAgICBjb250ZW50SW5zZXQuZXhwYW5kKHJ1bGVyU2l6ZSwgcnVsZXJTaXpl KTsKIAogICAgIGZsb2F0IGFuY2hvclRvcCA9IGJvdW5kcy55KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuaAppbmRleCBlNWNlYTExOGU4NWQwZGJkZWUyYmY5 YjcyZDU1M2JkOTIzZjc2OTZkLi5lZDcyZGNkOGZiMDg5NDc3MGFkYjA0N2U0NDFjNDkzYmVmYzUz YTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3Zlcmxh eS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmgKQEAg LTExMyw2ICsxMTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzaG93UGFpbnRSZWN0KGNvbnN0IEZs b2F0UmVjdCYpOwogCiAgICAgdm9pZCBzZXRTaG93UnVsZXJzKGJvb2wpOworICAgIHZvaWQgc2V0 U2hvd1J1bGVyc0R1cmluZ0VsZW1lbnRTZWxlY3Rpb24oYm9vbCBlbmFibGVkKSB7IG1fc2hvd1J1 bGVyc0R1cmluZ0VsZW1lbnRTZWxlY3Rpb24gPSBlbmFibGVkOyB9CiAKICAgICBOb2RlKiBoaWdo bGlnaHRlZE5vZGUoKSBjb25zdDsKIApAQCAtMTQ4LDkgKzE0OSwxMCBAQCBwcml2YXRlOgogICAg IERlcXVlPFRpbWVSZWN0UGFpcj4gbV9wYWludFJlY3RzOwogICAgIFRpbWVyIG1fcGFpbnRSZWN0 VXBkYXRlVGltZXI7CiAKLSAgICBib29sIG1faW5kaWNhdGluZyB7ZmFsc2V9OwotICAgIGJvb2wg bV9zaG93UGFpbnRSZWN0cyB7ZmFsc2V9OwotICAgIGJvb2wgbV9zaG93UnVsZXJzIHtmYWxzZX07 CisgICAgYm9vbCBtX2luZGljYXRpbmcgeyBmYWxzZSB9OworICAgIGJvb2wgbV9zaG93UGFpbnRS ZWN0cyB7IGZhbHNlIH07CisgICAgYm9vbCBtX3Nob3dSdWxlcnMgeyBmYWxzZSB9OworICAgIGJv b2wgbV9zaG93UnVsZXJzRHVyaW5nRWxlbWVudFNlbGVjdGlvbiB7IGZhbHNlIH07CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IGYzNDVmMTViN2FlNWJmNmNjNDU4 MjNhZGQyOWU0YjY3ZTRhYzY3MDAuLjkxZmRhNDZmYzFmZWYzMDgzNjk0ZmQyNzQ0MDliMGEyZDI3 NTdiM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVj dG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0zMjUsNyArMzI1LDcgQEAgdm9pZCBJbnNwZWN0b3JET01B Z2VudDo6d2lsbERlc3Ryb3lGcm9udGVuZEFuZEJhY2tlbmQoSW5zcGVjdG9yOjpEaXNjb25uZWN0 UmVhc28KICAgICBtX2luc3BlY3RlZE5vZGUgPSBudWxscHRyOwogCiAgICAgRXJyb3JTdHJpbmcg dW51c2VkOwotICAgIHNldFNlYXJjaGluZ0Zvck5vZGUodW51c2VkLCBmYWxzZSwgbnVsbHB0cik7 CisgICAgc2V0U2VhcmNoaW5nRm9yTm9kZSh1bnVzZWQsIGZhbHNlLCBudWxscHRyLCBmYWxzZSk7 CiAgICAgaGlkZUhpZ2hsaWdodCh1bnVzZWQpOwogCiAgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRz LnNldEluc3BlY3RvckRPTUFnZW50KG51bGxwdHIpOwpAQCAtMTA5NCw3ICsxMDk0LDcgQEAgdm9p ZCBJbnNwZWN0b3JET01BZ2VudDo6aW5zcGVjdChOb2RlKiBpbnNwZWN0ZWROb2RlKQogewogICAg IEVycm9yU3RyaW5nIHVudXNlZDsKICAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9IGluc3BlY3RlZE5v ZGU7Ci0gICAgc2V0U2VhcmNoaW5nRm9yTm9kZSh1bnVzZWQsIGZhbHNlLCBudWxscHRyKTsKKyAg ICBzZXRTZWFyY2hpbmdGb3JOb2RlKHVudXNlZCwgZmFsc2UsIG51bGxwdHIsIGZhbHNlKTsKIAog ICAgIGlmIChub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6OkVMRU1FTlRfTk9ERSAmJiBub2RlLT5u b2RlVHlwZSgpICE9IE5vZGU6OkRPQ1VNRU5UX05PREUpCiAgICAgICAgIG5vZGUgPSBub2RlLT5w YXJlbnROb2RlKCk7CkBAIC0xMTQ3LDE0ICsxMTQ3LDE2IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OmhpZ2hsaWdodE1vdXNlZE92ZXJOb2RlKCkKICAgICAgICAgbV9vdmVybGF5LT5oaWdobGln aHROb2RlKG5vZGUsICptX2luc3BlY3RNb2RlSGlnaGxpZ2h0Q29uZmlnKTsKIH0KIAotdm9pZCBJ bnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9yTm9kZShFcnJvclN0cmluZyYgZXJyb3JT dHJpbmcsIGJvb2wgZW5hYmxlZCwgY29uc3QgSlNPTjo6T2JqZWN0KiBoaWdobGlnaHRJbnNwZWN0 b3JPYmplY3QpCit2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXRTZWFyY2hpbmdGb3JOb2RlKEVy cm9yU3RyaW5nJiBlcnJvclN0cmluZywgYm9vbCBlbmFibGVkLCBjb25zdCBKU09OOjpPYmplY3Qq IGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCwgYm9vbCBzaG93UnVsZXJzKQogewogICAgIGlmICht X3NlYXJjaGluZ0Zvck5vZGUgPT0gZW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9z ZWFyY2hpbmdGb3JOb2RlID0gZW5hYmxlZDsKIAotICAgIGlmIChlbmFibGVkKSB7CisgICAgbV9v dmVybGF5LT5zZXRTaG93UnVsZXJzRHVyaW5nRWxlbWVudFNlbGVjdGlvbihtX3NlYXJjaGluZ0Zv ck5vZGUgJiYgc2hvd1J1bGVycyk7CisKKyAgICBpZiAobV9zZWFyY2hpbmdGb3JOb2RlKSB7CiAg ICAgICAgIG1faW5zcGVjdE1vZGVIaWdobGlnaHRDb25maWcgPSBoaWdobGlnaHRDb25maWdGcm9t SW5zcGVjdG9yT2JqZWN0KGVycm9yU3RyaW5nLCBoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpOwog ICAgICAgICBpZiAoIW1faW5zcGVjdE1vZGVIaWdobGlnaHRDb25maWcpCiAgICAgICAgICAgICBy ZXR1cm47CkBAIC0xMTg3LDkgKzExODksOSBAQCBzdGQ6OnVuaXF1ZV9wdHI8SGlnaGxpZ2h0Q29u ZmlnPiBJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3RvcgogICAg IHJldHVybiBoaWdobGlnaHRDb25maWc7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNl dEluc3BlY3RNb2RlRW5hYmxlZChFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGJvb2wgZW5hYmxl ZCwgY29uc3QgSlNPTjo6T2JqZWN0KiBoaWdobGlnaHRDb25maWcpCit2b2lkIEluc3BlY3RvckRP TUFnZW50OjpzZXRJbnNwZWN0TW9kZUVuYWJsZWQoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBi b29sIGVuYWJsZWQsIGNvbnN0IEpTT046Ok9iamVjdCogaGlnaGxpZ2h0Q29uZmlnLCBjb25zdCBi b29sKiBzaG93UnVsZXJzKQogewotICAgIHNldFNlYXJjaGluZ0Zvck5vZGUoZXJyb3JTdHJpbmcs IGVuYWJsZWQsIGhpZ2hsaWdodENvbmZpZyA/IGhpZ2hsaWdodENvbmZpZyA6IG51bGxwdHIpOwor ICAgIHNldFNlYXJjaGluZ0Zvck5vZGUoZXJyb3JTdHJpbmcsIGVuYWJsZWQsIGhpZ2hsaWdodENv bmZpZyA/IGhpZ2hsaWdodENvbmZpZyA6IG51bGxwdHIsIHNob3dSdWxlcnMgJiYgKnNob3dSdWxl cnMpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRSZWN0KEVycm9yU3Ry aW5nJiwgaW50IHgsIGludCB5LCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIGNvbnN0IEpTT046Ok9i amVjdCogY29sb3IsIGNvbnN0IEpTT046Ok9iamVjdCogb3V0bGluZUNvbG9yLCBjb25zdCBib29s KiB1c2VQYWdlQ29vcmRpbmF0ZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmgKaW5kZXggY2I1OWI4MWFiNmZkMzQxMTE2NDUwMDUw ZTExYjEwZWJhMDVlNzg0OC4uNThkM2EyMDc2N2YxZmQ3YTFlMzk1MTgwYzNiMTljYTc0OTk0ODUw NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JE T01BZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9y RE9NQWdlbnQuaApAQCAtMTIwLDcgKzEyMCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc2NhcmRT ZWFyY2hSZXN1bHRzKEVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBzZWFyY2hJZCkgb3ZlcnJp ZGU7CiAgICAgdm9pZCByZXNvbHZlTm9kZShFcnJvclN0cmluZyYsIGludCBub2RlSWQsIGNvbnN0 IFN0cmluZyogb2JqZWN0R3JvdXAsIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpSdW50aW1l OjpSZW1vdGVPYmplY3Q+JiByZXN1bHQpIG92ZXJyaWRlOwogICAgIHZvaWQgZ2V0QXR0cmlidXRl cyhFcnJvclN0cmluZyYsIGludCBub2RlSWQsIFJlZlB0cjxKU09OOjpBcnJheU9mPFN0cmluZz4+ JiByZXN1bHQpIG92ZXJyaWRlOwotICAgIHZvaWQgc2V0SW5zcGVjdE1vZGVFbmFibGVkKEVycm9y U3RyaW5nJiwgYm9vbCBlbmFibGVkLCBjb25zdCBKU09OOjpPYmplY3QqIGhpZ2hsaWdodENvbmZp Zykgb3ZlcnJpZGU7CisgICAgdm9pZCBzZXRJbnNwZWN0TW9kZUVuYWJsZWQoRXJyb3JTdHJpbmcm LCBib29sIGVuYWJsZWQsIGNvbnN0IEpTT046Ok9iamVjdCogaGlnaGxpZ2h0Q29uZmlnLCBjb25z dCBib29sKiBzaG93UnVsZXJzKSBvdmVycmlkZTsKICAgICB2b2lkIHJlcXVlc3ROb2RlKEVycm9y U3RyaW5nJiwgY29uc3QgU3RyaW5nJiBvYmplY3RJZCwgaW50KiBub2RlSWQpIG92ZXJyaWRlOwog ICAgIHZvaWQgcHVzaE5vZGVCeVBhdGhUb0Zyb250ZW5kKEVycm9yU3RyaW5nJiwgY29uc3QgU3Ry aW5nJiBwYXRoLCBpbnQqIG5vZGVJZCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBoaWRlSGlnaGxpZ2h0 KEVycm9yU3RyaW5nJikgb3ZlcnJpZGU7CkBAIC0yMDQsNyArMjA0LDcgQEAgcHJpdmF0ZToKICNl bmRpZgogCiAgICAgdm9pZCBoaWdobGlnaHRNb3VzZWRPdmVyTm9kZSgpOwotICAgIHZvaWQgc2V0 U2VhcmNoaW5nRm9yTm9kZShFcnJvclN0cmluZyYsIGJvb2wgZW5hYmxlZCwgY29uc3QgSlNPTjo6 T2JqZWN0KiBoaWdobGlnaHRDb25maWcpOworICAgIHZvaWQgc2V0U2VhcmNoaW5nRm9yTm9kZShF cnJvclN0cmluZyYsIGJvb2wgZW5hYmxlZCwgY29uc3QgSlNPTjo6T2JqZWN0KiBoaWdobGlnaHRD b25maWcsIGJvb2wgc2hvd1J1bGVycyk7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEhpZ2hsaWdodENv bmZpZz4gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChFcnJvclN0cmluZyYsIGNv bnN0IEpTT046Ok9iamVjdCogaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KTsKIAogICAgIC8vIE5v ZGUtcmVsYXRlZCBtZXRob2RzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXgg Zjk3YzE4OGNiMzExMjhkYmJkNWNhZjFlOGM4YWZkNmY0NGM0ZjUzZC4uZTA1NmQxOGM2Y2QwOWU4 MzFjZGIzMTJiNDNmZWY5NzU1NGI0ODk4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzCkBAIC0zNzIsNiArMzcyLDcgQEAgbG9jYWxpemVkU3RyaW5nc1siRWRpdCBjb25maWd1cmF0 aW9uIl0gPSAiRWRpdCBjb25maWd1cmF0aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVkaXQgY3Vz dG9tIGdyYWRpZW50Il0gPSAiRWRpdCBjdXN0b20gZ3JhZGllbnQiOwogbG9jYWxpemVkU3RyaW5n c1siRWRpdGluZyBhdWRpdHMiXSA9ICJFZGl0aW5nIGF1ZGl0cyI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJFbGVtZW50Il0gPSAiRWxlbWVudCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJFbGVtZW50IFNlbGVj dGlvbjoiXSA9ICJFbGVtZW50IFNlbGVjdGlvbjoiOwogbG9jYWxpemVkU3RyaW5nc1siRWxlbWVu dCBjbGlwcyBjb21wb3NpdGluZyBkZXNjZW5kYW50cyJdID0gIkVsZW1lbnQgY2xpcHMgY29tcG9z aXRpbmcgZGVzY2VuZGFudHMiOwogbG9jYWxpemVkU3RyaW5nc1siRWxlbWVudCBoYXMgQ1NTIGJs ZW5kaW5nIGFwcGxpZWQgYW5kIGNvbXBvc2l0ZWQgZGVzY2VuZGFudHMiXSA9ICJFbGVtZW50IGhh cyBDU1MgYmxlbmRpbmcgYXBwbGllZCBhbmQgY29tcG9zaXRlZCBkZXNjZW5kYW50cyI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJFbGVtZW50IGhhcyBDU1MgZmlsdGVycyBhcHBsaWVkIl0gPSAiRWxlbWVu dCBoYXMgQ1NTIGZpbHRlcnMgYXBwbGllZCI7CkBAIC05ODMsNiArOTg0LDcgQEAgbG9jYWxpemVk U3RyaW5nc1siU2hvdyBuZXR3b3JrIGluZm9ybWF0aW9uIl0gPSAiU2hvdyBuZXR3b3JrIGluZm9y bWF0aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgb25seSBmb3Igc2VsZWN0ZWQgbm9kZSJd ID0gIlNob3cgb25seSBmb3Igc2VsZWN0ZWQgbm9kZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93 IHBhZ2UgbG9hZCB0aW1pbmciXSA9ICJTaG93IHBhZ2UgbG9hZCB0aW1pbmciOwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyBwYWdlIHJlc291cmNlcyJdID0gIlNob3cgcGFnZSByZXNvdXJjZXMiOwor bG9jYWxpemVkU3RyaW5nc1siU2hvdyBwYWdlIHJ1bGVycyBhbmQgbm9kZSBib3JkZXIgbGluZXMi XSA9ICJTaG93IHBhZ2UgcnVsZXJzIGFuZCBub2RlIGJvcmRlciBsaW5lcyI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IHNoYWRvdyBET00gbm9kZXMiXSA9ICJTaG93IHNoYWRvdyBET00gbm9kZXMi OwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyB0aGUgZGV0YWlscyBzaWRlYmFyICglcykiXSA9ICJT aG93IHRoZSBkZXRhaWxzIHNpZGViYXIgKCVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRo ZSBuYXZpZ2F0aW9uIHNpZGViYXIgKCVzKSJdID0gIlNob3cgdGhlIG5hdmlnYXRpb24gc2lkZWJh ciAoJXMpIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvU2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvU2V0dGluZy5qcwppbmRleCBmMjc2OTFhOGM2ZTc3YzQwMWUyZTI3MGFhMDEzMDlmZWY3Nzdm OWQ1Li5iZmE5ODM4MDYzNTllMjIwODM4NjNiN2ZlNmRjMGU2ZmRlMmE1MGQzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBA IC0xNjYsNiArMTY2LDcgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgc2hvd0phdmFTY3JpcHRUeXBl SW5mb3JtYXRpb246IG5ldyBXSS5TZXR0aW5nKCJzaG93LWphdmFzY3JpcHQtdHlwZS1pbmZvcm1h dGlvbiIsIGZhbHNlKSwKICAgICBzaG93UGFpbnRSZWN0czogbmV3IFdJLlNldHRpbmcoInNob3ct cGFpbnQtcmVjdHMiLCBmYWxzZSksCiAgICAgc2hvd1J1bGVyczogbmV3IFdJLlNldHRpbmcoInNo b3ctcnVsZXJzIiwgZmFsc2UpLAorICAgIHNob3dSdWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9u OiBuZXcgV0kuU2V0dGluZygic2hvdy1ydWxlcnMtZHVyaW5nLWVsZW1lbnQtc2VsZWN0aW9uIiwg dHJ1ZSksCiAgICAgc2hvd1Njb3BlQ2hhaW5PblBhdXNlOiBuZXcgV0kuU2V0dGluZygic2hvdy1z Y29wZS1jaGFpbi1zaWRlYmFyIiwgdHJ1ZSksCiAgICAgc2hvd1NoYWRvd0RPTTogbmV3IFdJLlNl dHRpbmcoInNob3ctc2hhZG93LWRvbSIsIGZhbHNlKSwKICAgICBzaG93V2hpdGVzcGFjZUNoYXJh Y3RlcnM6IG5ldyBXSS5TZXR0aW5nKCJzaG93LXdoaXRlc3BhY2UtY2hhcmFjdGVycyIsIGZhbHNl KSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0RPTU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzCmluZGV4IDdhOTFiM2ZlYTM3Mzg1ZWFiMmRjMWY4 MGNiMWYxMzRjZGM5MWJiODkuLjk2YTZhMjI4ODEzMTYwYThkYjk1NzJmMTAyZDJlYWMxMjAzZWRm ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0RPTU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwpAQCAtNTQwLDcgKzU0MCwxMiBAQCBXSS5E T01NYW5hZ2VyID0gY2xhc3MgRE9NTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBp ZiAoZW5hYmxlZCA9PT0gdGhpcy5faW5zcGVjdE1vZGVFbmFibGVkKQogICAgICAgICAgICAgcmV0 dXJuOwogCi0gICAgICAgIERPTUFnZW50LnNldEluc3BlY3RNb2RlRW5hYmxlZChlbmFibGVkLCB0 aGlzLl9idWlsZEhpZ2hsaWdodENvbmZpZygpLCAoZXJyb3IpID0+IHsKKyAgICAgICAgbGV0IGNv bW1hbmRBcmd1bWVudHMgPSB7CisgICAgICAgICAgICBlbmFibGVkLAorICAgICAgICAgICAgaGln aGxpZ2h0Q29uZmlnOiB0aGlzLl9idWlsZEhpZ2hsaWdodENvbmZpZygpLAorICAgICAgICAgICAg c2hvd1J1bGVyczogV0kuc2V0dGluZ3Muc2hvd1J1bGVyc0R1cmluZ0VsZW1lbnRTZWxlY3Rpb24u dmFsdWUsCisgICAgICAgIH07CisgICAgICAgIERPTUFnZW50LnNldEluc3BlY3RNb2RlRW5hYmxl ZC5pbnZva2UoY29tbWFuZEFyZ3VtZW50cywgKGVycm9yKSA9PiB7CiAgICAgICAgICAgICB0aGlz Ll9pbnNwZWN0TW9kZUVuYWJsZWQgPSBlcnJvciA/IGZhbHNlIDogZW5hYmxlZDsKICAgICAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkRPTU1hbmFnZXIuRXZlbnQuSW5z cGVjdE1vZGVTdGF0ZUNoYW5nZWQpOwogICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1Rh YkNvbnRlbnRWaWV3LmpzCmluZGV4IDk2NDZhMjZlODBhZmRmYTY0YjhlZTgwM2JjYzJhOGJlZThl NWUyNjguLjNlYzk1NjMzYzEyNDIxZTgxZWRkNmYwZDUwY2VhYTRhZmM4NzAxYTkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFi Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMjIyLDYgKzIyMiwxMCBAQCBXSS5T ZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRl bmRzIFdJLlRhYkNvbnRlbnRWaQogCiAgICAgICAgIGdlbmVyYWxTZXR0aW5nc1ZpZXcuYWRkU2Vw YXJhdG9yKCk7CiAKKyAgICAgICAgZ2VuZXJhbFNldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJ U3RyaW5nKCJFbGVtZW50IFNlbGVjdGlvbjoiKSwgV0kuc2V0dGluZ3Muc2hvd1J1bGVyc0R1cmlu Z0VsZW1lbnRTZWxlY3Rpb24sIFdJLlVJU3RyaW5nKCJTaG93IHBhZ2UgcnVsZXJzIGFuZCBub2Rl IGJvcmRlciBsaW5lcyIpKTsKKworICAgICAgICBnZW5lcmFsU2V0dGluZ3NWaWV3LmFkZFNlcGFy YXRvcigpOworCiAgICAgICAgIGNvbnN0IHpvb21MZXZlbHMgPSBbMC42LCAwLjgsIDEsIDEuMiwg MS40LCAxLjYsIDEuOCwgMiwgMi4yLCAyLjRdOwogICAgICAgICBjb25zdCB6b29tVmFsdWVzID0g em9vbUxldmVscy5tYXAoKGxldmVsKSA9PiBbbGV2ZWwsIE51bWJlci5wZXJjZW50YWdlU3RyaW5n KGxldmVsLCAwKV0pOwogCg== 370536 2019-05-23 18:06:20 -0700 2019-05-23 18:34:38 -0700 Patch bug-198088-20190523180620.patch text/plain 19175 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDI1ZDZiMDNmNWQ3ZDc0YjRiOTg3Y2RkMDM2Zjkw MzRlNjRiOTUzYmQuLmU5ZDM0YjhiYWZkMTRjMWE2NmFhYjZjNjZmOGQ2MDNmZTE3YzEyOGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA1LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBP dmVybGF5OiBydWxlcnMvZ3VpZGVzIHNob3VsZCBiZSBzaG93biB3aGVuZXZlciBlbGVtZW50IHNl bGVjdGlvbiBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTgwODgKKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIu CisKKyAgICAgICAgV2hlbiB0cnlpbmcgdG8gIm1lYXN1cmUiIHRoZSBhYnNvbHV0ZSBwb3NpdGlv biAodG8gdGhlIHZpZXdwb3J0KSBvciByZWxhdGl2ZSBwb3NpdGlvbiAodG8KKyAgICAgICAgYW5v dGhlciBlbGVtZW50KSBvZiBhIGdpdmVuIGVsZW1lbnQsIG9mdGVuIHRoZSBlYXNpZXN0IHdheSBp cyB0byBlbmFibGUgRWxlbWVudCBTZWxlY3Rpb24KKyAgICAgICAgYW5kIFNob3cgUnVsZXJzIGF0 IHRoZSBzYW1lIHRpbWUuCisKKyAgICAgICAgVGhpcyBjYW4gaGF2ZSB0aGUgdW5kZXNpcmVkICJz aWRlLWVmZmVjdCIgb2YgaGF2aW5nIHRoZSBydWxlcnMgYmUgYWx3YXlzIHByZXNlbnQsIGV2ZW4g d2hlbgorICAgICAgICBub3QgaGlnaGxpZ2h0aW5nIGFueSBub2Rlcy4KKworICAgICAgICBUaGUg aWRlYWwgZnVuY3Rpb25hbGl0eSBpcyB0byBhbGxvdyB0aGUgcnVsZXJzL2d1aWRlcyB0byBiZSBz aG93biB3aGVuIGVsZW1lbnQgc2VsZWN0aW9uIGlzCisgICAgICAgIGFjdGl2ZSBhbmQgYSBub2Rl IGlzIGhvdmVyZWQsIHJlZ2FyZGxlc3Mgb2Ygd2hldGhlciAiU2hvdyBSdWxlcnMiIGlzIGVuYWJs ZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb246CisgICAgICAgIEFk ZCBhbiBvcHRpb25hbCBgc2hvd1J1bGVyc2AgcGFyYW1ldGVyIHRvIGBET00uc2V0SW5zcGVjdE1v ZGVFbmFibGVkYCB0aGF0IHN1cGVyc2VkZXMgdGhlCisgICAgICAgIGN1cnJlbnQgdmFsdWUgb2Yg YFBhZ2Uuc2V0U2hvd1J1bGVyc2AgYXMgdG8gd2hldGhlciBydWxlcnMvZ3VpZGVzIGFyZSBzaG93 bi4KKwogMjAxOS0wNS0yMyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+ CiAKICAgICAgICAgU29ja2V0LWJhc2VkIFJXSSBzaG91bGQgYmUgYWJsZSB0byBpbnNwZWN0IGEg SlNDb250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVhYmZmYWY2NWQ5MDNjMTljZjQ5NDlhNjc4NTQ4NDQ0 ZDhiZjQ5NC4uMWJhZTFlZTVmYjZlMWQwY2EzYjZmYjU3MzNmY2JiYjRkMjI4ZjEwYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE5LTA1LTIzICBEZXZpbiBSb3Vzc28gIDxkcm91c3Nv QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBPdmVybGF5OiBydWxlcnMvZ3Vp ZGVzIHNob3VsZCBiZSBzaG93biB3aGVuZXZlciBlbGVtZW50IHNlbGVjdGlvbiBpcyBlbmFibGVk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTgwODgK KworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgV2hlbiB0 cnlpbmcgdG8gIm1lYXN1cmUiIHRoZSBhYnNvbHV0ZSBwb3NpdGlvbiAodG8gdGhlIHZpZXdwb3J0 KSBvciByZWxhdGl2ZSBwb3NpdGlvbiAodG8KKyAgICAgICAgYW5vdGhlciBlbGVtZW50KSBvZiBh IGdpdmVuIGVsZW1lbnQsIG9mdGVuIHRoZSBlYXNpZXN0IHdheSBpcyB0byBlbmFibGUgRWxlbWVu dCBTZWxlY3Rpb24KKyAgICAgICAgYW5kIFNob3cgUnVsZXJzIGF0IHRoZSBzYW1lIHRpbWUuCisK KyAgICAgICAgVGhpcyBjYW4gaGF2ZSB0aGUgdW5kZXNpcmVkICJzaWRlLWVmZmVjdCIgb2YgaGF2 aW5nIHRoZSBydWxlcnMgYmUgYWx3YXlzIHByZXNlbnQsIGV2ZW4gd2hlbgorICAgICAgICBub3Qg aGlnaGxpZ2h0aW5nIGFueSBub2Rlcy4KKworICAgICAgICBUaGUgaWRlYWwgZnVuY3Rpb25hbGl0 eSBpcyB0byBhbGxvdyB0aGUgcnVsZXJzL2d1aWRlcyB0byBiZSBzaG93biB3aGVuIGVsZW1lbnQg c2VsZWN0aW9uIGlzCisgICAgICAgIGFjdGl2ZSBhbmQgYSBub2RlIGlzIGhvdmVyZWQsIHJlZ2Fy ZGxlc3Mgb2Ygd2hldGhlciAiU2hvdyBSdWxlcnMiIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y T3ZlcmxheTo6c2V0U2hvd1J1bGVyc0R1cmluZ0VsZW1lbnRTZWxlY3Rpb24pOiBBZGRlZC4KKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JPdmVybGF5OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JP dmVybGF5OjpzaG91bGRTaG93T3ZlcmxheSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JP dmVybGF5OjpkcmF3Tm9kZUhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JP dmVybGF5OjpkcmF3UXVhZEhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JP dmVybGF5OjpkcmF3RWxlbWVudFRpdGxlKToKKyAgICAgICAgSWYgYHNob3dSdWxlcnNEdXJpbmdF bGVtZW50U2VsZWN0aW9uYCBpcyBlbmFibGVkLCBkcmF3IHJ1bGVycyB3aGVuZXZlciBhbnkgaGln aGxpZ2h0IGJvdW5kcworICAgICAgICBhcmUgY2FsY3VsYXRlZCwgYnV0IGRvbid0IHVwZGF0ZSB0 aGUgb3ZlcmxheSBpZiBpdCdzIHRoZSBvbmx5IHRoaW5nIGVuYWJsZWQgKGUuZy4gaWYgdGhlcmUn cworICAgICAgICBubyBjdXJyZW50bHkgaG92ZXJlZCBub2RlLCB0aGUgb3ZlcmxheSB3aWxsIGRp c2FwcGVhcikuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojp3aWxsRGVzdHJveUZy b250ZW5kQW5kQmFja2VuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6 aW5zcGVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0SW5zcGVj dE1vZGVFbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpzZXRT ZWFyY2hpbmdGb3JOb2RlKToKKyAgICAgICAgQWRkIGFuIG9wdGlvbmFsIGBzaG93UnVsZXJzYCBw YXJhbWV0ZXIgdG8gYERPTS5zZXRJbnNwZWN0TW9kZUVuYWJsZWRgIHRoYXQgc3VwZXJzZWRlcyB0 aGUKKyAgICAgICAgY3VycmVudCB2YWx1ZSBvZiBgUGFnZS5zZXRTaG93UnVsZXJzYCBhcyB0byB3 aGV0aGVyIHJ1bGVycy9ndWlkZXMgYXJlIHNob3duLgorCiAyMDE5LTA1LTIzICBEZXZpbiBSb3Vz c28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBPdmVybGF5 OiBydWxlcnMgc2hvdWxkIHN3aXRjaCBzaWRlcyBpZiB0aGV5IGludGVyc2VjdCB0aGUgaGlnaGxp Z2h0ZWQgbm9kZShzKSBzbyB0aGV5IGRvbid0IG9ic3RydWN0IGFueSBjb250ZW50CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwppbmRleCA4MjA1YjkxYjY5NDkyYTk1ODFmYTUyZDJhZDEzYzJiMTRhOTRj MGM1Li41OWViNTFiZDQ3MDljN2QxYzFiNDBhZGI0M2I5ODUzZjQwYTQxOTJjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxOS0wNS0yMyAgRGV2aW4gUm91c3Nv ICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogT3ZlcmxheTog cnVsZXJzL2d1aWRlcyBzaG91bGQgYmUgc2hvd24gd2hlbmV2ZXIgZWxlbWVudCBzZWxlY3Rpb24g aXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk4MDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAg ICAgIFdoZW4gdHJ5aW5nIHRvICJtZWFzdXJlIiB0aGUgYWJzb2x1dGUgcG9zaXRpb24gKHRvIHRo ZSB2aWV3cG9ydCkgb3IgcmVsYXRpdmUgcG9zaXRpb24gKHRvCisgICAgICAgIGFub3RoZXIgZWxl bWVudCkgb2YgYSBnaXZlbiBlbGVtZW50LCBvZnRlbiB0aGUgZWFzaWVzdCB3YXkgaXMgdG8gZW5h YmxlIEVsZW1lbnQgU2VsZWN0aW9uCisgICAgICAgIGFuZCBTaG93IFJ1bGVycyBhdCB0aGUgc2Ft ZSB0aW1lLgorCisgICAgICAgIFRoaXMgY2FuIGhhdmUgdGhlIHVuZGVzaXJlZCAic2lkZS1lZmZl Y3QiIG9mIGhhdmluZyB0aGUgcnVsZXJzIGJlIGFsd2F5cyBwcmVzZW50LCBldmVuIHdoZW4KKyAg ICAgICAgbm90IGhpZ2hsaWdodGluZyBhbnkgbm9kZXMuCisKKyAgICAgICAgVGhlIGlkZWFsIGZ1 bmN0aW9uYWxpdHkgaXMgdG8gYWxsb3cgdGhlIHJ1bGVycy9ndWlkZXMgdG8gYmUgc2hvd24gd2hl biBlbGVtZW50IHNlbGVjdGlvbiBpcworICAgICAgICBhY3RpdmUgYW5kIGEgbm9kZSBpcyBob3Zl cmVkLCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgIlNob3cgUnVsZXJzIiBpcyBlbmFibGVkLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanM6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0 dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUdlbmVyYWxTZXR0aW5nc1ZpZXcp OgorICAgICAgICBBZGQgYSBzZXR0aW5nIGZvciBjb250cm9sbGluZyB3aGV0aGVyIHJ1bGVycy9n dWlkZXMgYXJlIHNob3duIGR1cmluZyBlbGVtZW50IHNlbGVjdGlvbi4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkRPTU1h bmFnZXIucHJvdG90eXBlLnNldCBpbnNwZWN0TW9kZUVuYWJsZWQpOgorICAgICAgICBQYXNzIHRo ZSBzZXR0aW5nIHZhbHVlIGFzIGFuIG9wdGlvbmFsIHBhcmFtZXRlciB3aGVuIGNhbGxpbmcgYERP TS5zZXRJbnNwZWN0TW9kZUVuYWJsZWRgLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5s cHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDE5LTA1LTIzICBNYXR0IEJha2VyICA8bWF0 dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgdW51c2Vk IENTUyBjbGFzcyAib2Zmc2V0LXNlY3Rpb25zIgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9ET00uanNvbiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvcHJvdG9jb2wvRE9NLmpzb24KaW5kZXggNzc5MTBjOWI0YzgyZWRiNzYwZmQ5 MjY0NmZkZDRmNzI3MTIxMWQwMC4uYjM2NzRlN2EwZjhlNmIwMmNjZTg4NzZjNGQzN2U1M2Q0NDI1 OTk1OCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2Nv bC9ET00uanNvbgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29s L0RPTS5qc29uCkBAIC00MDAsNyArNDAwLDggQEAKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJFbnRlcnMgdGhlICdpbnNwZWN0JyBtb2RlLiBJbiB0aGlzIG1vZGUsIGVsZW1lbnRzIHRoYXQg dXNlciBpcyBob3ZlcmluZyBvdmVyIGFyZSBoaWdobGlnaHRlZC4gQmFja2VuZCB0aGVuIGdlbmVy YXRlcyAnaW5zcGVjdCcgY29tbWFuZCB1cG9uIGVsZW1lbnQgc2VsZWN0aW9uLiIsCiAgICAgICAg ICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVuYWJsZWQi LCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjogIlRydWUgdG8gZW5hYmxlIGluc3Bl Y3Rpb24gbW9kZSwgZmFsc2UgdG8gZGlzYWJsZSBpdC4iIH0sCi0gICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJoaWdobGlnaHRDb25maWciLCAiJHJlZiI6ICJIaWdobGlnaHRDb25maWciLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiQSBkZXNjcmlwdG9yIGZvciB0aGUgaGlnaGxp Z2h0IGFwcGVhcmFuY2Ugb2YgaG92ZXJlZC1vdmVyIG5vZGVzLiBNYXkgYmUgb21pdHRlZCBpZiA8 Y29kZT5lbmFibGVkID09IGZhbHNlPC9jb2RlPi4iIH0KKyAgICAgICAgICAgICAgICB7ICJuYW1l IjogImhpZ2hsaWdodENvbmZpZyIsICIkcmVmIjogIkhpZ2hsaWdodENvbmZpZyIsICJvcHRpb25h bCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJBIGRlc2NyaXB0b3IgZm9yIHRoZSBoaWdobGlnaHQg YXBwZWFyYW5jZSBvZiBob3ZlcmVkLW92ZXIgbm9kZXMuIE1heSBiZSBvbWl0dGVkIGlmIDxjb2Rl PmVuYWJsZWQgPT0gZmFsc2U8L2NvZGU+LiIgfSwKKyAgICAgICAgICAgICAgICB7ICJuYW1lIjog InNob3dSdWxlcnMiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIldoZXRoZXIgdGhlIHJ1bGVycyBzaG91bGQgYmUgc2hvd24gZHVyaW5nIGVsZW1l bnQgc2VsZWN0aW9uLiBUaGlzIG92ZXJyaWRlcyBQYWdlLnNldFNob3dSdWxlcnMuIiB9CiAgICAg ICAgICAgICBdCiAgICAgICAgIH0sCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAppbmRleCAwMDdiNjE3ODkzNjhlOTRiM2Q5NGUwYzQ0 M2RkNDUwZWZiMmRlNDI5Li4wOWNiZjY1NjQxODFlZWQ1YjM3YzlmZDQzYWQ2NGExNjQwYWNhZGQz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCkBA IC00MTEsNyArNDExLDcgQEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpwYWludChHcmFwaGljc0Nv bnRleHQmIGNvbnRleHQpCiAgICAgaWYgKCFtX3BhaW50UmVjdHMuaXNFbXB0eSgpKQogICAgICAg ICBkcmF3UGFpbnRSZWN0cyhjb250ZXh0LCBtX3BhaW50UmVjdHMpOwogCi0gICAgaWYgKG1fc2hv d1J1bGVycykKKyAgICBpZiAobV9zaG93UnVsZXJzIHx8IG1fc2hvd1J1bGVyc0R1cmluZ0VsZW1l bnRTZWxlY3Rpb24pCiAgICAgICAgIGRyYXdSdWxlcnMoY29udGV4dCwgYm91bmRzKTsKIH0KIApA QCAtNDkyLDYgKzQ5Miw4IEBAIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6c2V0SW5kaWNhdGluZyhi b29sIGluZGljYXRpbmcpCiAKIGJvb2wgSW5zcGVjdG9yT3ZlcmxheTo6c2hvdWxkU2hvd092ZXJs YXkoKSBjb25zdAogeworICAgIC8vIERvbid0IHNob3cgdGhlIG92ZXJsYXkgd2hlbiBtX3Nob3dS dWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9uIGlzIHRydWUsIGFzIGl0J3Mgb25seSBzdXBwb3Nl ZAorICAgIC8vIHRvIGhhdmUgYW4gZWZmZWN0IHdoZW4gZWxlbWVudCBzZWxlY3Rpb24gaXMgYWN0 aXZlIChlLmcuIGEgbm9kZSBpcyBob3ZlcmVkKS4KICAgICByZXR1cm4gbV9oaWdobGlnaHROb2Rl IHx8IG1faGlnaGxpZ2h0Tm9kZUxpc3QgfHwgbV9oaWdobGlnaHRRdWFkIHx8IG1faW5kaWNhdGlu ZyB8fCBtX3Nob3dQYWludFJlY3RzIHx8IG1fc2hvd1J1bGVyczsKIH0KIApAQCAtNTc3LDcgKzU3 OSw3IEBAIEhpZ2hsaWdodDo6Qm91bmRzIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdOb2RlSGlnaGxp Z2h0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwKICAgICBpZiAobV9ub2RlSGlnaGxpZ2h0Q29u ZmlnLnNob3dJbmZvKQogICAgICAgICBkcmF3U2hhcGVIaWdobGlnaHQoY29udGV4dCwgbm9kZSwg Ym91bmRzKTsKIAotICAgIGlmIChtX3Nob3dSdWxlcnMpCisgICAgaWYgKG1fc2hvd1J1bGVycyB8 fCBtX3Nob3dSdWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9uKQogICAgICAgICBkcmF3Qm91bmRz KGNvbnRleHQsIGJvdW5kcyk7CiAKICAgICAvLyBFbnN1cmUgdGhhdCB0aGUgdGl0bGUgaW5mb3Jt YXRpb24gaXMgZHJhd24gYWZ0ZXIgdGhlIGJvdW5kcy4KQEAgLTU5Nyw3ICs1OTksNyBAQCBIaWdo bGlnaHQ6OkJvdW5kcyBJbnNwZWN0b3JPdmVybGF5OjpkcmF3UXVhZEhpZ2hsaWdodChHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsCiAgICAgaWYgKGhpZ2hsaWdodC5xdWFkcy5zaXplKCkgPj0gMSkg ewogICAgICAgICBkcmF3T3V0bGluZWRRdWFkKGNvbnRleHQsIGhpZ2hsaWdodC5xdWFkc1swXSwg aGlnaGxpZ2h0LmNvbnRlbnRDb2xvciwgaGlnaGxpZ2h0LmNvbnRlbnRPdXRsaW5lQ29sb3IsIGJv dW5kcyk7CiAKLSAgICAgICAgaWYgKG1fc2hvd1J1bGVycykKKyAgICAgICAgaWYgKG1fc2hvd1J1 bGVycyB8fCBtX3Nob3dSdWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9uKQogICAgICAgICAgICAg ZHJhd0JvdW5kcyhjb250ZXh0LCBib3VuZHMpOwogICAgIH0KIApAQCAtOTI5LDcgKzkzMSw3IEBA IHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6ZHJhd0VsZW1lbnRUaXRsZShHcmFwaGljc0NvbnRleHQm IGNvbnRleHQsIE5vZGUmIG5vZGUsIGNvCiAKICAgICBGbG9hdFNpemUgY29udGVudEluc2V0KDAs IHBhZ2VWaWV3LT50b3BDb250ZW50SW5zZXQoU2Nyb2xsVmlldzo6VG9wQ29udGVudEluc2V0VHlw ZTo6V2ViQ29yZU9yUGxhdGZvcm1Db250ZW50SW5zZXQpKTsKICAgICBjb250ZW50SW5zZXQuZXhw YW5kKGVsZW1lbnREYXRhU3BhY2luZywgZWxlbWVudERhdGFTcGFjaW5nKTsKLSAgICBpZiAobV9z aG93UnVsZXJzKQorICAgIGlmIChtX3Nob3dSdWxlcnMgfHwgbV9zaG93UnVsZXJzRHVyaW5nRWxl bWVudFNlbGVjdGlvbikKICAgICAgICAgY29udGVudEluc2V0LmV4cGFuZChydWxlclNpemUsIHJ1 bGVyU2l6ZSk7CiAKICAgICBmbG9hdCBhbmNob3JUb3AgPSBib3VuZHMueSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuaCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmgKaW5kZXggODI4MDBmMDY0MTI4YTA3 MDhkNGUzZmJiZTJkMzJlNWM2MzBhZjU0MC4uYTlhMTQ1N2UzOTUyYmVmYjRmZGViNjI2ZTAzYjA1 MDFjNDQ3YTY5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ck92ZXJsYXkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3Zlcmxh eS5oCkBAIC0xMTUsNiArMTE1LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2hvd1BhaW50UmVjdChj b25zdCBGbG9hdFJlY3QmKTsKIAogICAgIHZvaWQgc2V0U2hvd1J1bGVycyhib29sKTsKKyAgICB2 b2lkIHNldFNob3dSdWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9uKGJvb2wgZW5hYmxlZCkgeyBt X3Nob3dSdWxlcnNEdXJpbmdFbGVtZW50U2VsZWN0aW9uID0gZW5hYmxlZDsgfQogCiAgICAgTm9k ZSogaGlnaGxpZ2h0ZWROb2RlKCkgY29uc3Q7CiAKQEAgLTE1MCw5ICsxNTEsMTAgQEAgcHJpdmF0 ZToKICAgICBEZXF1ZTxUaW1lUmVjdFBhaXI+IG1fcGFpbnRSZWN0czsKICAgICBUaW1lciBtX3Bh aW50UmVjdFVwZGF0ZVRpbWVyOwogCi0gICAgYm9vbCBtX2luZGljYXRpbmcge2ZhbHNlfTsKLSAg ICBib29sIG1fc2hvd1BhaW50UmVjdHMge2ZhbHNlfTsKLSAgICBib29sIG1fc2hvd1J1bGVycyB7 ZmFsc2V9OworICAgIGJvb2wgbV9pbmRpY2F0aW5nIHsgZmFsc2UgfTsKKyAgICBib29sIG1fc2hv d1BhaW50UmVjdHMgeyBmYWxzZSB9OworICAgIGJvb2wgbV9zaG93UnVsZXJzIHsgZmFsc2UgfTsK KyAgICBib29sIG1fc2hvd1J1bGVyc0R1cmluZ0VsZW1lbnRTZWxlY3Rpb24geyBmYWxzZSB9Owog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBmMzQ1ZjE1YjdhZTVi ZjZjYzQ1ODIzYWRkMjllNGI2N2U0YWM2NzAwLi45MWZkYTQ2ZmMxZmVmMzA4MzY5NGZkMjc0NDA5 YjBhMmQyNzU3YjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRz L0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMzI1LDcgKzMyNSw3IEBAIHZvaWQgSW5zcGVj dG9yRE9NQWdlbnQ6OndpbGxEZXN0cm95RnJvbnRlbmRBbmRCYWNrZW5kKEluc3BlY3Rvcjo6RGlz Y29ubmVjdFJlYXNvCiAgICAgbV9pbnNwZWN0ZWROb2RlID0gbnVsbHB0cjsKIAogICAgIEVycm9y U3RyaW5nIHVudXNlZDsKLSAgICBzZXRTZWFyY2hpbmdGb3JOb2RlKHVudXNlZCwgZmFsc2UsIG51 bGxwdHIpOworICAgIHNldFNlYXJjaGluZ0Zvck5vZGUodW51c2VkLCBmYWxzZSwgbnVsbHB0ciwg ZmFsc2UpOwogICAgIGhpZGVIaWdobGlnaHQodW51c2VkKTsKIAogICAgIG1faW5zdHJ1bWVudGlu Z0FnZW50cy5zZXRJbnNwZWN0b3JET01BZ2VudChudWxscHRyKTsKQEAgLTEwOTQsNyArMTA5NCw3 IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6Omluc3BlY3QoTm9kZSogaW5zcGVjdGVkTm9kZSkK IHsKICAgICBFcnJvclN0cmluZyB1bnVzZWQ7CiAgICAgUmVmUHRyPE5vZGU+IG5vZGUgPSBpbnNw ZWN0ZWROb2RlOwotICAgIHNldFNlYXJjaGluZ0Zvck5vZGUodW51c2VkLCBmYWxzZSwgbnVsbHB0 cik7CisgICAgc2V0U2VhcmNoaW5nRm9yTm9kZSh1bnVzZWQsIGZhbHNlLCBudWxscHRyLCBmYWxz ZSk7CiAKICAgICBpZiAobm9kZS0+bm9kZVR5cGUoKSAhPSBOb2RlOjpFTEVNRU5UX05PREUgJiYg bm9kZS0+bm9kZVR5cGUoKSAhPSBOb2RlOjpET0NVTUVOVF9OT0RFKQogICAgICAgICBub2RlID0g bm9kZS0+cGFyZW50Tm9kZSgpOwpAQCAtMTE0NywxNCArMTE0NywxNiBAQCB2b2lkIEluc3BlY3Rv ckRPTUFnZW50OjpoaWdobGlnaHRNb3VzZWRPdmVyTm9kZSgpCiAgICAgICAgIG1fb3ZlcmxheS0+ aGlnaGxpZ2h0Tm9kZShub2RlLCAqbV9pbnNwZWN0TW9kZUhpZ2hsaWdodENvbmZpZyk7CiB9CiAK LXZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldFNlYXJjaGluZ0Zvck5vZGUoRXJyb3JTdHJpbmcm IGVycm9yU3RyaW5nLCBib29sIGVuYWJsZWQsIGNvbnN0IEpTT046Ok9iamVjdCogaGlnaGxpZ2h0 SW5zcGVjdG9yT2JqZWN0KQordm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0U2VhcmNoaW5nRm9y Tm9kZShFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGJvb2wgZW5hYmxlZCwgY29uc3QgSlNPTjo6 T2JqZWN0KiBoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QsIGJvb2wgc2hvd1J1bGVycykKIHsKICAg ICBpZiAobV9zZWFyY2hpbmdGb3JOb2RlID09IGVuYWJsZWQpCiAgICAgICAgIHJldHVybjsKIAog ICAgIG1fc2VhcmNoaW5nRm9yTm9kZSA9IGVuYWJsZWQ7CiAKLSAgICBpZiAoZW5hYmxlZCkgewor ICAgIG1fb3ZlcmxheS0+c2V0U2hvd1J1bGVyc0R1cmluZ0VsZW1lbnRTZWxlY3Rpb24obV9zZWFy Y2hpbmdGb3JOb2RlICYmIHNob3dSdWxlcnMpOworCisgICAgaWYgKG1fc2VhcmNoaW5nRm9yTm9k ZSkgewogICAgICAgICBtX2luc3BlY3RNb2RlSGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29u ZmlnRnJvbUluc3BlY3Rvck9iamVjdChlcnJvclN0cmluZywgaGlnaGxpZ2h0SW5zcGVjdG9yT2Jq ZWN0KTsKICAgICAgICAgaWYgKCFtX2luc3BlY3RNb2RlSGlnaGxpZ2h0Q29uZmlnKQogICAgICAg ICAgICAgcmV0dXJuOwpAQCAtMTE4Nyw5ICsxMTg5LDkgQEAgc3RkOjp1bmlxdWVfcHRyPEhpZ2hs aWdodENvbmZpZz4gSW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0 b3IKICAgICByZXR1cm4gaGlnaGxpZ2h0Q29uZmlnOwogfQogCi12b2lkIEluc3BlY3RvckRPTUFn ZW50OjpzZXRJbnNwZWN0TW9kZUVuYWJsZWQoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBib29s IGVuYWJsZWQsIGNvbnN0IEpTT046Ok9iamVjdCogaGlnaGxpZ2h0Q29uZmlnKQordm9pZCBJbnNw ZWN0b3JET01BZ2VudDo6c2V0SW5zcGVjdE1vZGVFbmFibGVkKEVycm9yU3RyaW5nJiBlcnJvclN0 cmluZywgYm9vbCBlbmFibGVkLCBjb25zdCBKU09OOjpPYmplY3QqIGhpZ2hsaWdodENvbmZpZywg Y29uc3QgYm9vbCogc2hvd1J1bGVycykKIHsKLSAgICBzZXRTZWFyY2hpbmdGb3JOb2RlKGVycm9y U3RyaW5nLCBlbmFibGVkLCBoaWdobGlnaHRDb25maWcgPyBoaWdobGlnaHRDb25maWcgOiBudWxs cHRyKTsKKyAgICBzZXRTZWFyY2hpbmdGb3JOb2RlKGVycm9yU3RyaW5nLCBlbmFibGVkLCBoaWdo bGlnaHRDb25maWcgPyBoaWdobGlnaHRDb25maWcgOiBudWxscHRyLCBzaG93UnVsZXJzICYmICpz aG93UnVsZXJzKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0UmVjdChF cnJvclN0cmluZyYsIGludCB4LCBpbnQgeSwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBjb25zdCBK U09OOjpPYmplY3QqIGNvbG9yLCBjb25zdCBKU09OOjpPYmplY3QqIG91dGxpbmVDb2xvciwgY29u c3QgYm9vbCogdXNlUGFnZUNvb3JkaW5hdGVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IGNiNTliODFhYjZmZDM0MTEx NjQ1MDA1MGUxMWIxMGViYTA1ZTc4NDguLjU4ZDNhMjA3NjdmMWZkN2ExZTM5NTE4MGMzYjE5Y2E3 NDk5NDg1MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yRE9NQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3RvckRPTUFnZW50LmgKQEAgLTEyMCw3ICsxMjAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBk aXNjYXJkU2VhcmNoUmVzdWx0cyhFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgc2VhcmNoSWQp IG92ZXJyaWRlOwogICAgIHZvaWQgcmVzb2x2ZU5vZGUoRXJyb3JTdHJpbmcmLCBpbnQgbm9kZUlk LCBjb25zdCBTdHJpbmcqIG9iamVjdEdyb3VwLCBSZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6 UnVudGltZTo6UmVtb3RlT2JqZWN0PiYgcmVzdWx0KSBvdmVycmlkZTsKICAgICB2b2lkIGdldEF0 dHJpYnV0ZXMoRXJyb3JTdHJpbmcmLCBpbnQgbm9kZUlkLCBSZWZQdHI8SlNPTjo6QXJyYXlPZjxT dHJpbmc+PiYgcmVzdWx0KSBvdmVycmlkZTsKLSAgICB2b2lkIHNldEluc3BlY3RNb2RlRW5hYmxl ZChFcnJvclN0cmluZyYsIGJvb2wgZW5hYmxlZCwgY29uc3QgSlNPTjo6T2JqZWN0KiBoaWdobGln aHRDb25maWcpIG92ZXJyaWRlOworICAgIHZvaWQgc2V0SW5zcGVjdE1vZGVFbmFibGVkKEVycm9y U3RyaW5nJiwgYm9vbCBlbmFibGVkLCBjb25zdCBKU09OOjpPYmplY3QqIGhpZ2hsaWdodENvbmZp ZywgY29uc3QgYm9vbCogc2hvd1J1bGVycykgb3ZlcnJpZGU7CiAgICAgdm9pZCByZXF1ZXN0Tm9k ZShFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGludCogbm9kZUlkKSBvdmVy cmlkZTsKICAgICB2b2lkIHB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZChFcnJvclN0cmluZyYsIGNv bnN0IFN0cmluZyYgcGF0aCwgaW50KiBub2RlSWQpIG92ZXJyaWRlOwogICAgIHZvaWQgaGlkZUhp Z2hsaWdodChFcnJvclN0cmluZyYpIG92ZXJyaWRlOwpAQCAtMjA0LDcgKzIwNCw3IEBAIHByaXZh dGU6CiAjZW5kaWYKIAogICAgIHZvaWQgaGlnaGxpZ2h0TW91c2VkT3Zlck5vZGUoKTsKLSAgICB2 b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoRXJyb3JTdHJpbmcmLCBib29sIGVuYWJsZWQsIGNvbnN0 IEpTT046Ok9iamVjdCogaGlnaGxpZ2h0Q29uZmlnKTsKKyAgICB2b2lkIHNldFNlYXJjaGluZ0Zv ck5vZGUoRXJyb3JTdHJpbmcmLCBib29sIGVuYWJsZWQsIGNvbnN0IEpTT046Ok9iamVjdCogaGln aGxpZ2h0Q29uZmlnLCBib29sIHNob3dSdWxlcnMpOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxIaWdo bGlnaHRDb25maWc+IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoRXJyb3JTdHJp bmcmLCBjb25zdCBKU09OOjpPYmplY3QqIGhpZ2hsaWdodEluc3BlY3Rvck9iamVjdCk7CiAKICAg ICAvLyBOb2RlLXJlbGF0ZWQgbWV0aG9kcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CmluZGV4IGY5N2MxODhjYjMxMTI4ZGJiZDVjYWYxZThjOGFmZDZmNDRjNGY1M2QuLmUwNTZkMThj NmNkMDllODMxY2RiMzEyYjQzZmVmOTc1NTRiNDg5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwpAQCAtMzcyLDYgKzM3Miw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkVkaXQgY29u ZmlndXJhdGlvbiJdID0gIkVkaXQgY29uZmlndXJhdGlvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJF ZGl0IGN1c3RvbSBncmFkaWVudCJdID0gIkVkaXQgY3VzdG9tIGdyYWRpZW50IjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkVkaXRpbmcgYXVkaXRzIl0gPSAiRWRpdGluZyBhdWRpdHMiOwogbG9jYWxpemVk U3RyaW5nc1siRWxlbWVudCJdID0gIkVsZW1lbnQiOworbG9jYWxpemVkU3RyaW5nc1siRWxlbWVu dCBTZWxlY3Rpb246Il0gPSAiRWxlbWVudCBTZWxlY3Rpb246IjsKIGxvY2FsaXplZFN0cmluZ3Nb IkVsZW1lbnQgY2xpcHMgY29tcG9zaXRpbmcgZGVzY2VuZGFudHMiXSA9ICJFbGVtZW50IGNsaXBz IGNvbXBvc2l0aW5nIGRlc2NlbmRhbnRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVsZW1lbnQgaGFz IENTUyBibGVuZGluZyBhcHBsaWVkIGFuZCBjb21wb3NpdGVkIGRlc2NlbmRhbnRzIl0gPSAiRWxl bWVudCBoYXMgQ1NTIGJsZW5kaW5nIGFwcGxpZWQgYW5kIGNvbXBvc2l0ZWQgZGVzY2VuZGFudHMi OwogbG9jYWxpemVkU3RyaW5nc1siRWxlbWVudCBoYXMgQ1NTIGZpbHRlcnMgYXBwbGllZCJdID0g IkVsZW1lbnQgaGFzIENTUyBmaWx0ZXJzIGFwcGxpZWQiOwpAQCAtOTgzLDYgKzk4NCw3IEBAIGxv Y2FsaXplZFN0cmluZ3NbIlNob3cgbmV0d29yayBpbmZvcm1hdGlvbiJdID0gIlNob3cgbmV0d29y ayBpbmZvcm1hdGlvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IG9ubHkgZm9yIHNlbGVjdGVk IG5vZGUiXSA9ICJTaG93IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUiOwogbG9jYWxpemVkU3RyaW5n c1siU2hvdyBwYWdlIGxvYWQgdGltaW5nIl0gPSAiU2hvdyBwYWdlIGxvYWQgdGltaW5nIjsKIGxv Y2FsaXplZFN0cmluZ3NbIlNob3cgcGFnZSByZXNvdXJjZXMiXSA9ICJTaG93IHBhZ2UgcmVzb3Vy Y2VzIjsKK2xvY2FsaXplZFN0cmluZ3NbIlNob3cgcGFnZSBydWxlcnMgYW5kIG5vZGUgYm9yZGVy IGxpbmVzIl0gPSAiU2hvdyBwYWdlIHJ1bGVycyBhbmQgbm9kZSBib3JkZXIgbGluZXMiOwogbG9j YWxpemVkU3RyaW5nc1siU2hvdyBzaGFkb3cgRE9NIG5vZGVzIl0gPSAiU2hvdyBzaGFkb3cgRE9N IG5vZGVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMp Il0gPSAiU2hvdyB0aGUgZGV0YWlscyBzaWRlYmFyICglcykiOwogbG9jYWxpemVkU3RyaW5nc1si U2hvdyB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiXSA9ICJTaG93IHRoZSBuYXZpZ2F0aW9u IHNpZGViYXIgKCVzKSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXggZjI3NjkxYThjNmU3N2M0MDFlMmUyNzBhYTAxMzA5 ZmVmNzc3ZjlkNS4uYmZhOTgzODA2MzU5ZTIyMDgzODYzYjdmZTZkYzBlNmZkZTJhNTBkMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5n LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGlu Zy5qcwpAQCAtMTY2LDYgKzE2Niw3IEBAIFdJLnNldHRpbmdzID0gewogICAgIHNob3dKYXZhU2Ny aXB0VHlwZUluZm9ybWF0aW9uOiBuZXcgV0kuU2V0dGluZygic2hvdy1qYXZhc2NyaXB0LXR5cGUt aW5mb3JtYXRpb24iLCBmYWxzZSksCiAgICAgc2hvd1BhaW50UmVjdHM6IG5ldyBXSS5TZXR0aW5n KCJzaG93LXBhaW50LXJlY3RzIiwgZmFsc2UpLAogICAgIHNob3dSdWxlcnM6IG5ldyBXSS5TZXR0 aW5nKCJzaG93LXJ1bGVycyIsIGZhbHNlKSwKKyAgICBzaG93UnVsZXJzRHVyaW5nRWxlbWVudFNl bGVjdGlvbjogbmV3IFdJLlNldHRpbmcoInNob3ctcnVsZXJzLWR1cmluZy1lbGVtZW50LXNlbGVj dGlvbiIsIHRydWUpLAogICAgIHNob3dTY29wZUNoYWluT25QYXVzZTogbmV3IFdJLlNldHRpbmco InNob3ctc2NvcGUtY2hhaW4tc2lkZWJhciIsIHRydWUpLAogICAgIHNob3dTaGFkb3dET006IG5l dyBXSS5TZXR0aW5nKCJzaG93LXNoYWRvdy1kb20iLCBmYWxzZSksCiAgICAgc2hvd1doaXRlc3Bh Y2VDaGFyYWN0ZXJzOiBuZXcgV0kuU2V0dGluZygic2hvdy13aGl0ZXNwYWNlLWNoYXJhY3RlcnMi LCBmYWxzZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwppbmRleCA3YTkxYjNmZWEzNzM4NWVh YjJkYzFmODBjYjFmMTM0Y2RjOTFiYjg5Li45NmE2YTIyODgxMzE2MGE4ZGI5NTcyZjEwMmQyZWFj MTIwM2VkZmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKQEAgLTU0MCw3ICs1NDAsMTIg QEAgV0kuRE9NTWFuYWdlciA9IGNsYXNzIERPTU1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAg ICAgICAgaWYgKGVuYWJsZWQgPT09IHRoaXMuX2luc3BlY3RNb2RlRW5hYmxlZCkKICAgICAgICAg ICAgIHJldHVybjsKIAotICAgICAgICBET01BZ2VudC5zZXRJbnNwZWN0TW9kZUVuYWJsZWQoZW5h YmxlZCwgdGhpcy5fYnVpbGRIaWdobGlnaHRDb25maWcoKSwgKGVycm9yKSA9PiB7CisgICAgICAg IGxldCBjb21tYW5kQXJndW1lbnRzID0geworICAgICAgICAgICAgZW5hYmxlZCwKKyAgICAgICAg ICAgIGhpZ2hsaWdodENvbmZpZzogdGhpcy5fYnVpbGRIaWdobGlnaHRDb25maWcoKSwKKyAgICAg ICAgICAgIHNob3dSdWxlcnM6IFdJLnNldHRpbmdzLnNob3dSdWxlcnNEdXJpbmdFbGVtZW50U2Vs ZWN0aW9uLnZhbHVlLAorICAgICAgICB9OworICAgICAgICBET01BZ2VudC5zZXRJbnNwZWN0TW9k ZUVuYWJsZWQuaW52b2tlKGNvbW1hbmRBcmd1bWVudHMsIChlcnJvcikgPT4gewogICAgICAgICAg ICAgdGhpcy5faW5zcGVjdE1vZGVFbmFibGVkID0gZXJyb3IgPyBmYWxzZSA6IGVuYWJsZWQ7CiAg ICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5ET01NYW5hZ2VyLkV2 ZW50Lkluc3BlY3RNb2RlU3RhdGVDaGFuZ2VkKTsKICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0 dGluZ3NUYWJDb250ZW50Vmlldy5qcwppbmRleCA5NjQ2YTI2ZTgwYWZkZmE2NGI4ZWU4MDNiY2My YThiZWU4ZTVlMjY4Li4zZWM5NTYzM2MxMjQyMWU4MWVkZDZmMGQ1MGNlYWE0YWZjODcwMWE5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKQEAgLTIyMiw2ICsyMjIsMTAg QEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKIAogICAgICAgICBnZW5lcmFsU2V0dGluZ3NWaWV3 LmFkZFNlcGFyYXRvcigpOwogCisgICAgICAgIGdlbmVyYWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGlu ZyhXSS5VSVN0cmluZygiRWxlbWVudCBTZWxlY3Rpb246IiksIFdJLnNldHRpbmdzLnNob3dSdWxl cnNEdXJpbmdFbGVtZW50U2VsZWN0aW9uLCBXSS5VSVN0cmluZygiU2hvdyBwYWdlIHJ1bGVycyBh bmQgbm9kZSBib3JkZXIgbGluZXMiKSk7CisKKyAgICAgICAgZ2VuZXJhbFNldHRpbmdzVmlldy5h ZGRTZXBhcmF0b3IoKTsKKwogICAgICAgICBjb25zdCB6b29tTGV2ZWxzID0gWzAuNiwgMC44LCAx LCAxLjIsIDEuNCwgMS42LCAxLjgsIDIsIDIuMiwgMi40XTsKICAgICAgICAgY29uc3Qgem9vbVZh bHVlcyA9IHpvb21MZXZlbHMubWFwKChsZXZlbCkgPT4gW2xldmVsLCBOdW1iZXIucGVyY2VudGFn ZVN0cmluZyhsZXZlbCwgMCldKTsKIAo=