182199 2018-01-26 17:14:44 -0800 Resource Load Statistics: Introduce debug mode as experimental feature 2018-01-29 16:26:00 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander achristensen cdumez commit-queue dbates ews-watchlist japhet webkit-bug-importer oldest_to_newest 1393741 0 wilander 2018-01-26 17:14:44 -0800 We want a debug mode for developers where ITP has significantly shorter timeouts, outputs console info on internal state, etc. We should start by introducing it as an experimental feature with some simple settings changes. 1393743 1 webkit-bug-importer 2018-01-26 17:15:10 -0800 <rdar://problem/36930364> 1393744 2 332437 wilander 2018-01-26 17:24:26 -0800 Created attachment 332437 Patch 1394147 3 332554 wilander 2018-01-29 10:33:51 -0800 Created attachment 332554 Patch 1394205 4 332566 wilander 2018-01-29 12:18:48 -0800 Created attachment 332566 Patch 1394244 5 332566 achristensen 2018-01-29 13:49:22 -0800 Comment on attachment 332566 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332566&action=review > Source/WebKit/Shared/WebPreferences.yaml:1196 > \ No newline at end of file I hope it wouldn't hurt to add a newline at the end of this file. 1394246 6 332566 wilander 2018-01-29 13:54:27 -0800 Comment on attachment 332566 Patch Thanks, Alex! Lack of a newline seems to mess up revision tracking both in Xcode and on Bugzilla, as can be seen in the formatted diff. 1394247 7 wilander 2018-01-29 13:56:07 -0800 I think what happens is that by adding a newline to the previous entry in order to add your new one, you touch the last line of the previous entry and thus "revise" it. But I see what you're saying. Let's hope a newline is fine. 1394261 8 332566 commit-queue 2018-01-29 14:17:28 -0800 Comment on attachment 332566 Patch Rejecting attachment 332566 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 332566, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: fs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 227753 = c7d8175b884322f3dc6e97dd377b80344b80a3e5 r227754 = 19b1b43411899ad87c792acf81d60c4f9058a581 r227755 = 2d0589b491cc81522516c9eb3901667ac9a870c4 r227756 = 5cadb9d3c3216a3aa56f01b489c4dabbb3ca71de Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.webkit.org/results/6252911 1394319 9 332566 wilander 2018-01-29 16:09:20 -0800 Comment on attachment 332566 Patch Trying the commit queue again. 1394320 10 332566 wilander 2018-01-29 16:10:06 -0800 Comment on attachment 332566 Patch Nah. 1394325 11 wilander 2018-01-29 16:26:00 -0800 Committed r227762: <https://trac.webkit.org/changeset/227762> 332437 2018-01-26 17:24:26 -0800 2018-01-29 10:33:50 -0800 Patch bug-182199-20180126172425.patch text/plain 18027 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzUzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE4LTAxLTI2ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogSW50cm9kdWNlIGRlYnVnIG1vZGUgYXMgZXhwZXJpbWVudGFsIGZlYXR1cmUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjE5OQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzY5MzAzNjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGFkZHMgYW4gZXhwZXJp bWVudGFsIGZlYXR1cmUuCisKKyAgICAgICAgVGhlIG9ubHkgY2hhbmdlcyB0byBkZWZhdWx0IGJl aGF2aW9yIGFyZToKKyAgICAgICAgLSBJbmNyZWFzZWQgcmVzb2x1dGlvbiBvbiB0aW1lc3RhbXBz IHdoaWNoIGlzIG5lZWRlZCB0byBiZSBhYmxlIHRvIHNldCBzaG9ydGVyCisgICAgICAgICAgdGlt ZW91dHMgaW4gZGVidWcgbW9kZS4KKyAgICAgICAgLSBPbmx5IHVwZGF0ZSBwYXJ0aXRpb25pbmcg YW5kIGJsb2NraW5nIHRhYmxlIHdoZW4gbmVlZGVkLiBUaGlzIGlzIGFuIG9wdGltaXphdGlvbgor ICAgICAgICAgIHdoaWNoIHBheXMgb2ZmIGluIGxlc3MgWFBDIHdpdGggc2hvcnRlciB0aW1lb3V0 cy4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpyZWR1Y2VUaW1lUmVzb2x1dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJjZUxvYWRpbmcpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dlYlNvY2tldExvYWRpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldp dGhSZWR1Y2VkVGltZVJlc29sdXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6cmVkdWNlVG9Ib3Vy bHlUaW1lUmVzb2x1dGlvbik6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9SdW50aW1lRW5hYmxl ZEZlYXR1cmVzLmg6CisgICAgICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpz ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJ1 bnRpbWVFbmFibGVkRmVhdHVyZXM6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgY29u c3QpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKwogMjAxOC0wMS0yNCAgRGFuaWVs IEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjIyNjEz OCk6IFNlbGVjdGluZyBhIGxpbmUgdGhhdCBlbmRzIHdpdGggemVyby13aWR0aCBqb2luZXIgKFpX SikgbWF5IGNhdXNlIHRleHQgdHJhbnNmb3JtYXRpb24KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAkocmV2aXNpb24gMjI3NTMzKQorKysg U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDgsNyArNDgsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdGF0aWMgaW5saW5l IFN0cmluCiAgICAgcmV0dXJuIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnByaW1hcnlEb21haW4o dmFsdWUpOwogfQogCi1zdGF0aWMgU2Vjb25kcyB0aW1lc3RhbXBSZXNvbHV0aW9uIHsgMV9oIH07 CitzdGF0aWMgU2Vjb25kcyB0aW1lc3RhbXBSZXNvbHV0aW9uIHsgNV9zIH07CiBzdGF0aWMgY29u c3QgU2Vjb25kcyBtaW5pbXVtTm90aWZpY2F0aW9uSW50ZXJ2YWwgeyA1X3MgfTsKIAogUmVzb3Vy Y2VMb2FkT2JzZXJ2ZXImIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWQoKQpAQCAtMTI3LDcg KzEyNyw3IEBAIGJvb2wgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNob3VsZExvZyhQYWcKICAgICBy ZXR1cm4gRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5h YmxlZCgpICYmICFwYWdlLT51c2VzRXBoZW1lcmFsU2Vzc2lvbigpICYmIG1fbm90aWZpY2F0aW9u Q2FsbGJhY2s7CiB9CiAKLXN0YXRpYyBXYWxsVGltZSByZWR1Y2VUb0hvdXJseVRpbWVSZXNvbHV0 aW9uKFdhbGxUaW1lIHRpbWUpCitzdGF0aWMgV2FsbFRpbWUgcmVkdWNlVGltZVJlc29sdXRpb24o V2FsbFRpbWUgdGltZSkKIHsKICAgICByZXR1cm4gV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKHN0 ZDo6Zmxvb3IodGltZS5zZWNvbmRzU2luY2VFcG9jaCgpIC8gdGltZXN0YW1wUmVzb2x1dGlvbikg KiB0aW1lc3RhbXBSZXNvbHV0aW9uLnNlY29uZHMoKSk7CiB9CkBAIC0xNzAsNyArMTcwLDcgQEAg dm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZwogICAgIGlmICh0YXJnZXRI b3N0ICE9IG1haW5GcmFtZUhvc3QKICAgICAgICAgJiYgIShhcmVEb21haW5zQXNzb2NpYXRlZChw YWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5RG9tYWluKSB8fCBhcmVE b21haW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBzb3VyY2VQcmltYXJ5 RG9tYWluKSkpIHsKICAgICAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVuc3VyZVJlc291 cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFpbik7Ci0gICAg ICAgIHRhcmdldFN0YXRpc3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUb0hvdXJseVRpbWVSZXNvbHV0 aW9uKFdhbGxUaW1lOjpub3coKSk7CisgICAgICAgIHRhcmdldFN0YXRpc3RpY3MubGFzdFNlZW4g PSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwogICAgICAgICBpZiAodGFy Z2V0U3RhdGlzdGljcy5zdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChtYWluRnJhbWVQ cmltYXJ5RG9tYWluKS5pc05ld0VudHJ5KQogICAgICAgICAgICAgc2hvdWxkQ2FsbE5vdGlmaWNh dGlvbkNhbGxiYWNrID0gdHJ1ZTsKICAgICB9CkBAIC0yMjcsNyArMjI3LDcgQEAgdm9pZCBSZXNv dXJjZUxvYWRPYnNlcnZlcjo6bG9nU3VicmVzb3VyYwogICAgIGJvb2wgc2hvdWxkQ2FsbE5vdGlm aWNhdGlvbkNhbGxiYWNrID0gZmFsc2U7CiAgICAgewogICAgICAgICBhdXRvJiB0YXJnZXRTdGF0 aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0YXJnZXRQ cmltYXJ5RG9tYWluKTsKLSAgICAgICAgdGFyZ2V0U3RhdGlzdGljcy5sYXN0U2VlbiA9IHJlZHVj ZVRvSG91cmx5VGltZVJlc29sdXRpb24oV2FsbFRpbWU6Om5vdygpKTsKKyAgICAgICAgdGFyZ2V0 U3RhdGlzdGljcy5sYXN0U2VlbiA9IHJlZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpub3co KSk7CiAgICAgICAgIGlmICh0YXJnZXRTdGF0aXN0aWNzLnN1YnJlc291cmNlVW5kZXJUb3BGcmFt ZU9yaWdpbnMuYWRkKG1haW5GcmFtZVByaW1hcnlEb21haW4pLmlzTmV3RW50cnkpCiAgICAgICAg ICAgICBzaG91bGRDYWxsTm90aWZpY2F0aW9uQ2FsbGJhY2sgPSB0cnVlOwogICAgIH0KQEAgLTI2 OCw3ICsyNjgsNyBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dXZWJTb2NrZXRMCiAg ICAgICAgIHJldHVybjsKIAogICAgIGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNv dXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOwotICAg IHRhcmdldFN0YXRpc3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUb0hvdXJseVRpbWVSZXNvbHV0aW9u KFdhbGxUaW1lOjpub3coKSk7CisgICAgdGFyZ2V0U3RhdGlzdGljcy5sYXN0U2VlbiA9IHJlZHVj ZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpub3coKSk7CiAgICAgaWYgKHRhcmdldFN0YXRpc3Rp Y3Muc3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2lucy5hZGQobWFpbkZyYW1lUHJpbWFyeURv bWFpbikuaXNOZXdFbnRyeSkKICAgICAgICAgc2NoZWR1bGVOb3RpZmljYXRpb25JZk5lZWRlZCgp OwogfQpAQCAtMjg1LDcgKzI4NSw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1Vz ZXJJbnRlcmEKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBkb21haW4gPSBwcmltYXJ5RG9t YWluKHVybCk7Ci0gICAgYXV0byBuZXdUaW1lID0gcmVkdWNlVG9Ib3VybHlUaW1lUmVzb2x1dGlv bihXYWxsVGltZTo6bm93KCkpOworICAgIGF1dG8gbmV3VGltZSA9IHJlZHVjZVRpbWVSZXNvbHV0 aW9uKFdhbGxUaW1lOjpub3coKSk7CiAgICAgYXV0byBsYXN0UmVwb3J0ZWRVc2VySW50ZXJhY3Rp b24gPSBtX2xhc3RSZXBvcnRlZFVzZXJJbnRlcmFjdGlvbk1hcC5nZXQoZG9tYWluKTsKICAgICBp ZiAobmV3VGltZSA9PSBsYXN0UmVwb3J0ZWRVc2VySW50ZXJhY3Rpb24pCiAgICAgICAgIHJldHVy bjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5o CShyZXZpc2lvbiAyMjc1MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRpbWVFbmFibGVk RmVhdHVyZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMjQ0LDYgKzI0NCw5IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldE1lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZChib29sIGlzRW5hYmxlZCkgeyBtX21l ZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZCA9IGlzRW5hYmxlZDsgfQogICAgIGJvb2wgbWVkaWFDYXBh YmlsaXRpZXNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9tZWRpYUNhcGFiaWxpdGllc0VuYWJs ZWQ7IH0KIAorICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZShib29s IGlzRW5hYmxlZCkgeyBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgPSBpc0VuYWJs ZWQ7IH0KKyAgICBib29sIHJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoKSBjb25zdCB7 IHJldHVybiBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGU7IH0KKwogICAgIFdFQkNP UkVfRVhQT1JUIHN0YXRpYyBSdW50aW1lRW5hYmxlZEZlYXR1cmVzJiBzaGFyZWRGZWF0dXJlcygp OwogCiBwcml2YXRlOgpAQCAtMzczLDYgKzM3Niw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1f bWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkIHsgZmFsc2UgfTsKIAorICAgIGJvb2wgbV9yZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlIHsgZmFsc2UgfTsKKyAgICAKICAgICBmcmllbmQgY2xh c3MgV1RGOjpOZXZlckRlc3Ryb3llZDxSdW50aW1lRW5hYmxlZEZlYXR1cmVzPjsKIH07CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwJKHJldmlzaW9uIDIyNzUzMykKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbAkod29ya2luZyBjb3B5KQpAQCAtNzA4LDMgKzcw OCw2IEBAIHRvdWNoRXZlbnRFbXVsYXRpb25FbmFibGVkOgogCiBtZWRpYUNhcGFiaWxpdGllc0Vu YWJsZWQ6CiAgIGluaXRpYWw6IGZhbHNlCisKK3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01v ZGU6CisgIGluaXRpYWw6IGZhbHNlCkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjI3NzAzKQorKysg U291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzOCBAQAor MjAxOC0wMS0yNiAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXNvdXJjZSBMb2FkIFN0YXRpc3RpY3M6IEludHJvZHVjZSBkZWJ1ZyBtb2RlIGFzIGV4cGVy aW1lbnRhbCBmZWF0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODIxOTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2OTMwMzY0PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBvbmx5IGNoYW5n ZXMgdG8gZGVmYXVsdCBiZWhhdmlvciBhcmU6CisgICAgICAgIC0gSW5jcmVhc2VkIHJlc29sdXRp b24gb24gdGltZXN0YW1wcyB3aGljaCBpcyBuZWVkZWQgdG8gYmUgYWJsZSB0byBzZXQgc2hvcnRl cgorICAgICAgICAgIHRpbWVvdXRzIGluIGRlYnVnIG1vZGUuCisgICAgICAgIC0gT25seSB1cGRh dGUgcGFydGl0aW9uaW5nIGFuZCBibG9ja2luZyB0YWJsZSB3aGVuIG5lZWRlZC4gVGhpcyBpcyBh biBvcHRpbWl6YXRpb24KKyAgICAgICAgICB3aGljaCBwYXlzIG9mZiBpbiBsZXNzIFhQQyB3aXRo IHNob3J0ZXIgdGltZW91dHMuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFt bDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAg ICAgICAoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdN b2RlIGNvbnN0KToKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6c2V0UmVzb3VyY2VM b2FkU3RhdGlzdGljc0RlYnVnTW9kZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElXZWJz aXRlRGF0YVN0b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFT dG9yZVJlZi5jcHA6CisgICAgICAgIChXS1dlYnNpdGVEYXRhU3RvcmVTZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGVidWdNb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRl RGF0YVN0b3JlUmVmLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVE YXRhU3RvcmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfcmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RlYnVnTW9kZV0pOgorICAgICAgICAoLVtXS1dlYnNpdGVEYXRhU3RvcmUgX3Nl dFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGU6XSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RlYnVnTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6bG9nVXNlckludGVyYWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3Jl OjpyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKwog MjAxOC0wMS0yNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgog CiAgICAgICAgIEFsbG93IGNlbGx1bGFyIGFjY2VzcyBmb3IgZGVmYXVsdC1jcmVhdGVkIGVwaGVt ZXJhbCBzZXNzaW9ucwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMu eWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55 YW1sCShyZXZpc2lvbiAyMjc1MzMpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJl bmNlcy55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMTk5LDMgKzExOTksMTIgQEAgQWNjZXNzaWJp bGl0eU9iamVjdE1vZGVsRW5hYmxlZDoKICAgICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246ICJB Y2Nlc3NpYmlsaXR5IE9iamVjdCBNb2RlbCBzdXBwb3J0IgogICAgIGNhdGVnb3J5OiBleHBlcmlt ZW50YWwKICAgICB3ZWJjb3JlQmluZGluZzogUnVudGltZUVuYWJsZWRGZWF0dXJlcworCitSZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOgorICAgIHR5cGU6IGJvb2wKKyAgICBkZWZhdWx0 VmFsdWU6IGZhbHNlCisgICAgaHVtYW5SZWFkYWJsZU5hbWU6ICJJVFAgRGVidWcgTW9kZSIKKyAg ICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246ICJJbnRlbGxpZ2VudCBUcmFja2luZyBQcmV2ZW50 aW9uIERlYnVnIE1vZGUiCisgICAgY2F0ZWdvcnk6IGV4cGVyaW1lbnRhbAorICAgIHdlYmNvcmVC aW5kaW5nOiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzCisKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNw cAkocmV2aXNpb24gMjI3NTMzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzY1LDYgKzM2NSwx NCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3ViCiAgICAgfSk7CiB9 CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGVidWdNb2RlKGJvb2wgZW5hYmxlKQoreworICAgIGlmIChlbmFibGUpCisgICAg ICAgIHNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKDMwX3MpOworICAgIGVsc2UKKyAg ICAgICAgcmVzZXRQYXJhbWV0ZXJzVG9EZWZhdWx0VmFsdWVzKCk7Cit9CisKIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dVc2VySW50ZXJhY3Rpb24oY29uc3QgVVJMJiB1 cmwpCiB7CiAgICAgaWYgKHVybC5pc0JsYW5rVVJMKCkgfHwgdXJsLmlzRW1wdHkoKSkKQEAgLTM3 NSw3ICszODMsOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bG9nCiAg ICAgICAgIHN0YXRpc3RpY3MuaGFkVXNlckludGVyYWN0aW9uID0gdHJ1ZTsKICAgICAgICAgc3Rh dGlzdGljcy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSA9IFdhbGxUaW1lOjpub3coKTsK IAotICAgICAgICB1cGRhdGVDb29raWVQYXJ0aXRpb25pbmdGb3JEb21haW5zKHsgfSwgeyB9LCB7 IHByaW1hcnlEb21haW4gfSwgU2hvdWxkQ2xlYXJGaXJzdDo6Tm8pOworICAgICAgICBpZiAoc3Rh dGlzdGljcy5pc01hcmtlZEZvckNvb2tpZVBhcnRpdGlvbmluZyB8fCBzdGF0aXN0aWNzLmlzTWFy a2VkRm9yQ29va2llQmxvY2tpbmcpCisgICAgICAgICAgICB1cGRhdGVDb29raWVQYXJ0aXRpb25p bmdGb3JEb21haW5zKHsgfSwgeyB9LCB7IHByaW1hcnlEb21haW4gfSwgU2hvdWxkQ2xlYXJGaXJz dDo6Tm8pOwogICAgIH0pOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAkocmV2aXNpb24gMjI3 NTMzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw2ICsxMzksOCBAQCBwdWJsaWM6CiAgICAg dm9pZCBjbGVhckluTWVtb3J5KCk7CiAgICAgdm9pZCBncmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0 ZURhdGEoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKIAorICAgIHZvaWQgc2V0UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZShib29sKTsKKwogICAgIHZvaWQgc2V0U3RhdGlzdGlj c1Rlc3RpbmdDYWxsYmFjayhGdW5jdGlvbjx2b2lkIChjb25zdCBTdHJpbmcmKT4mJiBjYWxsYmFj aykgeyBtX3N0YXRpc3RpY3NUZXN0aW5nQ2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKTsgfQog ICAgIHZvaWQgbG9nVGVzdGluZ0V2ZW50KGNvbnN0IFN0cmluZyYpOwogCkluZGV4OiBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVEYXRhU3RvcmUuY3BwCShy ZXZpc2lvbiAyMjc1MzMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0 ZURhdGFTdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk1LDYgKzk1LDE2IEBAIHZvaWQgV2Vi c2l0ZURhdGFTdG9yZTo6c2V0UmVzb3VyY2VMb2FkU3QKICAgICBtX3dlYnNpdGVEYXRhU3RvcmUt PnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGVuYWJsZWQpOwogfQogCitib29sIFdl YnNpdGVEYXRhU3RvcmU6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoKSBjb25zdAor eworICAgIHJldHVybiBtX3dlYnNpdGVEYXRhU3RvcmUtPnJlc291cmNlTG9hZFN0YXRpc3RpY3NE ZWJ1Z01vZGUoKTsKK30KKwordm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGVidWdNb2RlKGJvb2wgZW5hYmxlZCkKK3sKKyAgICBtX3dlYnNpdGVEYXRhU3Rv cmUtPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoZW5hYmxlZCk7Cit9CisKICNp ZiAhUExBVEZPUk0oQ09DT0EpCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE1lZGlh Q2FjaGVEaXJlY3RvcnkoKQogewpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ SVdlYnNpdGVEYXRhU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oCShyZXZpc2lvbiAyMjc1MzMpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oCSh3b3JraW5nIGNvcHkp CkBAIC00Nyw2ICs0Nyw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgcmVzb3VyY2VMb2FkU3RhdGlz dGljc0VuYWJsZWQoKSBjb25zdDsKICAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NF bmFibGVkKGJvb2wpOworICAgIGJvb2wgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSgp IGNvbnN0OworICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZShib29s KTsKIAogICAgIFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZSYgd2Vic2l0ZURhdGFTdG9yZSgpIHsg cmV0dXJuIG1fd2Vic2l0ZURhdGFTdG9yZS5nZXQoKTsgfQogICAgIEhUVFBDb29raWVTdG9yZSYg aHR0cENvb2tpZVN0b3JlKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9X S1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAJKHJldmlzaW9uIDIyNzUzMykK KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTYzLDYgKzYzLDExIEBAIGJvb2wgV0tXZWJzaXRlRGF0YVN0 b3JlR2V0UmVzb3VyY2VMb2FkU3QKICAgICByZXR1cm4gV2ViS2l0Ojp0b0ltcGwoZGF0YVN0b3Jl UmVmKS0+cmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKTsKIH0KIAordm9pZCBXS1dlYnNp dGVEYXRhU3RvcmVTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKFdLV2Vic2l0ZURh dGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYsIGJvb2wgZW5hYmxlKQoreworICAgIFdlYktpdDo6dG9J bXBsKGRhdGFTdG9yZVJlZiktPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoZW5h YmxlKTsKK30KKwogdm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVTZXRTdGF0aXN0aWNzTGFzdFNlZW4o V0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZiwgV0tTdHJpbmdSZWYgaG9zdCwgZG91 YmxlIHNlY29uZHMpCiB7CiAgICAgYXV0byogc3RvcmUgPSBXZWJLaXQ6OnRvSW1wbChkYXRhU3Rv cmVSZWYpLT53ZWJzaXRlRGF0YVN0b3JlKCkucmVzb3VyY2VMb2FkU3RhdGlzdGljcygpOwpJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0 YVN0b3JlUmVmLmgJKHJldmlzaW9uIDIyNzUzMykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw2ICsz OSw3IEBAIFdLX0VYUE9SVCBXS1dlYnNpdGVEYXRhU3RvcmVSZWYgV0tXZWJzaXQKIAogV0tfRVhQ T1JUIGJvb2wgV0tXZWJzaXRlRGF0YVN0b3JlR2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJs ZWQoV0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZik7CiBXS19FWFBPUlQgdm9pZCBX S1dlYnNpdGVEYXRhU3RvcmVTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChXS1dlYnNp dGVEYXRhU3RvcmVSZWYgZGF0YVN0b3JlUmVmLCBib29sIGVuYWJsZSk7CitXS19FWFBPUlQgdm9p ZCBXS1dlYnNpdGVEYXRhU3RvcmVTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKFdL V2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYsIGJvb2wgZW5hYmxlKTsKIFdLX0VYUE9S VCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNldFN0YXRpc3RpY3NMYXN0U2VlbihXS1dlYnNpdGVE YXRhU3RvcmVSZWYgZGF0YVN0b3JlUmVmLCBXS1N0cmluZ1JlZiBob3N0LCBkb3VibGUgc2Vjb25k cyk7CiBXS19FWFBPUlQgdm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVTZXRTdGF0aXN0aWNzUHJldmFs ZW50UmVzb3VyY2UoV0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZiwgV0tTdHJpbmdS ZWYgaG9zdCwgYm9vbCB2YWx1ZSk7CiB0eXBlZGVmIHZvaWQgKCpXS1dlYnNpdGVEYXRhU3RvcmVJ c1N0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZUZ1bmN0aW9uKShib29sIGlzUHJldmFsZW50UmVz b3VyY2UsIHZvaWQqIGZ1bmN0aW9uQ29udGV4dCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0JKHJldmlz aW9uIDIyNzUzMykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNp dGVEYXRhU3RvcmUubW0JKHdvcmtpbmcgY29weSkKQEAgLTIzNCw2ICsyMzQsMTYgQEAgLSAodm9p ZClfc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZQogICAgIF93ZWJzaXRlRGF0YVN0b3Jl LT53ZWJzaXRlRGF0YVN0b3JlKCkuc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZW5h YmxlZCk7CiB9CiAKKy0gKEJPT0wpX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUKK3sK KyAgICByZXR1cm4gX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5yZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKCk7Cit9CisKKy0gKHZvaWQpX3NldFJlc291cmNlTG9h ZFN0YXRpc3RpY3NEZWJ1Z01vZGU6KEJPT0wpZW5hYmxlZAoreworICAgIF93ZWJzaXRlRGF0YVN0 b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9k ZShlbmFibGVkKTsKK30KKwogLSAoTlNVSW50ZWdlcilfY2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVv dGEKIHsKICAgICByZXR1cm4gX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5j YWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YSgpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0 ZS5oCShyZXZpc2lvbiAyMjc1MzMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0 NSw3IEBAIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tXZWJzaXQKIC0gKHZvaWQp X2ZldGNoRGF0YVJlY29yZHNPZlR5cGVzOihOU1NldDxOU1N0cmluZyAqPiAqKWRhdGFUeXBlcyB3 aXRoT3B0aW9uczooX1dLV2Vic2l0ZURhdGFTdG9yZUZldGNoT3B0aW9ucylvcHRpb25zIGNvbXBs ZXRpb25IYW5kbGVyOih2b2lkICheKShOU0FycmF5PFdLV2Vic2l0ZURhdGFSZWNvcmQgKj4gKikp Y29tcGxldGlvbkhhbmRsZXI7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFJl c291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkOikgQk9PTCBfcmVzb3VyY2VMb2FkU3RhdGlzdGlj c0VuYWJsZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goMTAuMTIpLCBpb3MoMTAuMCkpOworQHBy b3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVn TW9kZTopIEJPT0wgX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgV0tfQVBJX0FWQUlM QUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiBAcHJvcGVydHkgKG5v bmF0b21pYywgc2V0dGVyPV9zZXRDYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YTopIE5TVUludGVn ZXIgX2NhY2hlU3RvcmFnZVBlck9yaWdpblF1b3RhIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdL X01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRl cj1fc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5OikgTlNTdHJpbmcqIF9jYWNoZVN0b3JhZ2VEaXJl Y3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJB KSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCShyZXZpc2lvbiAyMjc1MzMpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTQxMyw2ICsxNDEzLDE3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2V0 UmVzb3VyY2VMb2FkU3QKICAgICAgICAgcHJvY2Vzc1Bvb2wtPnNldFJlc291cmNlTG9hZFN0YXRp c3RpY3NFbmFibGVkKGZhbHNlKTsKIH0KIAorYm9vbCBXZWJzaXRlRGF0YVN0b3JlOjpyZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9yZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOworfQorCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnNl dFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBlbmFibGVkKQoreworICAgIG1f cmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSA9IGVuYWJsZWQ7CisgICAgbV9yZXNvdXJj ZUxvYWRTdGF0aXN0aWNzLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKGVuYWJs ZWQpOworfQorCiB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmVuYWJsZVJlc291cmNlTG9hZFN0YXRp c3RpY3NBbmRTZXRUZXN0aW5nQ2FsbGJhY2soRnVuY3Rpb248dm9pZCAoY29uc3QgU3RyaW5nJik+ JiYgY2FsbGJhY2spCiB7CiAgICAgaWYgKG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcykgewpJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhU3RvcmUuaAkocmV2aXNpb24gMjI3NTMzKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAs NiArMTAwLDggQEAgcHVibGljOgogCiAgICAgYm9vbCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5h YmxlZCgpIGNvbnN0OwogICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQo Ym9vbCk7CisgICAgYm9vbCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKCkgY29uc3Q7 CisgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKGJvb2wpOwogCiAg ICAgdWludDY0X3QgY2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVvdGEoKSBjb25zdCB7IHJldHVybiBt X3Jlc29sdmVkQ29uZmlndXJhdGlvbi5jYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YTsgfQogICAg IHZvaWQgc2V0Q2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVvdGEodWludDY0X3QgcXVvdGEpIHsgbV9y ZXNvbHZlZENvbmZpZ3VyYXRpb24uY2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVvdGEgPSBxdW90YTsg fQpAQCAtMTk3LDYgKzE5OSw3IEBAIHByaXZhdGU6CiAKICAgICBjb25zdCBSZWZQdHI8U3RvcmFn ZU1hbmFnZXI+IG1fc3RvcmFnZU1hbmFnZXI7CiAgICAgUmVmUHRyPFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZT4gbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzOworICAgIGJvb2wgbV9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlIHsgZmFsc2UgfTsKIAogICAgIFJlZjxXb3JrUXVl dWU+IG1fcXVldWU7CiAK 332554 2018-01-29 10:33:51 -0800 2018-01-29 12:18:47 -0800 Patch bug-182199-20180129103350.patch text/plain 18047 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE4LTAxLTI5ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogSW50cm9kdWNlIGRlYnVnIG1vZGUgYXMgZXhwZXJpbWVudGFsIGZlYXR1cmUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjE5OQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzY5MzAzNjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGFkZHMgYW4gZXhwZXJp bWVudGFsIGZlYXR1cmUuCisKKyAgICAgICAgVGhlIG9ubHkgY2hhbmdlcyB0byBkZWZhdWx0IGJl aGF2aW9yIGFyZToKKyAgICAgICAgLSBJbmNyZWFzZWQgcmVzb2x1dGlvbiBvbiB0aW1lc3RhbXBz IHdoaWNoIGlzIG5lZWRlZCB0byBiZSBhYmxlIHRvIHNldCBzaG9ydGVyCisgICAgICAgICAgdGlt ZW91dHMgaW4gZGVidWcgbW9kZS4KKyAgICAgICAgLSBPbmx5IHVwZGF0ZSBwYXJ0aXRpb25pbmcg YW5kIGJsb2NraW5nIHRhYmxlIHdoZW4gbmVlZGVkLiBUaGlzIGlzIGFuIG9wdGltaXphdGlvbgor ICAgICAgICAgIHdoaWNoIHBheXMgb2ZmIGluIGxlc3MgWFBDIHdpdGggc2hvcnRlciB0aW1lb3V0 cy4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpyZWR1Y2VUaW1lUmVzb2x1dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJjZUxvYWRpbmcpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dlYlNvY2tldExvYWRpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldp dGhSZWR1Y2VkVGltZVJlc29sdXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6cmVkdWNlVG9Ib3Vy bHlUaW1lUmVzb2x1dGlvbik6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9SdW50aW1lRW5hYmxl ZEZlYXR1cmVzLmg6CisgICAgICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpz ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJ1 bnRpbWVFbmFibGVkRmVhdHVyZXM6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgY29u c3QpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKwogMjAxOC0wMS0yOSAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSBm b3IgYXBwcyB0aGF0IHVzZSBib3RoIFdLMSBhbmQgV0syIHRvIHVzZSBNZXNzYWdlUG9ydHMuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAJ KHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRP YnNlcnZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDcgKzQ4LDcgQEAgdGVtcGxhdGU8dHlw ZW5hbWUgVD4gc3RhdGljIGlubGluZSBTdHJpbgogICAgIHJldHVybiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzOjpwcmltYXJ5RG9tYWluKHZhbHVlKTsKIH0KIAotc3RhdGljIFNlY29uZHMgdGltZXN0 YW1wUmVzb2x1dGlvbiB7IDFfaCB9Oworc3RhdGljIFNlY29uZHMgdGltZXN0YW1wUmVzb2x1dGlv biB7IDVfcyB9Owogc3RhdGljIGNvbnN0IFNlY29uZHMgbWluaW11bU5vdGlmaWNhdGlvbkludGVy dmFsIHsgNV9zIH07CiAKIFJlc291cmNlTG9hZE9ic2VydmVyJiBSZXNvdXJjZUxvYWRPYnNlcnZl cjo6c2hhcmVkKCkKQEAgLTEyNyw3ICsxMjcsNyBAQCBib29sIFJlc291cmNlTG9hZE9ic2VydmVy OjpzaG91bGRMb2coUGFnCiAgICAgcmV0dXJuIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6cmVz b3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKSAmJiAhcGFnZS0+dXNlc0VwaGVtZXJhbFNlc3Np b24oKSAmJiBtX25vdGlmaWNhdGlvbkNhbGxiYWNrOwogfQogCi1zdGF0aWMgV2FsbFRpbWUgcmVk dWNlVG9Ib3VybHlUaW1lUmVzb2x1dGlvbihXYWxsVGltZSB0aW1lKQorc3RhdGljIFdhbGxUaW1l IHJlZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lIHRpbWUpCiB7CiAgICAgcmV0dXJuIFdhbGxU aW1lOjpmcm9tUmF3U2Vjb25kcyhzdGQ6OmZsb29yKHRpbWUuc2Vjb25kc1NpbmNlRXBvY2goKSAv IHRpbWVzdGFtcFJlc29sdXRpb24pICogdGltZXN0YW1wUmVzb2x1dGlvbi5zZWNvbmRzKCkpOwog fQpAQCAtMTcwLDcgKzE3MCw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1l TmF2aWcKICAgICBpZiAodGFyZ2V0SG9zdCAhPSBtYWluRnJhbWVIb3N0CiAgICAgICAgICYmICEo YXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1l UHJpbWFyeURvbWFpbikgfHwgYXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFy eURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFpbikpKSB7CiAgICAgICAgIGF1dG8mIHRhcmdldFN0 YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdl dFByaW1hcnlEb21haW4pOwotICAgICAgICB0YXJnZXRTdGF0aXN0aWNzLmxhc3RTZWVuID0gcmVk dWNlVG9Ib3VybHlUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOworICAgICAgICB0YXJn ZXRTdGF0aXN0aWNzLmxhc3RTZWVuID0gcmVkdWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWU6Om5v dygpKTsKICAgICAgICAgaWYgKHRhcmdldFN0YXRpc3RpY3Muc3ViZnJhbWVVbmRlclRvcEZyYW1l T3JpZ2lucy5hZGQobWFpbkZyYW1lUHJpbWFyeURvbWFpbikuaXNOZXdFbnRyeSkKICAgICAgICAg ICAgIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjayA9IHRydWU7CiAgICAgfQpAQCAtMjI3 LDcgKzIyNyw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmMKICAg ICBib29sIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjayA9IGZhbHNlOwogICAgIHsKICAg ICAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0Zv clByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFpbik7Ci0gICAgICAgIHRhcmdldFN0YXRp c3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUb0hvdXJseVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpu b3coKSk7CisgICAgICAgIHRhcmdldFN0YXRpc3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUaW1lUmVz b2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwogICAgICAgICBpZiAodGFyZ2V0U3RhdGlzdGljcy5z dWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChtYWluRnJhbWVQcmltYXJ5RG9tYWlu KS5pc05ld0VudHJ5KQogICAgICAgICAgICAgc2hvdWxkQ2FsbE5vdGlmaWNhdGlvbkNhbGxiYWNr ID0gdHJ1ZTsKICAgICB9CkBAIC0yNjgsNyArMjY4LDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNl cnZlcjo6bG9nV2ViU29ja2V0TAogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvJiB0YXJnZXRT dGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0YXJn ZXRQcmltYXJ5RG9tYWluKTsKLSAgICB0YXJnZXRTdGF0aXN0aWNzLmxhc3RTZWVuID0gcmVkdWNl VG9Ib3VybHlUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOworICAgIHRhcmdldFN0YXRp c3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwog ICAgIGlmICh0YXJnZXRTdGF0aXN0aWNzLnN1YnJlc291cmNlVW5kZXJUb3BGcmFtZU9yaWdpbnMu YWRkKG1haW5GcmFtZVByaW1hcnlEb21haW4pLmlzTmV3RW50cnkpCiAgICAgICAgIHNjaGVkdWxl Tm90aWZpY2F0aW9uSWZOZWVkZWQoKTsKIH0KQEAgLTI4NSw3ICsyODUsNyBAQCB2b2lkIFJlc291 cmNlTG9hZE9ic2VydmVyOjpsb2dVc2VySW50ZXJhCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1 dG8gZG9tYWluID0gcHJpbWFyeURvbWFpbih1cmwpOwotICAgIGF1dG8gbmV3VGltZSA9IHJlZHVj ZVRvSG91cmx5VGltZVJlc29sdXRpb24oV2FsbFRpbWU6Om5vdygpKTsKKyAgICBhdXRvIG5ld1Rp bWUgPSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwogICAgIGF1dG8gbGFz dFJlcG9ydGVkVXNlckludGVyYWN0aW9uID0gbV9sYXN0UmVwb3J0ZWRVc2VySW50ZXJhY3Rpb25N YXAuZ2V0KGRvbWFpbik7CiAgICAgaWYgKG5ld1RpbWUgPT0gbGFzdFJlcG9ydGVkVXNlckludGVy YWN0aW9uKQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRp bWVFbmFibGVkRmVhdHVyZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1J1 bnRpbWVFbmFibGVkRmVhdHVyZXMuaAkocmV2aXNpb24gMjI3NzM5KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0NCw2 ICsyNDQsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRNZWRpYUNhcGFiaWxpdGllc0VuYWJsZWQo Ym9vbCBpc0VuYWJsZWQpIHsgbV9tZWRpYUNhcGFiaWxpdGllc0VuYWJsZWQgPSBpc0VuYWJsZWQ7 IH0KICAgICBib29sIG1lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1f bWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkOyB9CiAKKyAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0 YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBpc0VuYWJsZWQpIHsgbV9yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGVidWdNb2RlID0gaXNFbmFibGVkOyB9CisgICAgYm9vbCByZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGVidWdNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVi dWdNb2RlOyB9CisKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgUnVudGltZUVuYWJsZWRGZWF0 dXJlcyYgc2hhcmVkRmVhdHVyZXMoKTsKIAogcHJpdmF0ZToKQEAgLTM3Myw2ICszNzYsOCBAQCBw cml2YXRlOgogCiAgICAgYm9vbCBtX21lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZCB7IGZhbHNlIH07 CiAKKyAgICBib29sIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSB7IGZhbHNlIH07 CisgICAgCiAgICAgZnJpZW5kIGNsYXNzIFdURjo6TmV2ZXJEZXN0cm95ZWQ8UnVudGltZUVuYWJs ZWRGZWF0dXJlcz47CiB9OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlh bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCShyZXZp c2lvbiAyMjc3MzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwJKHdvcmtp bmcgY29weSkKQEAgLTcxMSwzICs3MTEsNiBAQCB0b3VjaEV2ZW50RW11bGF0aW9uRW5hYmxlZDoK IAogbWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkOgogICBpbml0aWFsOiBmYWxzZQorCityZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOgorICBpbml0aWFsOiBmYWxzZQpJbmRleDogU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ KHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMDEtMjkgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRl ckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0aXN0aWNzOiBJbnRyb2R1 Y2UgZGVidWcgbW9kZSBhcyBleHBlcmltZW50YWwgZmVhdHVyZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyMTk5CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8zNjkzMDM2ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgb25seSBjaGFuZ2VzIHRvIGRlZmF1bHQgYmVoYXZpb3IgYXJlOgorICAgICAg ICAtIEluY3JlYXNlZCByZXNvbHV0aW9uIG9uIHRpbWVzdGFtcHMgd2hpY2ggaXMgbmVlZGVkIHRv IGJlIGFibGUgdG8gc2V0IHNob3J0ZXIKKyAgICAgICAgICB0aW1lb3V0cyBpbiBkZWJ1ZyBtb2Rl LgorICAgICAgICAtIE9ubHkgdXBkYXRlIHBhcnRpdGlvbmluZyBhbmQgYmxvY2tpbmcgdGFibGUg d2hlbiBuZWVkZWQuIFRoaXMgaXMgYW4gb3B0aW1pemF0aW9uCisgICAgICAgICAgd2hpY2ggcGF5 cyBvZmYgaW4gbGVzcyBYUEMgd2l0aCBzaG9ydGVyIHRpbWVvdXRzLgorCisgICAgICAgICogU2hh cmVkL1dlYlByZWZlcmVuY2VzLnlhbWw6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElXZWJz aXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6cmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSBjb25zdCk6CisgICAgICAgIChBUEk6OldlYnNpdGVE YXRhU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwOgorICAgICAgICAoV0tXZWJzaXRlRGF0 YVN0b3JlU2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoLVtXS1dlYnNpdGVE YXRhU3RvcmUgX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGVdKToKKyAgICAgICAgKC1b V0tXZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOl0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0 ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNl dFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ1VzZXJJbnRlcmFjdGlvbik6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSBj b25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNldFJlc291cmNlTG9h ZFN0YXRpc3RpY3NEZWJ1Z01vZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVN0b3JlLmg6CisKIDIwMTgtMDEtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25A YXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgaXQgcG9zc2libGUgZm9yIGFwcHMgdGhhdCB1c2Ug Ym90aCBXSzEgYW5kIFdLMiB0byB1c2UgTWVzc2FnZVBvcnRzLgpJbmRleDogU291cmNlL1dlYktp dC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCShyZXZpc2lvbiAyMjc3MzkpCisrKyBTb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMTkz LDQgKzExOTMsMTIgQEAgV2ViVlJFbmFibGVkOgogICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246 ICJXZWJWUiBNb2R1bGUgc3VwcG9ydCIKICAgd2ViY29yZUJpbmRpbmc6IFJ1bnRpbWVFbmFibGVk RmVhdHVyZXMKICAgY2F0ZWdvcnk6IGV4cGVyaW1lbnRhbAotICBjb25kaXRpb246IFBMQVRGT1JN KEdUSykgfHwgUExBVEZPUk0oV1BFKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKyAgY29u ZGl0aW9uOiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKKworUmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RlYnVnTW9kZToKK3R5cGU6IGJvb2wKK2RlZmF1bHRWYWx1ZTogZmFsc2UKK2h1bWFu UmVhZGFibGVOYW1lOiAiSVRQIERlYnVnIE1vZGUiCitodW1hblJlYWRhYmxlRGVzY3JpcHRpb246 ICJJbnRlbGxpZ2VudCBUcmFja2luZyBQcmV2ZW50aW9uIERlYnVnIE1vZGUiCitjYXRlZ29yeTog ZXhwZXJpbWVudGFsCit3ZWJjb3JlQmluZGluZzogUnVudGltZUVuYWJsZWRGZWF0dXJlcwpJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUuY3BwCShyZXZpc2lvbiAyMjc3MzkpCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNjUsNiArMzY1LDE0IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpzdWIKICAgICB9KTsKIH0KIAordm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBlbmFibGUpCit7Cisg ICAgaWYgKGVuYWJsZSkKKyAgICAgICAgc2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUo MzBfcyk7CisgICAgZWxzZQorICAgICAgICByZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMo KTsKK30KKwogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ1VzZXJJbnRl cmFjdGlvbihjb25zdCBVUkwmIHVybCkKIHsKICAgICBpZiAodXJsLmlzQmxhbmtVUkwoKSB8fCB1 cmwuaXNFbXB0eSgpKQpAQCAtMzc1LDcgKzM4Myw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpsb2cKICAgICAgICAgc3RhdGlzdGljcy5oYWRVc2VySW50ZXJhY3Rpb24g PSB0cnVlOwogICAgICAgICBzdGF0aXN0aWNzLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1l ID0gV2FsbFRpbWU6Om5vdygpOwogCi0gICAgICAgIHVwZGF0ZUNvb2tpZVBhcnRpdGlvbmluZ0Zv ckRvbWFpbnMoeyB9LCB7IH0sIHsgcHJpbWFyeURvbWFpbiB9LCBTaG91bGRDbGVhckZpcnN0OjpO byk7CisgICAgICAgIGlmIChzdGF0aXN0aWNzLmlzTWFya2VkRm9yQ29va2llUGFydGl0aW9uaW5n IHx8IHN0YXRpc3RpY3MuaXNNYXJrZWRGb3JDb29raWVCbG9ja2luZykKKyAgICAgICAgICAgIHVw ZGF0ZUNvb2tpZVBhcnRpdGlvbmluZ0ZvckRvbWFpbnMoeyB9LCB7IH0sIHsgcHJpbWFyeURvbWFp biB9LCBTaG91bGRDbGVhckZpcnN0OjpObyk7CiAgICAgfSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oCShyZXZpc2lvbiAyMjc3MzkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtMTM5LDYgKzEz OSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFySW5NZW1vcnkoKTsKICAgICB2b2lkIGdyYW5k ZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwog CisgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKGJvb2wpOworCiAg ICAgdm9pZCBzZXRTdGF0aXN0aWNzVGVzdGluZ0NhbGxiYWNrKEZ1bmN0aW9uPHZvaWQgKGNvbnN0 IFN0cmluZyYpPiYmIGNhbGxiYWNrKSB7IG1fc3RhdGlzdGljc1Rlc3RpbmdDYWxsYmFjayA9IFdU Rk1vdmUoY2FsbGJhY2spOyB9CiAgICAgdm9pZCBsb2dUZXN0aW5nRXZlbnQoY29uc3QgU3RyaW5n Jik7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0 b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vi c2l0ZURhdGFTdG9yZS5jcHAJKHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTUs NiArOTUsMTYgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdAogICAg IG1fd2Vic2l0ZURhdGFTdG9yZS0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZW5h YmxlZCk7CiB9CiAKK2Jvb2wgV2Vic2l0ZURhdGFTdG9yZTo6cmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RlYnVnTW9kZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fd2Vic2l0ZURhdGFTdG9yZS0+cmVz b3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSgpOworfQorCit2b2lkIFdlYnNpdGVEYXRhU3Rv cmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBlbmFibGVkKQorewor ICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9k ZShlbmFibGVkKTsKK30KKwogI2lmICFQTEFURk9STShDT0NPQSkKIFN0cmluZyBXZWJzaXRlRGF0 YVN0b3JlOjpkZWZhdWx0TWVkaWFDYWNoZURpcmVjdG9yeSgpCiB7CkluZGV4OiBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmgJKHJldmlzaW9u IDIyNzczOSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0 b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDggQEAgcHVibGljOgogCiAgICAgYm9v bCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCgpIGNvbnN0OwogICAgIHZvaWQgc2V0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCk7CisgICAgYm9vbCByZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGVidWdNb2RlKCkgY29uc3Q7CisgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGVidWdNb2RlKGJvb2wpOwogCiAgICAgV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlJiB3 ZWJzaXRlRGF0YVN0b3JlKCkgeyByZXR1cm4gbV93ZWJzaXRlRGF0YVN0b3JlLmdldCgpOyB9CiAg ICAgSFRUUENvb2tpZVN0b3JlJiBodHRwQ29va2llU3RvcmUoKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNw cAkocmV2aXNpb24gMjI3NzM5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tX ZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiArNjMsMTEgQEAg Ym9vbCBXS1dlYnNpdGVEYXRhU3RvcmVHZXRSZXNvdXJjZUxvYWRTdAogICAgIHJldHVybiBXZWJL aXQ6OnRvSW1wbChkYXRhU3RvcmVSZWYpLT5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCgp OwogfQogCit2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NE ZWJ1Z01vZGUoV0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZiwgYm9vbCBlbmFibGUp Cit7CisgICAgV2ViS2l0Ojp0b0ltcGwoZGF0YVN0b3JlUmVmKS0+c2V0UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RlYnVnTW9kZShlbmFibGUpOworfQorCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNl dFN0YXRpc3RpY3NMYXN0U2VlbihXS1dlYnNpdGVEYXRhU3RvcmVSZWYgZGF0YVN0b3JlUmVmLCBX S1N0cmluZ1JlZiBob3N0LCBkb3VibGUgc2Vjb25kcykKIHsKICAgICBhdXRvKiBzdG9yZSA9IFdl YktpdDo6dG9JbXBsKGRhdGFTdG9yZVJlZiktPndlYnNpdGVEYXRhU3RvcmUoKS5yZXNvdXJjZUxv YWRTdGF0aXN0aWNzKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dl YnNpdGVEYXRhU3RvcmVSZWYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuaAkocmV2aXNpb24gMjI3NzM5KQorKysgU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmgJKHdvcmtp bmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAgV0tfRVhQT1JUIFdLV2Vic2l0ZURhdGFTdG9yZVJl ZiBXS1dlYnNpdAogCiBXS19FWFBPUlQgYm9vbCBXS1dlYnNpdGVEYXRhU3RvcmVHZXRSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChXS1dlYnNpdGVEYXRhU3RvcmVSZWYgZGF0YVN0b3JlUmVm KTsKIFdLX0VYUE9SVCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNldFJlc291cmNlTG9hZFN0YXRp c3RpY3NFbmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYsIGJvb2wgZW5h YmxlKTsKK1dLX0VYUE9SVCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNldFJlc291cmNlTG9hZFN0 YXRpc3RpY3NEZWJ1Z01vZGUoV0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZiwgYm9v bCBlbmFibGUpOwogV0tfRVhQT1JUIHZvaWQgV0tXZWJzaXRlRGF0YVN0b3JlU2V0U3RhdGlzdGlj c0xhc3RTZWVuKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYsIFdLU3RyaW5nUmVm IGhvc3QsIGRvdWJsZSBzZWNvbmRzKTsKIFdLX0VYUE9SVCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9y ZVNldFN0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShXS1dlYnNpdGVEYXRhU3RvcmVSZWYgZGF0 YVN0b3JlUmVmLCBXS1N0cmluZ1JlZiBob3N0LCBib29sIHZhbHVlKTsKIHR5cGVkZWYgdm9pZCAo KldLV2Vic2l0ZURhdGFTdG9yZUlzU3RhdGlzdGljc1ByZXZhbGVudFJlc291cmNlRnVuY3Rpb24p KGJvb2wgaXNQcmV2YWxlbnRSZXNvdXJjZSwgdm9pZCogZnVuY3Rpb25Db250ZXh0KTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0 ZURhdGFTdG9yZS5tbQkocmV2aXNpb24gMjI3NzM5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjM0 LDYgKzIzNCwxNiBAQCAtICh2b2lkKV9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlCiAg ICAgX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5zZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRW5hYmxlZChlbmFibGVkKTsKIH0KIAorLSAoQk9PTClfcmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RlYnVnTW9kZQoreworICAgIHJldHVybiBfd2Vic2l0ZURhdGFTdG9yZS0+d2Vic2l0 ZURhdGFTdG9yZSgpLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoKTsKK30KKworLSAo dm9pZClfc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZTooQk9PTCllbmFibGVkCit7 CisgICAgX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5zZXRSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGVidWdNb2RlKGVuYWJsZWQpOworfQorCiAtIChOU1VJbnRlZ2VyKV9jYWNo ZVN0b3JhZ2VQZXJPcmlnaW5RdW90YQogewogICAgIHJldHVybiBfd2Vic2l0ZURhdGFTdG9yZS0+ d2Vic2l0ZURhdGFTdG9yZSgpLmNhY2hlU3RvcmFnZVBlck9yaWdpblF1b3RhKCk7CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YnNpdGVEYXRhU3RvcmVQcml2YXRlLmgJKHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ1LDYgKzQ1LDcgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVnZXIs IF9XS1dlYnNpdAogLSAodm9pZClfZmV0Y2hEYXRhUmVjb3Jkc09mVHlwZXM6KE5TU2V0PE5TU3Ry aW5nICo+ICopZGF0YVR5cGVzIHdpdGhPcHRpb25zOihfV0tXZWJzaXRlRGF0YVN0b3JlRmV0Y2hP cHRpb25zKW9wdGlvbnMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TQXJyYXk8V0tXZWJz aXRlRGF0YVJlY29yZCAqPiAqKSljb21wbGV0aW9uSGFuZGxlcjsKIAogQHByb3BlcnR5IChub25h dG9taWMsIHNldHRlcj1fc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQ6KSBCT09MIF9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4x MiksIGlvcygxMC4wKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOikgQk9PTCBfcmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rl YnVnTW9kZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19U QkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldENhY2hlU3RvcmFnZVBlck9y aWdpblF1b3RhOikgTlNVSW50ZWdlciBfY2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVvdGEgV0tfQVBJ X0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiBAcHJvcGVy dHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRDYWNoZVN0b3JhZ2VEaXJlY3Rvcnk6KSBOU1N0cmlu ZyogX2NhY2hlU3RvcmFnZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNf VEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAJKHJldmlzaW9u IDIyNzczOSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEzLDYgKzE0MTMsMTcgQEAgdm9pZCBX ZWJzaXRlRGF0YVN0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdAogICAgICAgICBwcm9jZXNzUG9vbC0+ c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZmFsc2UpOwogfQogCitib29sIFdlYnNp dGVEYXRhU3RvcmU6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoKSBjb25zdAorewor ICAgIHJldHVybiBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGU7Cit9CisKK3ZvaWQg V2Vic2l0ZURhdGFTdG9yZTo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZShib29s IGVuYWJsZWQpCit7CisgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlID0gZW5h YmxlZDsKKyAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MtPnNldFJlc291cmNlTG9hZFN0YXRp c3RpY3NEZWJ1Z01vZGUoZW5hYmxlZCk7Cit9CisKIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6ZW5h YmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0FuZFNldFRlc3RpbmdDYWxsYmFjayhGdW5jdGlvbjx2 b2lkIChjb25zdCBTdHJpbmcmKT4mJiBjYWxsYmFjaykKIHsKICAgICBpZiAobV9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzKSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9XZWJzaXRlRGF0YVN0b3JlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCShyZXZpc2lvbiAyMjc3MzkpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJKHdv cmtpbmcgY29weSkKQEAgLTEwMCw2ICsxMDAsOCBAQCBwdWJsaWM6CiAKICAgICBib29sIHJlc291 cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRW5hYmxlZChib29sKTsKKyAgICBib29sIHJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEZWJ1Z01vZGUoKSBjb25zdDsKKyAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NE ZWJ1Z01vZGUoYm9vbCk7CiAKICAgICB1aW50NjRfdCBjYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90 YSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLmNhY2hlU3RvcmFnZVBl ck9yaWdpblF1b3RhOyB9CiAgICAgdm9pZCBzZXRDYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YSh1 aW50NjRfdCBxdW90YSkgeyBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi5jYWNoZVN0b3JhZ2VQZXJP cmlnaW5RdW90YSA9IHF1b3RhOyB9CkBAIC0xOTcsNiArMTk5LDcgQEAgcHJpdmF0ZToKIAogICAg IGNvbnN0IFJlZlB0cjxTdG9yYWdlTWFuYWdlcj4gbV9zdG9yYWdlTWFuYWdlcjsKICAgICBSZWZQ dHI8V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiBtX3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3M7CisgICAgYm9vbCBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgeyBmYWxzZSB9 OwogCiAgICAgUmVmPFdvcmtRdWV1ZT4gbV9xdWV1ZTsKIAo= 332566 2018-01-29 12:18:48 -0800 2018-01-29 16:10:06 -0800 Patch bug-182199-20180129121847.patch text/plain 18059 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE4LTAxLTI5ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogSW50cm9kdWNlIGRlYnVnIG1vZGUgYXMgZXhwZXJpbWVudGFsIGZlYXR1cmUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjE5OQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzY5MzAzNjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGFkZHMgYW4gZXhwZXJp bWVudGFsIGZlYXR1cmUuCisKKyAgICAgICAgVGhlIG9ubHkgY2hhbmdlcyB0byBkZWZhdWx0IGJl aGF2aW9yIGFyZToKKyAgICAgICAgLSBJbmNyZWFzZWQgcmVzb2x1dGlvbiBvbiB0aW1lc3RhbXBz IHdoaWNoIGlzIG5lZWRlZCB0byBiZSBhYmxlIHRvIHNldCBzaG9ydGVyCisgICAgICAgICAgdGlt ZW91dHMgaW4gZGVidWcgbW9kZS4KKyAgICAgICAgLSBPbmx5IHVwZGF0ZSBwYXJ0aXRpb25pbmcg YW5kIGJsb2NraW5nIHRhYmxlIHdoZW4gbmVlZGVkLiBUaGlzIGlzIGFuIG9wdGltaXphdGlvbgor ICAgICAgICAgIHdoaWNoIHBheXMgb2ZmIGluIGxlc3MgWFBDIHdpdGggc2hvcnRlciB0aW1lb3V0 cy4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpyZWR1Y2VUaW1lUmVzb2x1dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJjZUxvYWRpbmcpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dlYlNvY2tldExvYWRpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldp dGhSZWR1Y2VkVGltZVJlc29sdXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6cmVkdWNlVG9Ib3Vy bHlUaW1lUmVzb2x1dGlvbik6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9SdW50aW1lRW5hYmxl ZEZlYXR1cmVzLmg6CisgICAgICAgIChXZWJDb3JlOjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpz ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJ1 bnRpbWVFbmFibGVkRmVhdHVyZXM6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgY29u c3QpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKwogMjAxOC0wMS0yOSAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSBm b3IgYXBwcyB0aGF0IHVzZSBib3RoIFdLMSBhbmQgV0syIHRvIHVzZSBNZXNzYWdlUG9ydHMuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAJ KHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRP YnNlcnZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDcgKzQ4LDcgQEAgdGVtcGxhdGU8dHlw ZW5hbWUgVD4gc3RhdGljIGlubGluZSBTdHJpbgogICAgIHJldHVybiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzOjpwcmltYXJ5RG9tYWluKHZhbHVlKTsKIH0KIAotc3RhdGljIFNlY29uZHMgdGltZXN0 YW1wUmVzb2x1dGlvbiB7IDFfaCB9Oworc3RhdGljIFNlY29uZHMgdGltZXN0YW1wUmVzb2x1dGlv biB7IDVfcyB9Owogc3RhdGljIGNvbnN0IFNlY29uZHMgbWluaW11bU5vdGlmaWNhdGlvbkludGVy dmFsIHsgNV9zIH07CiAKIFJlc291cmNlTG9hZE9ic2VydmVyJiBSZXNvdXJjZUxvYWRPYnNlcnZl cjo6c2hhcmVkKCkKQEAgLTEyNyw3ICsxMjcsNyBAQCBib29sIFJlc291cmNlTG9hZE9ic2VydmVy OjpzaG91bGRMb2coUGFnCiAgICAgcmV0dXJuIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6cmVz b3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKSAmJiAhcGFnZS0+dXNlc0VwaGVtZXJhbFNlc3Np b24oKSAmJiBtX25vdGlmaWNhdGlvbkNhbGxiYWNrOwogfQogCi1zdGF0aWMgV2FsbFRpbWUgcmVk dWNlVG9Ib3VybHlUaW1lUmVzb2x1dGlvbihXYWxsVGltZSB0aW1lKQorc3RhdGljIFdhbGxUaW1l IHJlZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lIHRpbWUpCiB7CiAgICAgcmV0dXJuIFdhbGxU aW1lOjpmcm9tUmF3U2Vjb25kcyhzdGQ6OmZsb29yKHRpbWUuc2Vjb25kc1NpbmNlRXBvY2goKSAv IHRpbWVzdGFtcFJlc29sdXRpb24pICogdGltZXN0YW1wUmVzb2x1dGlvbi5zZWNvbmRzKCkpOwog fQpAQCAtMTcwLDcgKzE3MCw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1l TmF2aWcKICAgICBpZiAodGFyZ2V0SG9zdCAhPSBtYWluRnJhbWVIb3N0CiAgICAgICAgICYmICEo YXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1l UHJpbWFyeURvbWFpbikgfHwgYXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFy eURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFpbikpKSB7CiAgICAgICAgIGF1dG8mIHRhcmdldFN0 YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdl dFByaW1hcnlEb21haW4pOwotICAgICAgICB0YXJnZXRTdGF0aXN0aWNzLmxhc3RTZWVuID0gcmVk dWNlVG9Ib3VybHlUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOworICAgICAgICB0YXJn ZXRTdGF0aXN0aWNzLmxhc3RTZWVuID0gcmVkdWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWU6Om5v dygpKTsKICAgICAgICAgaWYgKHRhcmdldFN0YXRpc3RpY3Muc3ViZnJhbWVVbmRlclRvcEZyYW1l T3JpZ2lucy5hZGQobWFpbkZyYW1lUHJpbWFyeURvbWFpbikuaXNOZXdFbnRyeSkKICAgICAgICAg ICAgIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjayA9IHRydWU7CiAgICAgfQpAQCAtMjI3 LDcgKzIyNyw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmMKICAg ICBib29sIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjayA9IGZhbHNlOwogICAgIHsKICAg ICAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0Zv clByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFpbik7Ci0gICAgICAgIHRhcmdldFN0YXRp c3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUb0hvdXJseVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpu b3coKSk7CisgICAgICAgIHRhcmdldFN0YXRpc3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUaW1lUmVz b2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwogICAgICAgICBpZiAodGFyZ2V0U3RhdGlzdGljcy5z dWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChtYWluRnJhbWVQcmltYXJ5RG9tYWlu KS5pc05ld0VudHJ5KQogICAgICAgICAgICAgc2hvdWxkQ2FsbE5vdGlmaWNhdGlvbkNhbGxiYWNr ID0gdHJ1ZTsKICAgICB9CkBAIC0yNjgsNyArMjY4LDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNl cnZlcjo6bG9nV2ViU29ja2V0TAogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvJiB0YXJnZXRT dGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0YXJn ZXRQcmltYXJ5RG9tYWluKTsKLSAgICB0YXJnZXRTdGF0aXN0aWNzLmxhc3RTZWVuID0gcmVkdWNl VG9Ib3VybHlUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOworICAgIHRhcmdldFN0YXRp c3RpY3MubGFzdFNlZW4gPSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwog ICAgIGlmICh0YXJnZXRTdGF0aXN0aWNzLnN1YnJlc291cmNlVW5kZXJUb3BGcmFtZU9yaWdpbnMu YWRkKG1haW5GcmFtZVByaW1hcnlEb21haW4pLmlzTmV3RW50cnkpCiAgICAgICAgIHNjaGVkdWxl Tm90aWZpY2F0aW9uSWZOZWVkZWQoKTsKIH0KQEAgLTI4NSw3ICsyODUsNyBAQCB2b2lkIFJlc291 cmNlTG9hZE9ic2VydmVyOjpsb2dVc2VySW50ZXJhCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1 dG8gZG9tYWluID0gcHJpbWFyeURvbWFpbih1cmwpOwotICAgIGF1dG8gbmV3VGltZSA9IHJlZHVj ZVRvSG91cmx5VGltZVJlc29sdXRpb24oV2FsbFRpbWU6Om5vdygpKTsKKyAgICBhdXRvIG5ld1Rp bWUgPSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwogICAgIGF1dG8gbGFz dFJlcG9ydGVkVXNlckludGVyYWN0aW9uID0gbV9sYXN0UmVwb3J0ZWRVc2VySW50ZXJhY3Rpb25N YXAuZ2V0KGRvbWFpbik7CiAgICAgaWYgKG5ld1RpbWUgPT0gbGFzdFJlcG9ydGVkVXNlckludGVy YWN0aW9uKQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRp bWVFbmFibGVkRmVhdHVyZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1J1 bnRpbWVFbmFibGVkRmVhdHVyZXMuaAkocmV2aXNpb24gMjI3NzM5KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0NCw2 ICsyNDQsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRNZWRpYUNhcGFiaWxpdGllc0VuYWJsZWQo Ym9vbCBpc0VuYWJsZWQpIHsgbV9tZWRpYUNhcGFiaWxpdGllc0VuYWJsZWQgPSBpc0VuYWJsZWQ7 IH0KICAgICBib29sIG1lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1f bWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkOyB9CiAKKyAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0 YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBpc0VuYWJsZWQpIHsgbV9yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGVidWdNb2RlID0gaXNFbmFibGVkOyB9CisgICAgYm9vbCByZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGVidWdNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVi dWdNb2RlOyB9CisKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgUnVudGltZUVuYWJsZWRGZWF0 dXJlcyYgc2hhcmVkRmVhdHVyZXMoKTsKIAogcHJpdmF0ZToKQEAgLTM3Myw2ICszNzYsOCBAQCBw cml2YXRlOgogCiAgICAgYm9vbCBtX21lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZCB7IGZhbHNlIH07 CiAKKyAgICBib29sIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSB7IGZhbHNlIH07 CisgICAgCiAgICAgZnJpZW5kIGNsYXNzIFdURjo6TmV2ZXJEZXN0cm95ZWQ8UnVudGltZUVuYWJs ZWRGZWF0dXJlcz47CiB9OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlh bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCShyZXZp c2lvbiAyMjc3MzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwJKHdvcmtp bmcgY29weSkKQEAgLTcxMSwzICs3MTEsNiBAQCB0b3VjaEV2ZW50RW11bGF0aW9uRW5hYmxlZDoK IAogbWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkOgogICBpbml0aWFsOiBmYWxzZQorCityZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOgorICBpbml0aWFsOiBmYWxzZQpJbmRleDogU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ KHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMDEtMjkgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRl ckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0aXN0aWNzOiBJbnRyb2R1 Y2UgZGVidWcgbW9kZSBhcyBleHBlcmltZW50YWwgZmVhdHVyZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyMTk5CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8zNjkzMDM2ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgb25seSBjaGFuZ2VzIHRvIGRlZmF1bHQgYmVoYXZpb3IgYXJlOgorICAgICAg ICAtIEluY3JlYXNlZCByZXNvbHV0aW9uIG9uIHRpbWVzdGFtcHMgd2hpY2ggaXMgbmVlZGVkIHRv IGJlIGFibGUgdG8gc2V0IHNob3J0ZXIKKyAgICAgICAgICB0aW1lb3V0cyBpbiBkZWJ1ZyBtb2Rl LgorICAgICAgICAtIE9ubHkgdXBkYXRlIHBhcnRpdGlvbmluZyBhbmQgYmxvY2tpbmcgdGFibGUg d2hlbiBuZWVkZWQuIFRoaXMgaXMgYW4gb3B0aW1pemF0aW9uCisgICAgICAgICAgd2hpY2ggcGF5 cyBvZmYgaW4gbGVzcyBYUEMgd2l0aCBzaG9ydGVyIHRpbWVvdXRzLgorCisgICAgICAgICogU2hh cmVkL1dlYlByZWZlcmVuY2VzLnlhbWw6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElXZWJz aXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6cmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSBjb25zdCk6CisgICAgICAgIChBUEk6OldlYnNpdGVE YXRhU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwOgorICAgICAgICAoV0tXZWJzaXRlRGF0 YVN0b3JlU2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoLVtXS1dlYnNpdGVE YXRhU3RvcmUgX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGVdKToKKyAgICAgICAgKC1b V0tXZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOl0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0 ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNl dFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ1VzZXJJbnRlcmFjdGlvbik6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSBj b25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNldFJlc291cmNlTG9h ZFN0YXRpc3RpY3NEZWJ1Z01vZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVN0b3JlLmg6CisKIDIwMTgtMDEtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25A YXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgaXQgcG9zc2libGUgZm9yIGFwcHMgdGhhdCB1c2Ug Ym90aCBXSzEgYW5kIFdLMiB0byB1c2UgTWVzc2FnZVBvcnRzLgpJbmRleDogU291cmNlL1dlYktp dC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCShyZXZpc2lvbiAyMjc3MzkpCisrKyBTb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMTkz LDQgKzExOTMsMTIgQEAgV2ViVlJFbmFibGVkOgogICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246 ICJXZWJWUiBNb2R1bGUgc3VwcG9ydCIKICAgd2ViY29yZUJpbmRpbmc6IFJ1bnRpbWVFbmFibGVk RmVhdHVyZXMKICAgY2F0ZWdvcnk6IGV4cGVyaW1lbnRhbAotICBjb25kaXRpb246IFBMQVRGT1JN KEdUSykgfHwgUExBVEZPUk0oV1BFKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKyAgY29u ZGl0aW9uOiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKKworUmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RlYnVnTW9kZToKKyAgdHlwZTogYm9vbAorICBkZWZhdWx0VmFsdWU6IGZhbHNlCisg IGh1bWFuUmVhZGFibGVOYW1lOiAiSVRQIERlYnVnIE1vZGUiCisgIGh1bWFuUmVhZGFibGVEZXNj cmlwdGlvbjogIkludGVsbGlnZW50IFRyYWNraW5nIFByZXZlbnRpb24gRGVidWcgTW9kZSIKKyAg Y2F0ZWdvcnk6IGV4cGVyaW1lbnRhbAorICB3ZWJjb3JlQmluZGluZzogUnVudGltZUVuYWJsZWRG ZWF0dXJlcwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCShyZXZpc2lvbiAyMjc3MzkpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zNjUsNiArMzY1LDE0IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpzdWIKICAgICB9KTsKIH0KIAordm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBl bmFibGUpCit7CisgICAgaWYgKGVuYWJsZSkKKyAgICAgICAgc2V0VGltZVRvTGl2ZUNvb2tpZVBh cnRpdGlvbkZyZWUoMzBfcyk7CisgICAgZWxzZQorICAgICAgICByZXNldFBhcmFtZXRlcnNUb0Rl ZmF1bHRWYWx1ZXMoKTsKK30KKwogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OmxvZ1VzZXJJbnRlcmFjdGlvbihjb25zdCBVUkwmIHVybCkKIHsKICAgICBpZiAodXJsLmlzQmxh bmtVUkwoKSB8fCB1cmwuaXNFbXB0eSgpKQpAQCAtMzc1LDcgKzM4Myw4IEBAIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2cKICAgICAgICAgc3RhdGlzdGljcy5oYWRVc2Vy SW50ZXJhY3Rpb24gPSB0cnVlOwogICAgICAgICBzdGF0aXN0aWNzLm1vc3RSZWNlbnRVc2VySW50 ZXJhY3Rpb25UaW1lID0gV2FsbFRpbWU6Om5vdygpOwogCi0gICAgICAgIHVwZGF0ZUNvb2tpZVBh cnRpdGlvbmluZ0ZvckRvbWFpbnMoeyB9LCB7IH0sIHsgcHJpbWFyeURvbWFpbiB9LCBTaG91bGRD bGVhckZpcnN0OjpObyk7CisgICAgICAgIGlmIChzdGF0aXN0aWNzLmlzTWFya2VkRm9yQ29va2ll UGFydGl0aW9uaW5nIHx8IHN0YXRpc3RpY3MuaXNNYXJrZWRGb3JDb29raWVCbG9ja2luZykKKyAg ICAgICAgICAgIHVwZGF0ZUNvb2tpZVBhcnRpdGlvbmluZ0ZvckRvbWFpbnMoeyB9LCB7IH0sIHsg cHJpbWFyeURvbWFpbiB9LCBTaG91bGRDbGVhckZpcnN0OjpObyk7CiAgICAgfSk7CiB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5oCShyZXZpc2lvbiAyMjc3MzkpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAkod29ya2luZyBjb3B5KQpA QCAtMTM5LDYgKzEzOSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFySW5NZW1vcnkoKTsKICAg ICB2b2lkIGdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YShDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKCk+JiYpOwogCisgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2Rl KGJvb2wpOworCiAgICAgdm9pZCBzZXRTdGF0aXN0aWNzVGVzdGluZ0NhbGxiYWNrKEZ1bmN0aW9u PHZvaWQgKGNvbnN0IFN0cmluZyYpPiYmIGNhbGxiYWNrKSB7IG1fc3RhdGlzdGljc1Rlc3RpbmdD YWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spOyB9CiAgICAgdm9pZCBsb2dUZXN0aW5nRXZlbnQo Y29uc3QgU3RyaW5nJik7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElX ZWJzaXRlRGF0YVN0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5jcHAJKHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtOTUsNiArOTUsMTYgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZXRSZXNvdXJj ZUxvYWRTdAogICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0VuYWJsZWQoZW5hYmxlZCk7CiB9CiAKK2Jvb2wgV2Vic2l0ZURhdGFTdG9yZTo6cmVzb3VyY2VM b2FkU3RhdGlzdGljc0RlYnVnTW9kZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fd2Vic2l0ZURh dGFTdG9yZS0+cmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSgpOworfQorCit2b2lkIFdl YnNpdGVEYXRhU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBl bmFibGVkKQoreworICAgIG1fd2Vic2l0ZURhdGFTdG9yZS0+c2V0UmVzb3VyY2VMb2FkU3RhdGlz dGljc0RlYnVnTW9kZShlbmFibGVkKTsKK30KKwogI2lmICFQTEFURk9STShDT0NPQSkKIFN0cmlu ZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TWVkaWFDYWNoZURpcmVjdG9yeSgpCiB7CkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3Jl LmgJKHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElX ZWJzaXRlRGF0YVN0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDggQEAgcHVibGlj OgogCiAgICAgYm9vbCByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCgpIGNvbnN0OwogICAg IHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCk7CisgICAgYm9vbCBy ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKCkgY29uc3Q7CisgICAgdm9pZCBzZXRSZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKGJvb2wpOwogCiAgICAgV2ViS2l0OjpXZWJzaXRl RGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3JlKCkgeyByZXR1cm4gbV93ZWJzaXRlRGF0YVN0b3Jl LmdldCgpOyB9CiAgICAgSFRUUENvb2tpZVN0b3JlJiBodHRwQ29va2llU3RvcmUoKTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0 YVN0b3JlUmVmLmNwcAkocmV2aXNpb24gMjI3NzM5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjMs NiArNjMsMTEgQEAgYm9vbCBXS1dlYnNpdGVEYXRhU3RvcmVHZXRSZXNvdXJjZUxvYWRTdAogICAg IHJldHVybiBXZWJLaXQ6OnRvSW1wbChkYXRhU3RvcmVSZWYpLT5yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRW5hYmxlZCgpOwogfQogCit2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNldFJlc291cmNlTG9h ZFN0YXRpc3RpY3NEZWJ1Z01vZGUoV0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZiwg Ym9vbCBlbmFibGUpCit7CisgICAgV2ViS2l0Ojp0b0ltcGwoZGF0YVN0b3JlUmVmKS0+c2V0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZShlbmFibGUpOworfQorCiB2b2lkIFdLV2Vic2l0 ZURhdGFTdG9yZVNldFN0YXRpc3RpY3NMYXN0U2VlbihXS1dlYnNpdGVEYXRhU3RvcmVSZWYgZGF0 YVN0b3JlUmVmLCBXS1N0cmluZ1JlZiBob3N0LCBkb3VibGUgc2Vjb25kcykKIHsKICAgICBhdXRv KiBzdG9yZSA9IFdlYktpdDo6dG9JbXBsKGRhdGFTdG9yZVJlZiktPndlYnNpdGVEYXRhU3RvcmUo KS5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuaAkocmV2aXNpb24gMjI3 NzM5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3Jl UmVmLmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAgV0tfRVhQT1JUIFdLV2Vic2l0 ZURhdGFTdG9yZVJlZiBXS1dlYnNpdAogCiBXS19FWFBPUlQgYm9vbCBXS1dlYnNpdGVEYXRhU3Rv cmVHZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChXS1dlYnNpdGVEYXRhU3RvcmVSZWYg ZGF0YVN0b3JlUmVmKTsKIFdLX0VYUE9SVCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNldFJlc291 cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVS ZWYsIGJvb2wgZW5hYmxlKTsKK1dLX0VYUE9SVCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVNldFJl c291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoV0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFT dG9yZVJlZiwgYm9vbCBlbmFibGUpOwogV0tfRVhQT1JUIHZvaWQgV0tXZWJzaXRlRGF0YVN0b3Jl U2V0U3RhdGlzdGljc0xhc3RTZWVuKFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYs IFdLU3RyaW5nUmVmIGhvc3QsIGRvdWJsZSBzZWNvbmRzKTsKIFdLX0VYUE9SVCB2b2lkIFdLV2Vi c2l0ZURhdGFTdG9yZVNldFN0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShXS1dlYnNpdGVEYXRh U3RvcmVSZWYgZGF0YVN0b3JlUmVmLCBXS1N0cmluZ1JlZiBob3N0LCBib29sIHZhbHVlKTsKIHR5 cGVkZWYgdm9pZCAoKldLV2Vic2l0ZURhdGFTdG9yZUlzU3RhdGlzdGljc1ByZXZhbGVudFJlc291 cmNlRnVuY3Rpb24pKGJvb2wgaXNQcmV2YWxlbnRSZXNvdXJjZSwgdm9pZCogZnVuY3Rpb25Db250 ZXh0KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVE YXRhU3RvcmUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQkocmV2aXNpb24gMjI3NzM5KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQkod29ya2luZyBj b3B5KQpAQCAtMjM0LDYgKzIzNCwxNiBAQCAtICh2b2lkKV9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRW5hYmxlCiAgICAgX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5zZXRS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChlbmFibGVkKTsKIH0KIAorLSAoQk9PTClfcmVz b3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZQoreworICAgIHJldHVybiBfd2Vic2l0ZURhdGFT dG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUo KTsKK30KKworLSAodm9pZClfc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZTooQk9P TCllbmFibGVkCit7CisgICAgX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5z ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKGVuYWJsZWQpOworfQorCiAtIChOU1VJ bnRlZ2VyKV9jYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YQogewogICAgIHJldHVybiBfd2Vic2l0 ZURhdGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLmNhY2hlU3RvcmFnZVBlck9yaWdpblF1b3Rh KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0 YVN0b3JlUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmgJKHJldmlzaW9uIDIyNzczOSkKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2 YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYgKzQ1LDcgQEAgdHlwZWRlZiBOU19PUFRJT05T KE5TVUludGVnZXIsIF9XS1dlYnNpdAogLSAodm9pZClfZmV0Y2hEYXRhUmVjb3Jkc09mVHlwZXM6 KE5TU2V0PE5TU3RyaW5nICo+ICopZGF0YVR5cGVzIHdpdGhPcHRpb25zOihfV0tXZWJzaXRlRGF0 YVN0b3JlRmV0Y2hPcHRpb25zKW9wdGlvbnMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5T QXJyYXk8V0tXZWJzaXRlRGF0YVJlY29yZCAqPiAqKSljb21wbGV0aW9uSGFuZGxlcjsKIAogQHBy b3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJs ZWQ6KSBCT09MIF9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCBXS19BUElfQVZBSUxBQkxF KG1hY29zeCgxMC4xMiksIGlvcygxMC4wKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVy PV9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOikgQk9PTCBfcmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RlYnVnTW9kZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldENhY2hl U3RvcmFnZVBlck9yaWdpblF1b3RhOikgTlNVSW50ZWdlciBfY2FjaGVTdG9yYWdlUGVyT3JpZ2lu UXVvdGEgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJB KSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRDYWNoZVN0b3JhZ2VEaXJlY3Rv cnk6KSBOU1N0cmluZyogX2NhY2hlU3RvcmFnZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1h Y29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIApJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5j cHAJKHJldmlzaW9uIDIyNzczOSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVE YXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEzLDYgKzE0MTMs MTcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdAogICAgICAgICBw cm9jZXNzUG9vbC0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZmFsc2UpOwogfQog Citib29sIFdlYnNpdGVEYXRhU3RvcmU6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUo KSBjb25zdAoreworICAgIHJldHVybiBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGU7 Cit9CisKK3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rl YnVnTW9kZShib29sIGVuYWJsZWQpCit7CisgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVi dWdNb2RlID0gZW5hYmxlZDsKKyAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MtPnNldFJlc291 cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoZW5hYmxlZCk7Cit9CisKIHZvaWQgV2Vic2l0ZURh dGFTdG9yZTo6ZW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0FuZFNldFRlc3RpbmdDYWxsYmFj ayhGdW5jdGlvbjx2b2lkIChjb25zdCBTdHJpbmcmKT4mJiBjYWxsYmFjaykKIHsKICAgICBpZiAo bV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzKSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCShyZXZpc2lvbiAy Mjc3MzkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0 YVN0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw2ICsxMDAsOCBAQCBwdWJsaWM6CiAKICAg ICBib29sIHJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKCkgY29uc3Q7CiAgICAgdm9pZCBz ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sKTsKKyAgICBib29sIHJlc291cmNl TG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoKSBjb25zdDsKKyAgICB2b2lkIHNldFJlc291cmNlTG9h ZFN0YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCk7CiAKICAgICB1aW50NjRfdCBjYWNoZVN0b3JhZ2VQ ZXJPcmlnaW5RdW90YSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLmNh Y2hlU3RvcmFnZVBlck9yaWdpblF1b3RhOyB9CiAgICAgdm9pZCBzZXRDYWNoZVN0b3JhZ2VQZXJP cmlnaW5RdW90YSh1aW50NjRfdCBxdW90YSkgeyBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi5jYWNo ZVN0b3JhZ2VQZXJPcmlnaW5RdW90YSA9IHF1b3RhOyB9CkBAIC0xOTcsNiArMTk5LDcgQEAgcHJp dmF0ZToKIAogICAgIGNvbnN0IFJlZlB0cjxTdG9yYWdlTWFuYWdlcj4gbV9zdG9yYWdlTWFuYWdl cjsKICAgICBSZWZQdHI8V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiBtX3Jlc291cmNl TG9hZFN0YXRpc3RpY3M7CisgICAgYm9vbCBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01v ZGUgeyBmYWxzZSB9OwogCiAgICAgUmVmPFdvcmtRdWV1ZT4gbV9xdWV1ZTsKIAo=