141622 2015-02-15 11:24:17 -0800 Web Inspector: remove unused XHR replay code 2015-02-25 16:37:30 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 0 burg burg commit-queue graouts japhet joepeck jonowells mattbaker nvasilyev sabouhallawa timothy webkit-bug-importer oldest_to_newest 1069319 0 burg 2015-02-15 11:24:17 -0800 It hasn't been used since the new frontend. 1069320 1 webkit-bug-importer 2015-02-15 11:24:32 -0800 <rdar://problem/19840911> 1069332 2 246625 burg 2015-02-15 15:28:17 -0800 Created attachment 246625 Proposed Fix 1069336 3 246625 timothy 2015-02-15 17:10:22 -0800 Comment on attachment 246625 Proposed Fix Nikita and I have been considering adding it to the UI. But I wouldn't want to limit it to XHR. 1069337 4 burg 2015-02-15 17:31:51 -0800 (In reply to comment #3) > Comment on attachment 246625 [details] > Proposed Fix > > Nikita and I have been considering adding it to the UI. But I wouldn't want > to limit it to XHR. It's highly likely you want to revisit the design of NetworkResourcesData, it is very crufty and written in the era before NetworkProcess etc. It should be much easier to get and manage loader data now. 1069347 5 246625 commit-queue 2015-02-15 18:17:48 -0800 Comment on attachment 246625 Proposed Fix Clearing flags on attachment: 246625 Committed r180132: <http://trac.webkit.org/changeset/180132> 1069348 6 commit-queue 2015-02-15 18:17:53 -0800 All reviewed patches have been landed. Closing bug. 1069350 7 sabouhallawa 2015-02-15 18:21:49 -0800 Committed r180133: <http://trac.webkit.org/changeset/180133> 1069357 8 burg 2015-02-15 18:42:47 -0800 (In reply to comment #7) > Committed r180133: <http://trac.webkit.org/changeset/180133> Said, I'm not sure what you intended to do, but you reused this commit's message for something to do with SVG code. Please figure out what's going on, this is the second time I've seen your commits do this. 246625 2015-02-15 15:28:17 -0800 2015-02-15 18:17:48 -0800 Proposed Fix bug-141622-20150215152813.patch text/plain 33541 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw Y2FhOTIzNWY2NjMzZGY4OGE3ZjJjYWJjYjU4MjlkYmE4ZWU4NzExLi4yNjUxOGMyZTJkODM0YTEz MmFmZjljNmViODFjNzJiZjVhYTY1MTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxNS0wMi0xNSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBYSFIgcmVwbGF5 IGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MTYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL3Byb3RvY29sL05ldHdvcmsuanNvbjogcmVtb3ZlIFhIUiByZXBsYXkgbWV0aG9k cy4KKwogMjAxNS0wMi0wOSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHNvbWUgdW5uZWNlc3NhcnkgSW5zcGVj dG9yIHByZWZpeGVzIGZyb20gY2xhc3MgbmFtZXMgaW4gSW5zcGVjdG9yIG5hbWVzcGFjZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDljM2ZmNjc1ZTk0MGFhMThmNWI4YjgzMGIzZDM4MTBkMTQ2YWNkODQuLjA3YWJm MDE0NTg3Y2ZlMTdiZjMyZDczYTQ0NzQ5YTY3NWEwOTU0ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSw1MyBAQAorMjAxNS0wMi0xNSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5l ZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBYSFIgcmVwbGF5IGNv ZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTYy MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFhIUiBS ZXBsYXkgZnVuY3Rpb25hbGl0eSBiZWNhbWUgdW51c2VkIHdpdGggdGhlIGxhc3QgZnJvbnRlbmQg cmV3cml0ZS4KKyAgICAgICAgUmVtb3ZlIGluc3RydW1lbnRhdGlvbiBhbmQgZGF0YSBzdG9yYWdl IGNsYXNzZXMgb25seSB1c2VkIGJ5IHRoaXMgZmVhdHVyZS4KKworICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjpkb2N1bWVudFRocmVhZGFibGVMb2FkZXJTdGFydGVkTG9hZGlu Z0ZvckNsaWVudEltcGwpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjp3aWxsTG9hZFhIUkltcGwpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRGYWlsWEhSTG9hZGluZ0ltcGwpOiBEZWxl dGVkLgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyU3RhcnRlZExvYWRpbmdGb3JDbGllbnQpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsTG9hZFhIUik6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxYSFJMb2Fk aW5nKTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRMb2Fk UmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6ZGlkRmluaXNoWEhSTG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JSZXNvdXJjZUFnZW50Ojpkb2N1bWVudFRocmVhZGFibGVMb2FkZXJTdGFydGVkTG9hZGlu Z0ZvckNsaWVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZUFnZW50Ojp3aWxsTG9hZFhIUik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JSZXNvdXJjZUFnZW50OjpkaWRGYWlsWEhSTG9hZGluZyk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXBsYXlYSFIpOiBEZWxldGVkLgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50Lmg6CisgICAgICAgICogaW5z cGVjdG9yL05ldHdvcmtSZXNvdXJjZXNEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdv cmtSZXNvdXJjZXNEYXRhOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpYSFJSZXBsYXlEYXRh OjpjcmVhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6WEhSUmVwbGF5RGF0YTo6WEhS UmVwbGF5RGF0YSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrUmVzb3VyY2Vz RGF0YTo6eGhyUmVwbGF5RGF0YSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpOZXR3b3Jr UmVzb3VyY2VzRGF0YTo6c2V0WEhSUmVwbGF5RGF0YSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpOZXR3b3JrUmVzb3VyY2VzRGF0YTo6cmV1c2VYSFJSZXBsYXlEYXRhKTogRGVsZXRlZC4K KyAgICAgICAgKiBpbnNwZWN0b3IvTmV0d29ya1Jlc291cmNlc0RhdGEuaDoKKyAgICAgICAgKFdl YkNvcmU6OlhIUlJlcGxheURhdGE6Om1ldGhvZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpYSFJSZXBsYXlEYXRhOjp1cmwpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6WEhSUmVw bGF5RGF0YTo6YXN5bmMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6WEhSUmVwbGF5RGF0 YTo6Zm9ybURhdGEpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6WEhSUmVwbGF5RGF0YTo6 aGVhZGVycyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpYSFJSZXBsYXlEYXRhOjppbmNs dWRlQ3JlZGVudGlhbHMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1Jlc291 cmNlc0RhdGE6OlJlc291cmNlRGF0YTo6eGhyUmVwbGF5RGF0YSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpOZXR3b3JrUmVzb3VyY2VzRGF0YTo6UmVzb3VyY2VEYXRhOjpzZXRYSFJSZXBs YXlEYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bG9h ZFJlcXVlc3QpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3Jl OjpYTUxIdHRwUmVxdWVzdDo6aW50ZXJuYWxBYm9ydCk6CisgICAgICAgIChXZWJDb3JlOjpYTUxI dHRwUmVxdWVzdDo6c2VuZEZvckluc3BlY3RvclhIUlJlcGxheSk6IERlbGV0ZWQuCisgICAgICAg ICogeG1sL1hNTEh0dHBSZXF1ZXN0Lmg6CisKIDIwMTUtMDItMTUgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgTW9yZSBidWlsZCBmaXhpbmcuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwppbmRleCA5NWJhMDU3MzI0YjVlNjc2MzQ4NThlNzFhNGYxNzA5ZjNhYTFk YjAzLi5lOGFjOGRiMzI3ZWIyY2RhNzg2ZTEzY2JkNDY5ZDdmZWEyODcyMGNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wMi0xNSAgQnJpYW4gSi4gQnVy ZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVt b3ZlIHVudXNlZCBYSFIgcmVwbGF5IGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MTYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvNy4wL0lu c3BlY3RvckJhY2tlbmRDb21tYW5kcy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3Rv Y29sL0xlZ2FjeS84LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzOgorICAgICAgICAqIFZl cnNpb25zL0luc3BlY3Rvci1pT1MtNy4wLmpzb246CisgICAgICAgICogVmVyc2lvbnMvSW5zcGVj dG9yLWlPUy04LjAuanNvbjoKKwogMjAxNS0wMi0xNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBzcGVjaWZpY2l0 eSBhcHByb3hpbWF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3Byb3RvY29sL05ldHdvcmsuanNvbiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcHJvdG9jb2wvTmV0d29yay5qc29uCmluZGV4IGUwYTUzOWM0YTBiNjA0ODg1ZjIyYWFkNTYw MzU4MjAyM2JiYWM4YWQuLmRlMTQxZDIxNDMxNmM5MDRkZDFiYWM0MTEyOGJlNTE2OTMwMDgyN2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvTmV0 d29yay5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wv TmV0d29yay5qc29uCkBAIC0xNTEsMTMgKzE1MSw2IEBACiAgICAgICAgICAgICBdCiAgICAgICAg IH0sCiAgICAgICAgIHsKLSAgICAgICAgICAgICJuYW1lIjogInJlcGxheVhIUiIsCi0gICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiVGhpcyBtZXRob2Qgc2VuZHMgYSBuZXcgWE1MSHR0cFJlcXVl c3Qgd2hpY2ggaXMgaWRlbnRpY2FsIHRvIHRoZSBvcmlnaW5hbCBvbmUuIFRoZSBmb2xsb3dpbmcg cGFyYW1ldGVycyBzaG91bGQgYmUgaWRlbnRpY2FsOiBtZXRob2QsIHVybCwgYXN5bmMsIHJlcXVl c3QgYm9keSwgZXh0cmEgaGVhZGVycywgd2l0aENyZWRlbnRpYWxzIGF0dHJpYnV0ZSwgdXNlciwg cGFzc3dvcmQuIiwKLSAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAicmVxdWVzdElkIiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRlc2NyaXB0aW9u IjogIklkZW50aWZpZXIgb2YgWEhSIHRvIHJlcGxheS4iIH0KLSAgICAgICAgICAgIF0KLSAgICAg ICAgfSwKLSAgICAgICAgewogICAgICAgICAgICAgIm5hbWUiOiAiY2FuQ2xlYXJCcm93c2VyQ2Fj aGUiLAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlRlbGxzIHdoZXRoZXIgY2xlYXJpbmcg YnJvd3NlciBjYWNoZSBpcyBzdXBwb3J0ZWQuIiwKICAgICAgICAgICAgICJyZXR1cm5zIjogWwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRh dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmNwcAppbmRleCA5YzAxYTQzZDZjOGNmOWIzMzFjYjhjMmJkMmY2N2M2MzM2YWQ1ZTFlLi5l NjBmMGQ2NDc2NGY3OTY5NDIxNGQ5ZGQ0YTljMmM3ZjlhYTcyODIzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApAQCAt NjQ2LDI0ICs2NDYsNiBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmFpbExv YWRpbmdJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbgogICAgICAgICBjb25zb2xl QWdlbnQtPmRpZEZhaWxMb2FkaW5nKGlkZW50aWZpZXIsIGVycm9yKTsgLy8gVGhpcyBzaG91bGQg Y29tZSBBRlRFUiByZXNvdXJjZSBub3RpZmljYXRpb24sIGZyb250LWVuZCByZWxpZXMgb24gdGhp cy4KIH0KIAotdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRvY3VtZW50VGhyZWFkYWJs ZUxvYWRlclN0YXJ0ZWRMb2FkaW5nRm9yQ2xpZW50SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBp bnN0cnVtZW50aW5nQWdlbnRzLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFRocmVhZGFibGVM b2FkZXJDbGllbnQqIGNsaWVudCkKLXsKLSAgICBpZiAoSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCog cmVzb3VyY2VBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMuaW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dCgpKQotICAgICAgICByZXNvdXJjZUFnZW50LT5kb2N1bWVudFRocmVhZGFibGVMb2FkZXJTdGFy dGVkTG9hZGluZ0ZvckNsaWVudChpZGVudGlmaWVyLCBjbGllbnQpOwotfQotCi12b2lkIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbExvYWRYSFJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMm IGluc3RydW1lbnRpbmdBZ2VudHMsIFRocmVhZGFibGVMb2FkZXJDbGllbnQqIGNsaWVudCwgY29u c3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFVSTCYgdXJsLCBib29sIGFzeW5jLCBSZWZQdHI8Rm9y bURhdGE+JiYgZm9ybURhdGEsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlcnMsIGJvb2wgaW5j bHVkZUNyZWRlbnRpYWxzKQotewotICAgIGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNv dXJjZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0b3JSZXNvdXJjZUFnZW50KCkp Ci0gICAgICAgIHJlc291cmNlQWdlbnQtPndpbGxMb2FkWEhSKGNsaWVudCwgbWV0aG9kLCB1cmws IGFzeW5jLCBXVEY6Om1vdmUoZm9ybURhdGEpLCBoZWFkZXJzLCBpbmNsdWRlQ3JlZGVudGlhbHMp OwotfQotCi12b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmFpbFhIUkxvYWRpbmdJ bXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIFRocmVhZGFibGVM b2FkZXJDbGllbnQqIGNsaWVudCkKLXsKLSAgICBpZiAoSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCog cmVzb3VyY2VBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMuaW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dCgpKQotICAgICAgICByZXNvdXJjZUFnZW50LT5kaWRGYWlsWEhSTG9hZGluZyhjbGllbnQpOwot fQotCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoWEhSTG9hZGluZ0lt cGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgVGhyZWFkYWJsZUxv YWRlckNsaWVudCogY2xpZW50LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmlu ZyYgc291cmNlU3RyaW5nLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBzZW5kVVJM LCB1bnNpZ25lZCBzZW5kTGluZU51bWJlciwgdW5zaWduZWQgc2VuZENvbHVtbk51bWJlcikKIHsK ICAgICBpZiAoV2ViQ29uc29sZUFnZW50KiBjb25zb2xlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdl bnRzLndlYkNvbnNvbGVBZ2VudCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmluZGV4IDYxMGM0Y2RlNDg5NzRiM2ZiYzg1MjFi OTNmNzdlZTY5NjUwMmY2ZTYuLmFkOGRlNmJmNDY0NGEyZGUwNmYzOGZkZTVjMTMwYmVhN2UzYWNj YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVt ZW50YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmgKQEAgLTE4Myw5ICsxODMsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQg ZGlkUmVjZWl2ZURhdGEoRnJhbWUqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IGNo YXIqIGRhdGEsIGludCBkYXRhTGVuZ3RoLCBpbnQgZW5jb2RlZERhdGFMZW5ndGgpOwogICAgIHN0 YXRpYyB2b2lkIGRpZEZpbmlzaExvYWRpbmcoRnJhbWUqLCBEb2N1bWVudExvYWRlciosIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlIGZpbmlzaFRpbWUpOwogICAgIHN0YXRpYyB2b2lk IGRpZEZhaWxMb2FkaW5nKEZyYW1lKiwgRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKLSAgICBzdGF0aWMgdm9pZCBkb2N1bWVu dFRocmVhZGFibGVMb2FkZXJTdGFydGVkTG9hZGluZ0ZvckNsaWVudChEb2N1bWVudCYsIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCopOwotICAgIHN0YXRp YyB2b2lkIHdpbGxMb2FkWEhSKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBUaHJlYWRhYmxlTG9h ZGVyQ2xpZW50KiwgY29uc3QgU3RyaW5nJiwgY29uc3QgVVJMJiwgYm9vbCwgUmVmUHRyPEZvcm1E YXRhPiYmLCBjb25zdCBIVFRQSGVhZGVyTWFwJiwgYm9vbCk7Ci0gICAgc3RhdGljIHZvaWQgZGlk RmFpbFhIUkxvYWRpbmcoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFRocmVhZGFibGVMb2FkZXJD bGllbnQqKTsKICAgICBzdGF0aWMgdm9pZCBkaWRGaW5pc2hYSFJMb2FkaW5nKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqLCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiwgdW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZVN0cmluZywgY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IFN0cmluZyYgc2VuZFVSTCwgdW5zaWduZWQgc2VuZExpbmVOdW1iZXIsIHVuc2lnbmVkIHNl bmRDb2x1bW5OdW1iZXIpOwogICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVYSFJSZXNwb25zZShT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKICAgICBz dGF0aWMgdm9pZCB3aWxsTG9hZFhIUlN5bmNocm9ub3VzbHkoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCopOwpAQCAtMzY1LDcgKzM2Miw2IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgZGlkUmVj ZWl2ZURhdGFJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCB1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGNvbnN0IGNoYXIqIGRhdGEsIGludCBkYXRhTGVuZ3RoLCBpbnQgZW5jb2RlZERhdGFMZW5n dGgpOwogICAgIHN0YXRpYyB2b2lkIGRpZEZpbmlzaExvYWRpbmdJbXBsKEluc3RydW1lbnRpbmdB Z2VudHMmLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiwgZG91Ymxl IGZpbmlzaFRpbWUpOwogICAgIHN0YXRpYyB2b2lkIGRpZEZhaWxMb2FkaW5nSW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlcios IGNvbnN0IFJlc291cmNlRXJyb3ImKTsKLSAgICBzdGF0aWMgdm9pZCBkb2N1bWVudFRocmVhZGFi bGVMb2FkZXJTdGFydGVkTG9hZGluZ0ZvckNsaWVudEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYs IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCopOwogICAg IHN0YXRpYyB2b2lkIHdpbGxMb2FkWEhSSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgVGhyZWFk YWJsZUxvYWRlckNsaWVudCosIGNvbnN0IFN0cmluZyYsIGNvbnN0IFVSTCYsIGJvb2wsIFJlZlB0 cjxGb3JtRGF0YT4mJiwgY29uc3QgSFRUUEhlYWRlck1hcCYsIGJvb2wpOwogICAgIHN0YXRpYyB2 b2lkIGRpZEZhaWxYSFJMb2FkaW5nSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgVGhyZWFkYWJs ZUxvYWRlckNsaWVudCopOwogICAgIHN0YXRpYyB2b2lkIGRpZEZpbmlzaFhIUkxvYWRpbmdJbXBs KEluc3RydW1lbnRpbmdBZ2VudHMmLCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiwgdW5zaWduZWQg bG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZVN0cmluZywgY29uc3QgU3RyaW5n JiB1cmwsIGNvbnN0IFN0cmluZyYgc2VuZFVSTCwgdW5zaWduZWQgc2VuZExpbmVOdW1iZXIsIHVu c2lnbmVkIHNlbmRDb2x1bW5OdW1iZXIpOwpAQCAtOTQ5LDI1ICs5NDUsNiBAQCBpbmxpbmUgdm9p ZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxMb2FkaW5nKEZyYW1lKiBmcmFtZSwg RG9jdW1lbnRMb2FkZQogICAgICAgICBkaWRGYWlsTG9hZGluZ0ltcGwoKmluc3RydW1lbnRpbmdB Z2VudHMsIGlkZW50aWZpZXIsIGxvYWRlciwgZXJyb3IpOwogfQogCi1pbmxpbmUgdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRvY3VtZW50VGhyZWFkYWJsZUxvYWRlclN0YXJ0ZWRMb2Fk aW5nRm9yQ2xpZW50KERvY3VtZW50JiBkb2N1bWVudCwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQpCi17Ci0gICAgaWYgKEluc3RydW1lbnRp bmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9j dW1lbnQoZG9jdW1lbnQpKQotICAgICAgICBkb2N1bWVudFRocmVhZGFibGVMb2FkZXJTdGFydGVk TG9hZGluZ0ZvckNsaWVudEltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIGlkZW50aWZpZXIsIGNs aWVudCk7Ci19Ci0KLWlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbExv YWRYSFIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgVGhyZWFkYWJsZUxvYWRlckNs aWVudCogY2xpZW50LCBjb25zdCBTdHJpbmcmIG1ldGhvZCwgY29uc3QgVVJMJiB1cmwsIGJvb2wg YXN5bmMsIFJlZlB0cjxGb3JtRGF0YT4mJiBmb3JtRGF0YSwgY29uc3QgSFRUUEhlYWRlck1hcCYg aGVhZGVycywgYm9vbCBpbmNsdWRlQ3JlZGVudGlhbHMpCi17Ci0gICAgaWYgKEluc3RydW1lbnRp bmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yQ29u dGV4dChjb250ZXh0KSkKLSAgICAgICAgd2lsbExvYWRYSFJJbXBsKCppbnN0cnVtZW50aW5nQWdl bnRzLCBjbGllbnQsIG1ldGhvZCwgdXJsLCBhc3luYywgV1RGOjptb3ZlKGZvcm1EYXRhKSwgaGVh ZGVycywgaW5jbHVkZUNyZWRlbnRpYWxzKTsKLX0KLQotaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpkaWRGYWlsWEhSTG9hZGluZyhTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBj b250ZXh0LCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQpCi17Ci0gICAgaWYgKEluc3Ry dW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRz Rm9yQ29udGV4dChjb250ZXh0KSkKLSAgICAgICAgZGlkRmFpbFhIUkxvYWRpbmdJbXBsKCppbnN0 cnVtZW50aW5nQWdlbnRzLCBjbGllbnQpOwotfQotCi0KIGlubGluZSB2b2lkIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoWEhSTG9hZGluZyhTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiBjb250ZXh0LCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQsIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcsIGNvbnN0IFN0cmluZyYgdXJs LCBjb25zdCBTdHJpbmcmIHNlbmRVUkwsIHVuc2lnbmVkIHNlbmRMaW5lTnVtYmVyLCB1bnNpZ25l ZCBzZW5kQ29sdW1uTnVtYmVyKQogewogICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0 cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50c0ZvckNvbnRleHQoY29udGV4dCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VB Z2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dC5jcHAKaW5kZXggZjliYmY4MDhlMGIyMTYyYjZlYzgxODNhNjA3OThhZTQwYjUxOTE0OS4uMjZh YzI5YmFiMmMyYWMzN2MyN2E2ZDNmYzllYjA1NjU4MzE5YzI5MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcApAQCAtNjEsNyAr NjEsNiBAQAogI2luY2x1ZGUgIlRocmVhZGFibGVMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJV UkwuaCIKICNpbmNsdWRlICJXZWJTb2NrZXRGcmFtZS5oIgotI2luY2x1ZGUgIlhNTEh0dHBSZXF1 ZXN0LmgiCiAjaW5jbHVkZSA8aW5zcGVjdG9yL0lkZW50aWZpZXJzRmFjdG9yeS5oPgogI2luY2x1 ZGUgPGluc3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMuaD4KICNpbmNsdWRlIDxpbnNwZWN0b3IvU2Ny aXB0Q2FsbFN0YWNrLmg+CkBAIC00NDgsMTAgKzQ0Nyw2IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKERvY3VtZW50TG9hZGVyJiBs b2FkCiAgICAgU3RyaW5nIHJlcXVlc3RJZCA9IElkZW50aWZpZXJzRmFjdG9yeTo6cmVxdWVzdElk KGlkZW50aWZpZXIpOwogICAgIG1fcmVzb3VyY2VzRGF0YS0+cmVzb3VyY2VDcmVhdGVkKHJlcXVl c3RJZCwgbG9hZGVySWQpOwogICAgIG1fcmVzb3VyY2VzRGF0YS0+YWRkQ2FjaGVkUmVzb3VyY2Uo cmVxdWVzdElkLCAmcmVzb3VyY2UpOwotICAgIGlmIChyZXNvdXJjZS50eXBlKCkgPT0gQ2FjaGVk UmVzb3VyY2U6OlJhd1Jlc291cmNlKSB7Ci0gICAgICAgIFN0cmluZyByYXdSZXF1ZXN0SWQgPSBJ ZGVudGlmaWVyc0ZhY3Rvcnk6OnJlcXVlc3RJZChkb3duY2FzdDxDYWNoZWRSYXdSZXNvdXJjZT4o cmVzb3VyY2UpLmlkZW50aWZpZXIoKSk7Ci0gICAgICAgIG1fcmVzb3VyY2VzRGF0YS0+cmV1c2VY SFJSZXBsYXlEYXRhKHJlcXVlc3RJZCwgcmF3UmVxdWVzdElkKTsKLSAgICB9CiAKICAgICBSZWZQ dHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6TmV0d29yazo6SW5pdGlhdG9yPiBpbml0aWF0b3JPYmpl Y3QgPSBidWlsZEluaXRpYXRvck9iamVjdChsb2FkZXIuZnJhbWUoKSA/IGxvYWRlci5mcmFtZSgp LT5kb2N1bWVudCgpIDogbnVsbHB0cik7CiAKQEAgLTQ2OCwzOSArNDYzLDEyIEBAIHZvaWQgSW5z cGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZVNjcmlwdFJlc3BvbnNlKHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllcikKICAgICBtX3Jlc291cmNlc0RhdGEtPnNldFJlc291cmNlVHlwZShJZGVu dGlmaWVyc0ZhY3Rvcnk6OnJlcXVlc3RJZChpZGVudGlmaWVyKSwgSW5zcGVjdG9yUGFnZUFnZW50 OjpTY3JpcHRSZXNvdXJjZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZG9j dW1lbnRUaHJlYWRhYmxlTG9hZGVyU3RhcnRlZExvYWRpbmdGb3JDbGllbnQodW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyLCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQpCi17Ci0gICAgaWYg KCFjbGllbnQpCi0gICAgICAgIHJldHVybjsKLQotICAgIFBlbmRpbmdYSFJSZXBsYXlEYXRhTWFw OjppdGVyYXRvciBpdCA9IG1fcGVuZGluZ1hIUlJlcGxheURhdGEuZmluZChjbGllbnQpOwotICAg IGlmIChpdCA9PSBtX3BlbmRpbmdYSFJSZXBsYXlEYXRhLmVuZCgpKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBYSFJSZXBsYXlEYXRhKiB4aHJSZXBsYXlEYXRhID0gaXQtPnZhbHVlLmdldCgpOwot ICAgIFN0cmluZyByZXF1ZXN0SWQgPSBJZGVudGlmaWVyc0ZhY3Rvcnk6OnJlcXVlc3RJZChpZGVu dGlmaWVyKTsKLSAgICBtX3Jlc291cmNlc0RhdGEtPnNldFhIUlJlcGxheURhdGEocmVxdWVzdElk LCB4aHJSZXBsYXlEYXRhKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojp3aWxs TG9hZFhIUihUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYgbWV0 aG9kLCBjb25zdCBVUkwmIHVybCwgYm9vbCBhc3luYywgUmVmUHRyPEZvcm1EYXRhPiYmIGZvcm1E YXRhLCBjb25zdCBIVFRQSGVhZGVyTWFwJiBoZWFkZXJzLCBib29sIGluY2x1ZGVDcmVkZW50aWFs cykKLXsKLSAgICBSZWZQdHI8WEhSUmVwbGF5RGF0YT4geGhyUmVwbGF5RGF0YSA9IFhIUlJlcGxh eURhdGE6OmNyZWF0ZShtZXRob2QsIHVybCwgYXN5bmMsIFdURjo6bW92ZShmb3JtRGF0YSksIGhl YWRlcnMsIGluY2x1ZGVDcmVkZW50aWFscyk7Ci0KLSAgICBtX3BlbmRpbmdYSFJSZXBsYXlEYXRh LnNldChjbGllbnQsIFdURjo6bW92ZSh4aHJSZXBsYXlEYXRhKSk7Ci19Ci0KLXZvaWQgSW5zcGVj dG9yUmVzb3VyY2VBZ2VudDo6ZGlkRmFpbFhIUkxvYWRpbmcoVGhyZWFkYWJsZUxvYWRlckNsaWVu dCogY2xpZW50KQotewotICAgIG1fcGVuZGluZ1hIUlJlcGxheURhdGEucmVtb3ZlKGNsaWVudCk7 Ci19Ci0KLXZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkRmluaXNoWEhSTG9hZGluZyhU aHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBjbGllbnQsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcpCit2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6 OmRpZEZpbmlzaFhIUkxvYWRpbmcoVGhyZWFkYWJsZUxvYWRlckNsaWVudCosIHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcpCiB7CiAgICAgLy8gRm9y IEFzeW5jaHJvbm91cyBYSFJzLCB0aGUgaW5zcGVjdG9yIGNhbiBncmFiIHRoZSBkYXRhIGRpcmVj dGx5IG9mZiBvZiB0aGUgQ2FjaGVkUmVzb3VyY2UuIEZvciBzeW5jIFhIUnMsIHdlIG5lZWQgdG8K ICAgICAvLyBwcm92aWRlIHRoZSBkYXRhIGhlcmUsIHNpbmNlIG5vIENhY2hlZFJlc291cmNlIHdh cyBpbnZvbHZlZC4KICAgICBpZiAobV9sb2FkaW5nWEhSU3luY2hyb25vdXNseSkKICAgICAgICAg bV9yZXNvdXJjZXNEYXRhLT5zZXRSZXNvdXJjZUNvbnRlbnQoSWRlbnRpZmllcnNGYWN0b3J5Ojpy ZXF1ZXN0SWQoaWRlbnRpZmllciksIHNvdXJjZVN0cmluZyk7Ci0gICAgbV9wZW5kaW5nWEhSUmVw bGF5RGF0YS5yZW1vdmUoY2xpZW50KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50 OjpkaWRSZWNlaXZlWEhSUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQpAQCAtNjk0 LDMwICs2NjIsNiBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmdldFJlc3BvbnNlQm9k eShFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNvbnN0IFN0cgogICAgIGVycm9yU3RyaW5nID0g QVNDSUlMaXRlcmFsKCJObyBkYXRhIGZvdW5kIGZvciByZXNvdXJjZSB3aXRoIGdpdmVuIGlkZW50 aWZpZXIiKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXBsYXlYSFIoRXJy b3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCkKLXsKLSAgICBSZWZQdHI8WE1MSHR0 cFJlcXVlc3Q+IHhociA9IFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGUoKm1fcGFnZUFnZW50LT5tYWlu RnJhbWUoKS0+ZG9jdW1lbnQoKSk7Ci0gICAgU3RyaW5nIGFjdHVhbFJlcXVlc3RJZCA9IHJlcXVl c3RJZDsKLQotICAgIFhIUlJlcGxheURhdGEqIHhoclJlcGxheURhdGEgPSBtX3Jlc291cmNlc0Rh dGEtPnhoclJlcGxheURhdGEocmVxdWVzdElkKTsKLSAgICBpZiAoIXhoclJlcGxheURhdGEpCi0g ICAgICAgIHJldHVybjsKLQotICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KHhoclJlcGxheURh dGEtPnVybCgpKTsKLSNpZiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKQotICAgIHJlcXVlc3Qu c2V0RG9tYWluRm9yQ2FjaGVQYXJ0aXRpb24obV9wYWdlQWdlbnQtPm1haW5GcmFtZSgpLT5kb2N1 bWVudCgpLT50b3BPcmlnaW4oKS0+ZG9tYWluRm9yQ2FjaGVQYXJ0aXRpb24oKSk7Ci0jZW5kaWYK LQotICAgIGF1dG8mIG1lbW9yeUNhY2hlID0gTWVtb3J5Q2FjaGU6OnNpbmdsZXRvbigpOwotICAg IGlmIChDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSBtZW1vcnlDYWNoZS5yZXNvdXJj ZUZvclJlcXVlc3QocmVxdWVzdCwgbV9wYWdlQWdlbnQtPnBhZ2UoKS0+c2Vzc2lvbklEKCkpKQot ICAgICAgICBtZW1vcnlDYWNoZS5yZW1vdmUoKmNhY2hlZFJlc291cmNlKTsKLQotICAgIHhoci0+ b3Blbih4aHJSZXBsYXlEYXRhLT5tZXRob2QoKSwgeGhyUmVwbGF5RGF0YS0+dXJsKCksIHhoclJl cGxheURhdGEtPmFzeW5jKCksIElHTk9SRV9FWENFUFRJT04pOwotICAgIGZvciAoY29uc3QgYXV0 byYgaGVhZGVyIDogeGhyUmVwbGF5RGF0YS0+aGVhZGVycygpKQotICAgICAgICB4aHItPnNldFJl cXVlc3RIZWFkZXIoaGVhZGVyLmtleSwgaGVhZGVyLnZhbHVlLCBJR05PUkVfRVhDRVBUSU9OKTsK LSAgICB4aHItPnNlbmRGb3JJbnNwZWN0b3JYSFJSZXBsYXkoeGhyUmVwbGF5RGF0YS0+Zm9ybURh dGEoKSwgSUdOT1JFX0VYQ0VQVElPTik7Ci19Ci0KIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dDo6Y2FuQ2xlYXJCcm93c2VyQ2FjaGUoRXJyb3JTdHJpbmcmLCBib29sKiByZXN1bHQpCiB7CiAg ICAgKnJlc3VsdCA9IG1fY2xpZW50LT5jYW5DbGVhckJyb3dzZXJDYWNoZSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKaW5kZXggODRj M2JmZGNlNGQ4MTE0ZGU1MzY3MDlkZjIxNjA1NDk0YzBlMDQxYS4uNmFjZGUyYjdhM2FkZTZkODVk YjU0MDNlMTQ3ZGVmYTA2Y2FhYmZiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCkBAIC02NCw3ICs2NCw2IEBAIGNsYXNzIFJlc291 cmNlUmVzcG9uc2U7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CiBjbGFzcyBUaHJlYWRhYmxlTG9hZGVy Q2xpZW50OwogY2xhc3MgVVJMOwotY2xhc3MgWEhSUmVwbGF5RGF0YTsKIGNsYXNzIFhNTEh0dHBS ZXF1ZXN0OwogCiAjaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQpAQCAtOTIsOSArOTEsNiBAQCBwdWJs aWM6CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkaW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg RG9jdW1lbnRMb2FkZXImLCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgdm9pZCBkaWRGYWlsTG9h ZGluZyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyJiwgY29uc3QgUmVz b3VyY2VFcnJvciYpOwogICAgIHZvaWQgZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKERv Y3VtZW50TG9hZGVyJiwgQ2FjaGVkUmVzb3VyY2UmKTsKLSAgICB2b2lkIGRvY3VtZW50VGhyZWFk YWJsZUxvYWRlclN0YXJ0ZWRMb2FkaW5nRm9yQ2xpZW50KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmll ciwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCopOwotICAgIHZvaWQgd2lsbExvYWRYSFIoVGhyZWFk YWJsZUxvYWRlckNsaWVudCosIGNvbnN0IFN0cmluZyYgbWV0aG9kLCBjb25zdCBVUkwmLCBib29s IGFzeW5jLCBSZWZQdHI8Rm9ybURhdGE+JiYgYm9keSwgY29uc3QgSFRUUEhlYWRlck1hcCYgaGVh ZGVycywgYm9vbCBpbmNsdWRlQ3JlbmRlbnRpYWxzKTsKLSAgICB2b2lkIGRpZEZhaWxYSFJMb2Fk aW5nKFRocmVhZGFibGVMb2FkZXJDbGllbnQqKTsKICAgICB2b2lkIGRpZEZpbmlzaFhIUkxvYWRp bmcoVGhyZWFkYWJsZUxvYWRlckNsaWVudCosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29u c3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcpOwogICAgIHZvaWQgZGlkUmVjZWl2ZVhIUlJlc3BvbnNl KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CiAgICAgdm9pZCB3aWxsTG9hZFhIUlN5bmNocm9u b3VzbHkoKTsKQEAgLTEyMyw3ICsxMTksNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRp c2FibGUoRXJyb3JTdHJpbmcmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RXh0cmFI VFRQSGVhZGVycyhFcnJvclN0cmluZyYsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rv ck9iamVjdD4mJikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGdldFJlc3BvbnNlQm9keShF cnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgcmVxdWVzdElkLCBTdHJpbmcqIGNvbnRlbnQsIGJv b2wqIGJhc2U2NEVuY29kZWQpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCByZXBsYXlYSFIo RXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCkgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCB2b2lkIGNhbkNsZWFyQnJvd3NlckNhY2hlKEVycm9yU3RyaW5nJiwgYm9vbCopIG92ZXJy aWRlOwogICAgIHZpcnR1YWwgdm9pZCBjbGVhckJyb3dzZXJDYWNoZShFcnJvclN0cmluZyYpIG92 ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBjYW5DbGVhckJyb3dzZXJDb29raWVzKEVycm9yU3Ry aW5nJiwgYm9vbCopIG92ZXJyaWRlOwpAQCAtMTQ4LDggKzE0Myw2IEBAIHByaXZhdGU6CiAKICAg ICBIYXNoU2V0PHVuc2lnbmVkIGxvbmc+IG1faGlkZGVuUmVxdWVzdElkZW50aWZpZXJzOwogCi0g ICAgdHlwZWRlZiBIYXNoTWFwPFRocmVhZGFibGVMb2FkZXJDbGllbnQqLCBSZWZQdHI8WEhSUmVw bGF5RGF0YT4+IFBlbmRpbmdYSFJSZXBsYXlEYXRhTWFwOwotICAgIFBlbmRpbmdYSFJSZXBsYXlE YXRhTWFwIG1fcGVuZGluZ1hIUlJlcGxheURhdGE7CiAgICAgLy8gRklYTUU6IEluc3BlY3RvclJl c291cmNlQWdlbnQgc2hvdWxkIG5vdyBiZSBhd2FyZSBvZiBzdHlsZSByZWNhbGN1bGF0aW9uLgog ICAgIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpOZXR3b3JrOjpJbml0aWF0b3I+IG1fc3R5 bGVSZWNhbGN1bGF0aW9uSW5pdGlhdG9yOwogICAgIGJvb2wgbV9pc1JlY2FsY3VsYXRpbmdTdHls ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2Vz RGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvTmV0d29ya1Jlc291cmNlc0RhdGEu Y3BwCmluZGV4IDUxZWM1ZjI5YTY2ZjAzNzg2NGQwYzA1Yzk1NThkNjk5ZWJlMDQxMGYuLjQyNTE2 Y2Q2NmYxZGRiYjM1ZTExMGI2MzMwZWQ5OGU2YTk2NTJmZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9OZXR3b3JrUmVzb3VyY2VzRGF0YS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJjZXNEYXRhLmNwcApAQCAtNDcsMjMgKzQ3LDYg QEAgdXNpbmcgbmFtZXNwYWNlIEluc3BlY3RvcjsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0K LVJlZjxYSFJSZXBsYXlEYXRhPiBYSFJSZXBsYXlEYXRhOjpjcmVhdGUoY29uc3QgU3RyaW5nICZt ZXRob2QsIGNvbnN0IFVSTCYgdXJsLCBib29sIGFzeW5jLCBSZWZQdHI8Rm9ybURhdGE+JiYgZm9y bURhdGEsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlcnMsIGJvb2wgaW5jbHVkZUNyZWRlbnRp YWxzKQotewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFhIUlJlcGxheURhdGEobWV0aG9kLCB1 cmwsIGFzeW5jLCBXVEY6Om1vdmUoZm9ybURhdGEpLCBoZWFkZXJzLCBpbmNsdWRlQ3JlZGVudGlh bHMpKTsKLX0KLQotCi1YSFJSZXBsYXlEYXRhOjpYSFJSZXBsYXlEYXRhKGNvbnN0IFN0cmluZyAm bWV0aG9kLCBjb25zdCBVUkwmIHVybCwgYm9vbCBhc3luYywgUmVmUHRyPEZvcm1EYXRhPiYmIGZv cm1EYXRhLCBjb25zdCBIVFRQSGVhZGVyTWFwJiBoZWFkZXJzLCBib29sIGluY2x1ZGVDcmVkZW50 aWFscykKLSAgICA6IG1fbWV0aG9kKG1ldGhvZCkKLSAgICAsIG1fdXJsKHVybCkKLSAgICAsIG1f YXN5bmMoYXN5bmMpCi0gICAgLCBtX2Zvcm1EYXRhKFdURjo6bW92ZShmb3JtRGF0YSkpCi0gICAg LCBtX2hlYWRlcnMoaGVhZGVycykKLSAgICAsIG1faW5jbHVkZUNyZWRlbnRpYWxzKGluY2x1ZGVD cmVkZW50aWFscykKLXsKLX0KLQogLy8gUmVzb3VyY2VEYXRhCiBOZXR3b3JrUmVzb3VyY2VzRGF0 YTo6UmVzb3VyY2VEYXRhOjpSZXNvdXJjZURhdGEoY29uc3QgU3RyaW5nJiByZXF1ZXN0SWQsIGNv bnN0IFN0cmluZyYgbG9hZGVySWQpCiAgICAgOiBtX3JlcXVlc3RJZChyZXF1ZXN0SWQpCkBAIC0y NjgsNDYgKzI1MSw2IEBAIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpSZXNvdXJjZURhdGEgY29uc3Qq IE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpkYXRhKGNvbnN0IFN0cmluCiAgICAgcmV0dXJuIHJlc291 cmNlRGF0YUZvclJlcXVlc3RJZChyZXF1ZXN0SWQpOwogfQogCi1YSFJSZXBsYXlEYXRhKiBOZXR3 b3JrUmVzb3VyY2VzRGF0YTo6eGhyUmVwbGF5RGF0YShjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCkK LXsKLSAgICBpZiAobV9yZXVzZWRYSFJSZXBsYXlEYXRhUmVxdWVzdElkcy5jb250YWlucyhyZXF1 ZXN0SWQpKQotICAgICAgICByZXR1cm4geGhyUmVwbGF5RGF0YShtX3JldXNlZFhIUlJlcGxheURh dGFSZXF1ZXN0SWRzLmdldChyZXF1ZXN0SWQpKTsKLQotICAgIFJlc291cmNlRGF0YSogcmVzb3Vy Y2VEYXRhID0gcmVzb3VyY2VEYXRhRm9yUmVxdWVzdElkKHJlcXVlc3RJZCk7Ci0gICAgaWYgKCFy ZXNvdXJjZURhdGEpCi0gICAgICAgIHJldHVybiBudWxscHRyOwotICAgIHJldHVybiByZXNvdXJj ZURhdGEtPnhoclJlcGxheURhdGEoKTsKLX0KLQotdm9pZCBOZXR3b3JrUmVzb3VyY2VzRGF0YTo6 c2V0WEhSUmVwbGF5RGF0YShjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCwgWEhSUmVwbGF5RGF0YSog eGhyUmVwbGF5RGF0YSkKLXsKLSAgICBSZXNvdXJjZURhdGEqIHJlc291cmNlRGF0YSA9IHJlc291 cmNlRGF0YUZvclJlcXVlc3RJZChyZXF1ZXN0SWQpOwotICAgIGlmICghcmVzb3VyY2VEYXRhKSB7 Ci0gICAgICAgIFZlY3RvcjxTdHJpbmc+IHJlc3VsdDsKLSAgICAgICAgUmV1c2VkUmVxdWVzdElk czo6aXRlcmF0b3IgaXQ7Ci0gICAgICAgIFJldXNlZFJlcXVlc3RJZHM6Oml0ZXJhdG9yIGVuZCA9 IG1fcmV1c2VkWEhSUmVwbGF5RGF0YVJlcXVlc3RJZHMuZW5kKCk7Ci0gICAgICAgIGZvciAoaXQg PSBtX3JldXNlZFhIUlJlcGxheURhdGFSZXF1ZXN0SWRzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytp dCkgewotICAgICAgICAgICAgaWYgKGl0LT52YWx1ZSA9PSByZXF1ZXN0SWQpCi0gICAgICAgICAg ICAgICAgc2V0WEhSUmVwbGF5RGF0YShpdC0+a2V5LCB4aHJSZXBsYXlEYXRhKTsKLSAgICAgICAg fQotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgcmVzb3VyY2VEYXRhLT5zZXRYSFJSZXBs YXlEYXRhKHhoclJlcGxheURhdGEpOwotfQotCi12b2lkIE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpy ZXVzZVhIUlJlcGxheURhdGEoY29uc3QgU3RyaW5nJiByZXF1ZXN0SWQsIGNvbnN0IFN0cmluZyYg cmV1c2VkUmVxdWVzdElkKQotewotICAgIFJlc291cmNlRGF0YSogcmV1c2VkUmVzb3VyY2VEYXRh ID0gcmVzb3VyY2VEYXRhRm9yUmVxdWVzdElkKHJldXNlZFJlcXVlc3RJZCk7Ci0gICAgUmVzb3Vy Y2VEYXRhKiByZXNvdXJjZURhdGEgPSByZXNvdXJjZURhdGFGb3JSZXF1ZXN0SWQocmVxdWVzdElk KTsKLSAgICBpZiAoIXJldXNlZFJlc291cmNlRGF0YSB8fCAhcmVzb3VyY2VEYXRhKSB7Ci0gICAg ICAgIG1fcmV1c2VkWEhSUmVwbGF5RGF0YVJlcXVlc3RJZHMuc2V0KHJlcXVlc3RJZCwgcmV1c2Vk UmVxdWVzdElkKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIHJlc291cmNlRGF0YS0+ c2V0WEhSUmVwbGF5RGF0YShyZXVzZWRSZXNvdXJjZURhdGEtPnhoclJlcGxheURhdGEoKSk7Ci19 Ci0KIFZlY3RvcjxTdHJpbmc+IE5ldHdvcmtSZXNvdXJjZXNEYXRhOjpyZW1vdmVDYWNoZWRSZXNv dXJjZShDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UpCiB7CiAgICAgVmVjdG9yPFN0cmlu Zz4gcmVzdWx0OwpAQCAtMzQyLDggKzI4NSw2IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlc0RhdGE6 OmNsZWFyKGNvbnN0IFN0cmluZyYgcHJlc2VydmVkTG9hZGVySWQpCiAgICAgICAgICAgICBkZWxl dGUgcmVzb3VyY2VEYXRhOwogICAgIH0KICAgICBtX3JlcXVlc3RJZFRvUmVzb3VyY2VEYXRhTWFw LnN3YXAocHJlc2VydmVkTWFwKTsKLQotICAgIG1fcmV1c2VkWEhSUmVwbGF5RGF0YVJlcXVlc3RJ ZHMuY2xlYXIoKTsKIH0KIAogTmV0d29ya1Jlc291cmNlc0RhdGE6OlJlc291cmNlRGF0YSogTmV0 d29ya1Jlc291cmNlc0RhdGE6OnJlc291cmNlRGF0YUZvclJlcXVlc3RJZChjb25zdCBTdHJpbmcm IHJlcXVlc3RJZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9OZXR3b3Jr UmVzb3VyY2VzRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJj ZXNEYXRhLmgKaW5kZXggYjI2Y2I4Y2U5ZDQ3M2Y2Y2EzZDM2ODdjYzY5NTM3YzA5NTUyMGRjZi4u ZWRkNzU3OTljY2VkZjFmNzBlYTFhNjY0MTlkMzBmNTNmNDk2ZWRlMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJjZXNEYXRhLmgKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL05ldHdvcmtSZXNvdXJjZXNEYXRhLmgKQEAgLTQ3LDI3ICs0Nyw2 IEBAIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CiBjbGFzcyBU ZXh0UmVzb3VyY2VEZWNvZGVyOwogCi1jbGFzcyBYSFJSZXBsYXlEYXRhIDogcHVibGljIFJlZkNv dW50ZWQ8WEhSUmVwbGF5RGF0YT4gewotcHVibGljOgotICAgIHN0YXRpYyBSZWY8WEhSUmVwbGF5 RGF0YT4gY3JlYXRlKGNvbnN0IFN0cmluZyAmbWV0aG9kLCBjb25zdCBVUkwmLCBib29sIGFzeW5j LCBSZWZQdHI8Rm9ybURhdGE+JiYsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlcnMsIGJvb2wg aW5jbHVkZUNyZWRlbnRpYWxzKTsKLQotICAgIGNvbnN0IFN0cmluZyYgbWV0aG9kKCkgY29uc3Qg eyByZXR1cm4gbV9tZXRob2Q7IH0KLSAgICBjb25zdCBVUkwmIHVybCgpIGNvbnN0IHsgcmV0dXJu IG1fdXJsOyB9Ci0gICAgYm9vbCBhc3luYygpIGNvbnN0IHsgcmV0dXJuIG1fYXN5bmM7IH0KLSAg ICBQYXNzUmVmUHRyPEZvcm1EYXRhPiBmb3JtRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybURh dGE7IH0KLSAgICBjb25zdCBIVFRQSGVhZGVyTWFwJiBoZWFkZXJzKCkgY29uc3QgeyByZXR1cm4g bV9oZWFkZXJzOyB9Ci0gICAgYm9vbCBpbmNsdWRlQ3JlZGVudGlhbHMoKSBjb25zdCB7IHJldHVy biBtX2luY2x1ZGVDcmVkZW50aWFsczsgfQotcHJpdmF0ZToKLSAgICBYSFJSZXBsYXlEYXRhKGNv bnN0IFN0cmluZyAmbWV0aG9kLCBjb25zdCBVUkwmLCBib29sIGFzeW5jLCBSZWZQdHI8Rm9ybURh dGE+JiYsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlcnMsIGJvb2wgaW5jbHVkZUNyZWRlbnRp YWxzKTsKLQotICAgIFN0cmluZyBtX21ldGhvZDsKLSAgICBVUkwgbV91cmw7Ci0gICAgYm9vbCBt X2FzeW5jOwotICAgIFJlZlB0cjxGb3JtRGF0YT4gbV9mb3JtRGF0YTsKLSAgICBjb25zdCBIVFRQ SGVhZGVyTWFwIG1faGVhZGVyczsKLSAgICBib29sIG1faW5jbHVkZUNyZWRlbnRpYWxzOwotfTsK LQogY2xhc3MgTmV0d29ya1Jlc291cmNlc0RhdGEgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NB VEVEOwogcHVibGljOgpAQCAtMTE0LDkgKzkzLDYgQEAgcHVibGljOgogICAgICAgICBDYWNoZWRS ZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX2NhY2hlZFJlc291cmNl OyB9CiAgICAgICAgIHZvaWQgc2V0Q2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2UqIGNhY2hl ZFJlc291cmNlKSB7IG1fY2FjaGVkUmVzb3VyY2UgPSBjYWNoZWRSZXNvdXJjZTsgfQogCi0gICAg ICAgIFhIUlJlcGxheURhdGEqIHhoclJlcGxheURhdGEoKSBjb25zdCB7IHJldHVybiBtX3hoclJl cGxheURhdGEuZ2V0KCk7IH0KLSAgICAgICAgdm9pZCBzZXRYSFJSZXBsYXlEYXRhKFhIUlJlcGxh eURhdGEqIHhoclJlcGxheURhdGEpIHsgbV94aHJSZXBsYXlEYXRhID0geGhyUmVwbGF5RGF0YTsg fQotCiAgICAgcHJpdmF0ZToKICAgICAgICAgYm9vbCBoYXNEYXRhKCkgY29uc3QgeyByZXR1cm4g bV9kYXRhQnVmZmVyOyB9CiAgICAgICAgIHNpemVfdCBkYXRhTGVuZ3RoKCkgY29uc3Q7CkBAIC0x MjgsNyArMTA0LDYgQEAgcHVibGljOgogICAgICAgICBTdHJpbmcgbV9mcmFtZUlkOwogICAgICAg ICBTdHJpbmcgbV91cmw7CiAgICAgICAgIFN0cmluZyBtX2NvbnRlbnQ7Ci0gICAgICAgIFJlZlB0 cjxYSFJSZXBsYXlEYXRhPiBtX3hoclJlcGxheURhdGE7CiAgICAgICAgIGJvb2wgbV9iYXNlNjRF bmNvZGVkOwogICAgICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBtX2RhdGFCdWZmZXI7CiAgICAg ICAgIGJvb2wgbV9pc0NvbnRlbnRFdmljdGVkOwpAQCAtMTU5LDEwICsxMzQsNiBAQCBwdWJsaWM6 CiAgICAgVmVjdG9yPFN0cmluZz4gcmVtb3ZlQ2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2Uq KTsKICAgICB2b2lkIGNsZWFyKGNvbnN0IFN0cmluZyYgcHJlc2VydmVkTG9hZGVySWQgPSBTdHJp bmcoKSk7CiAKLSAgICB2b2lkIHNldFhIUlJlcGxheURhdGEoY29uc3QgU3RyaW5nJiByZXF1ZXN0 SWQsIFhIUlJlcGxheURhdGEqKTsKLSAgICB2b2lkIHJldXNlWEhSUmVwbGF5RGF0YShjb25zdCBT dHJpbmcmIHJlcXVlc3RJZCwgY29uc3QgU3RyaW5nJiByZXVzZWRSZXF1ZXN0SWQpOwotICAgIFhI UlJlcGxheURhdGEqIHhoclJlcGxheURhdGEoY29uc3QgU3RyaW5nJiByZXF1ZXN0SWQpOwotCiBw cml2YXRlOgogICAgIFJlc291cmNlRGF0YSogcmVzb3VyY2VEYXRhRm9yUmVxdWVzdElkKGNvbnN0 IFN0cmluZyYgcmVxdWVzdElkKTsKICAgICB2b2lkIGVuc3VyZU5vRGF0YUZvclJlcXVlc3RJZChj b25zdCBTdHJpbmcmIHJlcXVlc3RJZCk7CkBAIC0xNzAsOCArMTQxLDYgQEAgcHJpdmF0ZToKIAog ICAgIERlcXVlPFN0cmluZz4gbV9yZXF1ZXN0SWRzRGVxdWU7CiAKLSAgICB0eXBlZGVmIEhhc2hN YXA8U3RyaW5nLCBTdHJpbmc+IFJldXNlZFJlcXVlc3RJZHM7Ci0gICAgUmV1c2VkUmVxdWVzdElk cyBtX3JldXNlZFhIUlJlcGxheURhdGFSZXF1ZXN0SWRzOwogICAgIHR5cGVkZWYgSGFzaE1hcDxT dHJpbmcsIFJlc291cmNlRGF0YSo+IFJlc291cmNlRGF0YU1hcDsKICAgICBSZXNvdXJjZURhdGFN YXAgbV9yZXF1ZXN0SWRUb1Jlc291cmNlRGF0YU1hcDsKICAgICBzaXplX3QgbV9jb250ZW50U2l6 ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVM b2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRl ci5jcHAKaW5kZXggZTFhYjEzODkxOGQxZDk3YzcyMDgzMWZmNTg3MjhkY2RkYjM5ZTdmYS4uYzM5 OWM0NjgxM2QyYjgzZGM2Njg1Y2JiZjMyOGY5ZWIzYTYwMWMzYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKQEAgLTM2NywxMyAr MzY3LDkgQEAgdm9pZCBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXF1ZXN0KGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgU2VjdXIKICNlbmRpZgogICAgICAgICBBU1NFUlQo IW1fcmVzb3VyY2UpOwogICAgICAgICBtX3Jlc291cmNlID0gbV9kb2N1bWVudC5jYWNoZWRSZXNv dXJjZUxvYWRlcigpLnJlcXVlc3RSYXdSZXNvdXJjZShuZXdSZXF1ZXN0KTsKLSAgICAgICAgaWYg KG1fcmVzb3VyY2UpIHsKLSAgICAgICAgICAgIGlmIChtX3Jlc291cmNlLT5sb2FkZXIoKSkgewot ICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciA9IG1fcmVzb3VyY2UtPmxv YWRlcigpLT5pZGVudGlmaWVyKCk7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkb2N1bWVudFRocmVhZGFibGVMb2FkZXJTdGFydGVkTG9hZGluZ0ZvckNsaWVudCht X2RvY3VtZW50LCBpZGVudGlmaWVyLCBtX2NsaWVudCk7Ci0gICAgICAgICAgICB9CisgICAgICAg IGlmIChtX3Jlc291cmNlKQogICAgICAgICAgICAgbV9yZXNvdXJjZS0+YWRkQ2xpZW50KHRoaXMp OwotICAgICAgICB9CisKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKQEAgLTM4NSw4ICsz ODEsNiBAQCB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlcXVlc3QoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBTZWN1cgogICAgIGlmIChtX2RvY3VtZW50LmZyYW1l KCkpCiAgICAgICAgIGlkZW50aWZpZXIgPSBtX2RvY3VtZW50LmZyYW1lKCktPmxvYWRlcigpLmxv YWRSZXNvdXJjZVN5bmNocm9ub3VzbHkocmVxdWVzdCwgbV9vcHRpb25zLmFsbG93Q3JlZGVudGlh bHMoKSwgbV9vcHRpb25zLmNsaWVudENyZWRlbnRpYWxQb2xpY3koKSwgZXJyb3IsIHJlc3BvbnNl LCBkYXRhKTsKIAotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyU3RhcnRlZExvYWRpbmdGb3JDbGllbnQobV9kb2N1bWVudCwgaWRlbnRpZmllciwg bV9jbGllbnQpOwotCiAgICAgaWYgKCFlcnJvci5pc051bGwoKSAmJiByZXNwb25zZS5odHRwU3Rh dHVzQ29kZSgpIDw9IDApIHsKICAgICAgICAgaWYgKHJlcXVlc3RVUkwuaXNMb2NhbEZpbGUoKSkg ewogICAgICAgICAgICAgLy8gV2UgZG9uJ3Qgd2FudCBYTUxIdHRwUmVxdWVzdCB0byByYWlzZSBh biBleGNlcHRpb24gZm9yIGZpbGU6Ly8gcmVzb3VyY2VzLCBzZWUgPHJkYXI6Ly9wcm9ibGVtLzQ5 NjIyOTg+LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKaW5kZXggNDZlMThmZDlj MDc3MzNlNDhhZTVjMzg2YWRiOTVlYWQyNzYxY2FiYS4uNTU2MGYzYzkzNDM3MzhhNDRhMzk5Yjdk OWQ4ZmY2YmIwZmRiODdlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBS ZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCkBA IC03MTksMTMgKzcxOSw2IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OnNlbmRCeXRlc0RhdGEoY29u c3Qgdm9pZCogZGF0YSwgc2l6ZV90IGxlbmd0aCwgRXhjZXB0aW9uQ29kCiAgICAgY3JlYXRlUmVx dWVzdChlYyk7CiB9CiAKLXZvaWQgWE1MSHR0cFJlcXVlc3Q6OnNlbmRGb3JJbnNwZWN0b3JYSFJS ZXBsYXkoUGFzc1JlZlB0cjxGb3JtRGF0YT4gZm9ybURhdGEsIEV4Y2VwdGlvbkNvZGUmIGVjKQot ewotICAgIG1fcmVxdWVzdEVudGl0eUJvZHkgPSBmb3JtRGF0YSA/IGZvcm1EYXRhLT5kZWVwQ29w eSgpIDogMDsKLSAgICBjcmVhdGVSZXF1ZXN0KGVjKTsKLSAgICBtX2V4Y2VwdGlvbkNvZGUgPSBl YzsKLX0KLQogdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdChFeGNlcHRpb25Db2Rl JiBlYykKIHsKICAgICAvLyBPbmx5IEdFVCByZXF1ZXN0IGlzIHN1cHBvcnRlZCBmb3IgYmxvYiBV UkwuCkBAIC03NTUsOCArNzQ4LDYgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVz dChFeGNlcHRpb25Db2RlJiBlYykKICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChtX3VybCk7 CiAgICAgcmVxdWVzdC5zZXRIVFRQTWV0aG9kKG1fbWV0aG9kKTsKIAotICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6d2lsbExvYWRYSFIoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCB0aGlz LCBtX21ldGhvZCwgbV91cmwsIG1fYXN5bmMsIG1fcmVxdWVzdEVudGl0eUJvZHkgPyBtX3JlcXVl c3RFbnRpdHlCb2R5LT5kZWVwQ29weSgpIDogMCwgbV9yZXF1ZXN0SGVhZGVycywgbV9pbmNsdWRl Q3JlZGVudGlhbHMpOwotCiAgICAgaWYgKG1fcmVxdWVzdEVudGl0eUJvZHkpIHsKICAgICAgICAg QVNTRVJUKG1fbWV0aG9kICE9ICJHRVQiKTsKICAgICAgICAgQVNTRVJUKG1fbWV0aG9kICE9ICJI RUFEIik7CkBAIC04NDYsOCArODM3LDYgQEAgYm9vbCBYTUxIdHRwUmVxdWVzdDo6aW50ZXJuYWxB Ym9ydCgpCiAKICAgICBtX2RlY29kZXIgPSAwOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRGYWlsWEhSTG9hZGluZyhzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHRoaXMpOwot CiAgICAgaWYgKCFtX2xvYWRlcikKICAgICAgICAgcmV0dXJuIHRydWU7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUveG1s L1hNTEh0dHBSZXF1ZXN0LmgKaW5kZXggN2JlZGJmN2YwZjg1Y2M5MjAyMTQ0NDBlYWVjZTU4NGU0 ODk2MzIzMC4uYjRhNjExYzUzZDIyMmIzZTA2OGQzOTA4NmJhMTc3MmM3MWFhMmEyYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dl YkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmgKQEAgLTEyMSw4ICsxMjEsNiBAQCBwdWJsaWM6CiAg ICAgYm9vbCByZXNwb25zZUNhY2hlSXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzcG9uc2VD YWNoZUlzVmFsaWQ7IH0KICAgICB2b2lkIGRpZENhY2hlUmVzcG9uc2VKU09OKCk7CiAKLSAgICB2 b2lkIHNlbmRGb3JJbnNwZWN0b3JYSFJSZXBsYXkoUGFzc1JlZlB0cjxGb3JtRGF0YT4sIEV4Y2Vw dGlvbkNvZGUmKTsKLQogICAgIC8vIEV4cG9zZSBIVFRQIHZhbGlkYXRpb24gbWV0aG9kcyBmb3Ig b3RoZXIgdW50cnVzdGVkIHJlcXVlc3RzLgogICAgIHN0YXRpYyBib29sIGlzQWxsb3dlZEhUVFBN ZXRob2QoY29uc3QgU3RyaW5nJik7CiAgICAgc3RhdGljIFN0cmluZyB1cHBlcmNhc2VLbm93bkhU VFBNZXRob2QoY29uc3QgU3RyaW5nJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvNy4wL0luc3BlY3RvckJhY2tlbmRDb21t YW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xl Z2FjeS83LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCmluZGV4IDQxYjcxZDYwZGU2ZTVl ZmQ3Nzk3OWUwZDE0ODdjYmVmNWE1YWE3YjguLjc4MzhiZjM5ZjdiMTYyMTIyYzg5NDQ5YTE0Y2Fi MmY3NGJjOWUyYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1Byb3RvY29sL0xlZ2FjeS83LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS83LjAv SW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCkBAIC0xMjksNyArMTI5LDYgQEAgSW5zcGVjdG9y QmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIk5ldHdvcmsuZW5hYmxlIiwgW10sIFtdKTsKIEluc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKCJOZXR3b3JrLmRpc2FibGUiLCBbXSwgW10pOwog SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIk5ldHdvcmsuc2V0RXh0cmFIVFRQSGVh ZGVycyIsIFt7Im5hbWUiOiAiaGVhZGVycyIsICJ0eXBlIjogIm9iamVjdCIsICJvcHRpb25hbCI6 IGZhbHNlfV0sIFtdKTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKCJOZXR3b3Jr LmdldFJlc3BvbnNlQm9keSIsIFt7Im5hbWUiOiAicmVxdWVzdElkIiwgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogZmFsc2V9XSwgWyJib2R5IiwgImJhc2U2NEVuY29kZWQiXSk7Ci1JbnNw ZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiTmV0d29yay5yZXBsYXlYSFIiLCBbeyJuYW1l IjogInJlcXVlc3RJZCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IGZhbHNlfV0sIFtd KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKCJOZXR3b3JrLmNhbkNsZWFyQnJv d3NlckNhY2hlIiwgW10sIFsicmVzdWx0Il0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNv bW1hbmQoIk5ldHdvcmsuY2xlYXJCcm93c2VyQ2FjaGUiLCBbXSwgW10pOwogSW5zcGVjdG9yQmFj a2VuZC5yZWdpc3RlckNvbW1hbmQoIk5ldHdvcmsuY2FuQ2xlYXJCcm93c2VyQ29va2llcyIsIFtd LCBbInJlc3VsdCJdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS84LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzguMC9J bnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKaW5kZXggMmY2NTc3MzFlNGMwOWQ0NWIxNjQ1NWM0 MzI0NDdkMGM0YjMzZWZmOC4uYzZmYjE4ZTczYThhMDY0MmE3NzFhNTc3ZmY1NWJmYmJkM2Q5ZDc3 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9j b2wvTGVnYWN5LzguMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzguMC9JbnNwZWN0b3JC YWNrZW5kQ29tbWFuZHMuanMKQEAgLTI5MCw3ICsyOTAsNiBAQCBJbnNwZWN0b3JCYWNrZW5kLnJl Z2lzdGVyQ29tbWFuZCgiTmV0d29yay5lbmFibGUiLCBbXSwgW10pOwogSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlckNvbW1hbmQoIk5ldHdvcmsuZGlzYWJsZSIsIFtdLCBbXSk7CiBJbnNwZWN0b3JC YWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiTmV0d29yay5zZXRFeHRyYUhUVFBIZWFkZXJzIiwgW3si bmFtZSI6ICJoZWFkZXJzIiwgInR5cGUiOiAib2JqZWN0IiwgIm9wdGlvbmFsIjogZmFsc2V9XSwg W10pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIk5ldHdvcmsuZ2V0UmVzcG9u c2VCb2R5IiwgW3sibmFtZSI6ICJyZXF1ZXN0SWQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9u YWwiOiBmYWxzZX1dLCBbImJvZHkiLCAiYmFzZTY0RW5jb2RlZCJdKTsKLUluc3BlY3RvckJhY2tl bmQucmVnaXN0ZXJDb21tYW5kKCJOZXR3b3JrLnJlcGxheVhIUiIsIFt7Im5hbWUiOiAicmVxdWVz dElkIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogZmFsc2V9XSwgW10pOwogSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIk5ldHdvcmsuY2FuQ2xlYXJCcm93c2VyQ2FjaGUi LCBbXSwgWyJyZXN1bHQiXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiTmV0 d29yay5jbGVhckJyb3dzZXJDYWNoZSIsIFtdLCBbXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyQ29tbWFuZCgiTmV0d29yay5jYW5DbGVhckJyb3dzZXJDb29raWVzIiwgW10sIFsicmVzdWx0 Il0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1ZlcnNpb25zL0luc3BlY3Rv ci1pT1MtNy4wLmpzb24gYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9y LWlPUy03LjAuanNvbgppbmRleCBlYWQxNTQ0NWU5NDYwMGE1NDY4YmE4ODg1NTNjMWFjZmY2MzMw NTFiLi5hY2MyYmQ1YTBkN2ZlYzFhMGRiZTE2MTkxZTk0MWI1NDNmMTNkZmQyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9yLWlPUy03LjAuanNvbgor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9yLWlPUy03LjAuanNv bgpAQCAtODE1LDEzICs4MTUsNiBAQAogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAicmVwbGF5WEhSIiwKLSAg ICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGhpcyBtZXRob2Qgc2VuZHMgYSBuZXcgWE1M SHR0cFJlcXVlc3Qgd2hpY2ggaXMgaWRlbnRpY2FsIHRvIHRoZSBvcmlnaW5hbCBvbmUuIFRoZSBm b2xsb3dpbmcgcGFyYW1ldGVycyBzaG91bGQgYmUgaWRlbnRpY2FsOiBtZXRob2QsIHVybCwgYXN5 bmMsIHJlcXVlc3QgYm9keSwgZXh0cmEgaGVhZGVycywgd2l0aENyZWRlbnRpYWxzIGF0dHJpYnV0 ZSwgdXNlciwgcGFzc3dvcmQuIiwKLSAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SWQiLCAiJHJlZiI6ICJSZXF1ZXN0 SWQiLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiBYSFIgdG8gcmVwbGF5LiIgfQotICAg ICAgICAgICAgICAgIF0KLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgIm5hbWUiOiAiY2FuQ2xlYXJCcm93c2VyQ2FjaGUiLAogICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJUZWxscyB3aGV0aGVyIGNsZWFyaW5nIGJyb3dzZXIgY2FjaGUgaXMgc3Vw cG9ydGVkLiIsCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9yLWlPUy04LjAuanNvbiBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9WZXJzaW9ucy9JbnNwZWN0b3ItaU9TLTguMC5qc29uCmluZGV4IDkz MzIwM2IzZTJjZGZjYmYwNjYzZTQ2YWU4Y2UxOGExMDZjOTE1OWMuLjg0Y2NjYTE1YjBlZmM4N2Jj YjgwYjVmYzJkMTE2MDJmYjQxOGExOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9WZXJzaW9ucy9JbnNwZWN0b3ItaU9TLTguMC5qc29uCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9WZXJzaW9ucy9JbnNwZWN0b3ItaU9TLTguMC5qc29uCkBAIC0yNDQ4LDEzICsyNDQ4LDYg QEAKICAgICAgICAgICAgIF0KICAgICAgICAgfSwKICAgICAgICAgewotICAgICAgICAgICAgIm5h bWUiOiAicmVwbGF5WEhSIiwKLSAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUaGlzIG1ldGhv ZCBzZW5kcyBhIG5ldyBYTUxIdHRwUmVxdWVzdCB3aGljaCBpcyBpZGVudGljYWwgdG8gdGhlIG9y aWdpbmFsIG9uZS4gVGhlIGZvbGxvd2luZyBwYXJhbWV0ZXJzIHNob3VsZCBiZSBpZGVudGljYWw6 IG1ldGhvZCwgdXJsLCBhc3luYywgcmVxdWVzdCBib2R5LCBleHRyYSBoZWFkZXJzLCB3aXRoQ3Jl ZGVudGlhbHMgYXR0cmlidXRlLCB1c2VyLCBwYXNzd29yZC4iLAotICAgICAgICAgICAgInBhcmFt ZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SWQiLCAiJHJlZiI6 ICJSZXF1ZXN0SWQiLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiBYSFIgdG8gcmVwbGF5 LiIgfQotICAgICAgICAgICAgXQotICAgICAgICB9LAotICAgICAgICB7CiAgICAgICAgICAgICAi bmFtZSI6ICJjYW5DbGVhckJyb3dzZXJDYWNoZSIsCiAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiVGVsbHMgd2hldGhlciBjbGVhcmluZyBicm93c2VyIGNhY2hlIGlzIHN1cHBvcnRlZC4iLAog ICAgICAgICAgICAgInJldHVybnMiOiBbCg==