119709 2013-08-12 17:40:27 -0700 Remotely hosted plugins don’t work in window-server-hosted WebKit1 views 2013-08-14 16:07:31 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca jer.noble koivisto sam simon.fraser oldest_to_newest 916466 0 thorton 2013-08-12 17:40:27 -0700 The plugin's layers are always hosted in the app, but the rest of the layer tree is (if requested) window-server-hosted. We need to conditionally create the plugin’s layers in the WindowServer if need be. <rdar://problem/14717572> 916471 1 208578 thorton 2013-08-12 17:54:35 -0700 Created attachment 208578 patch 916852 2 208667 thorton 2013-08-13 13:07:21 -0700 Created attachment 208667 patch with dynamic updating 916854 3 208667 andersca 2013-08-13 13:09:13 -0700 Comment on attachment 208667 patch with dynamic updating View in context: https://bugs.webkit.org/attachment.cgi?id=208667&action=review > Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm:259 > + BOOL shouldHostLayersInWindowServer = [self windowHostsLayersInWindowServer]; I think you should declare this as bool instead. > Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm:260 > + if (_hostsLayersInWindowServer != shouldHostLayersInWindowServer) Otherwise this might not do what you want it to. 916857 4 thorton 2013-08-13 13:33:20 -0700 Thanks, Anders! http://trac.webkit.org/changeset/154019 917098 5 koivisto 2013-08-14 06:00:39 -0700 This made many plugin tests time out: http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK1%20(Tests)/r154019%20(9412)/results.html 917142 6 jer.noble 2013-08-14 09:18:49 -0700 Reverted in http://trac.webkit.org/changeset/154050. Caused >50 layout tests to fail, breaking the WebKit1 test bots completely. 917166 7 thorton 2013-08-14 10:14:52 -0700 Reopening since it's reverted. The tests all pass locally, I'll have to test on Mountain Lion. 917322 8 thorton 2013-08-14 16:07:31 -0700 MIG .defs were in the wrong order http://trac.webkit.org/changeset/154078 208578 2013-08-12 17:54:35 -0700 2013-08-13 13:07:21 -0700 patch plugin-host-opensource.diff text/plain 7088 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCA5M2IxZjVmLi5lYjQ1ZTM4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTMtMDgtMTIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmVtb3RlbHkgaG9zdGVkIHBsdWdpbnMgZG9u4oCZdCB3b3Jr IGluIHdpbmRvdy1zZXJ2ZXItaG9zdGVkIFdlYktpdDEgdmlld3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTcwOQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMTQ3MTc1NzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyLmg6Cisg ICAgICAgIEFkZCBob3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIgYXJndW1lbnQgdG8gaW5zdGFudGlh dGVQbHVnaW4uCisKKyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RN YW5hZ2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyOjpp bnN0YW50aWF0ZVBsdWdpbik6CisgICAgICAgIEFkZCBob3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIg YXJndW1lbnQgdG8gaW5zdGFudGlhdGVQbHVnaW4sIGFuZCBwYXNzIGl0IHRocm91Z2ggdG8gV2Vi S2l0UGx1Z2luSG9zdC4KKworICAgICAgICAqIFBsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNj YXBlUGx1Z2luVmlldy5tbToKKyAgICAgICAgKC1bV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3 IGNyZWF0ZVBsdWdpbl0pOgorICAgICAgICBEcml2ZS1ieSBzcGVsbGluZyBmaXguCisgICAgICAg IEluc3RhbnRpYXRlIHRoZSBwbHVnaW4gd2l0aCB3aW5kb3ctc2VydmVyIGhvc3RpbmcgaWYgdGhl IFdlYlZpZXcncyB3aW5kb3cgaXMgdXNpbmcgd2luZG93LXNlcnZlciBob3N0aW5nLgorCiAyMDEz LTA4LTA4ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAg IG5hdmlnYXRvci5wbHVnaW5zIGhhcyBwbHVnaW5zIGluIGl0IHdoZW4gcGx1Z2lucyBhcmUgZGlz YWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNj YXBlUGx1Z2luSG9zdE1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVk L05ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIuaAppbmRleCBhOTc3MTJmLi42Yjk1NDQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhv c3RNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2Nh cGVQbHVnaW5Ib3N0TWFuYWdlci5oCkBAIC00NCw3ICs0NCw3IEBAIGNsYXNzIE5ldHNjYXBlUGx1 Z2luSG9zdE1hbmFnZXIgewogcHVibGljOgogICAgIHN0YXRpYyBOZXRzY2FwZVBsdWdpbkhvc3RN YW5hZ2VyJiBzaGFyZWQoKTsKICAgICAKLSAgICBQYXNzUmVmUHRyPE5ldHNjYXBlUGx1Z2luSW5z dGFuY2VQcm94eT4gaW5zdGFudGlhdGVQbHVnaW4oY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBj cHVfdHlwZV90IHBsdWdpbkFyY2hpdGVjdHVyZSwgY29uc3QgU3RyaW5nJiBidW5kbGVJZGVudGlm aWVyLCBXZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcgKiwgTlNTdHJpbmcgKm1pbWVUeXBlLCBO U0FycmF5ICphdHRyaWJ1dGVLZXlzLCBOU0FycmF5ICphdHRyaWJ1dGVWYWx1ZXMsIE5TU3RyaW5n ICp1c2VyQWdlbnQsIE5TVVJMICpzb3VyY2VVUkwsIGJvb2wgZnVsbEZyYW1lLCBib29sIGlzUHJp dmF0ZUJyb3dzaW5nRW5hYmxlZCwgYm9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVk KTsKKyAgICBQYXNzUmVmUHRyPE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eT4gaW5zdGFudGlh dGVQbHVnaW4oY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBjcHVfdHlwZV90IHBsdWdpbkFyY2hp dGVjdHVyZSwgY29uc3QgU3RyaW5nJiBidW5kbGVJZGVudGlmaWVyLCBXZWJIb3N0ZWROZXRzY2Fw ZVBsdWdpblZpZXcgKiwgTlNTdHJpbmcgKm1pbWVUeXBlLCBOU0FycmF5ICphdHRyaWJ1dGVLZXlz LCBOU0FycmF5ICphdHRyaWJ1dGVWYWx1ZXMsIE5TU3RyaW5nICp1c2VyQWdlbnQsIE5TVVJMICpz b3VyY2VVUkwsIGJvb2wgZnVsbEZyYW1lLCBib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwg Ym9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkLCBib29sIGhvc3RMYXllcnNJbldp bmRvd1NlcnZlcik7CiAKICAgICB2b2lkIHBsdWdpbkhvc3REaWVkKE5ldHNjYXBlUGx1Z2luSG9z dFByb3h5Kik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVk L05ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5z L0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyLm1tCmluZGV4IGZiZGE3OTkuLjEwNDI4 NTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2Fw ZVBsdWdpbkhvc3RNYW5hZ2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9z dGVkL05ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIubW0KQEAgLTIxOCw3ICsyMTgsNyBAQCB2b2lk IE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6OnBsdWdpbkhvc3REaWVkKE5ldHNjYXBlUGx1Z2lu SG9zdFByb3h5KiBwbHVnaW5IbwogICAgIH0KIH0KIAotUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk+IE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6Omluc3RhbnRpYXRlUGx1 Z2luKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1 cmUsIGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmllciwgV2ViSG9zdGVkTmV0c2NhcGVQbHVn aW5WaWV3ICpwbHVnaW5WaWV3LCBOU1N0cmluZyAqbWltZVR5cGUsIE5TQXJyYXkgKmF0dHJpYnV0 ZUtleXMsIE5TQXJyYXkgKmF0dHJpYnV0ZVZhbHVlcywgTlNTdHJpbmcgKnVzZXJBZ2VudCwgTlNV UkwgKnNvdXJjZVVSTCwgYm9vbCBmdWxsRnJhbWUsIGJvb2wgaXNQcml2YXRlQnJvd3NpbmdFbmFi bGVkLCBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpCitQYXNzUmVmUHRyPE5l dHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eT4gTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6aW5z dGFudGlhdGVQbHVnaW4oY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBjcHVfdHlwZV90IHBsdWdp bkFyY2hpdGVjdHVyZSwgY29uc3QgU3RyaW5nJiBidW5kbGVJZGVudGlmaWVyLCBXZWJIb3N0ZWRO ZXRzY2FwZVBsdWdpblZpZXcgKnBsdWdpblZpZXcsIE5TU3RyaW5nICptaW1lVHlwZSwgTlNBcnJh eSAqYXR0cmlidXRlS2V5cywgTlNBcnJheSAqYXR0cmlidXRlVmFsdWVzLCBOU1N0cmluZyAqdXNl ckFnZW50LCBOU1VSTCAqc291cmNlVVJMLCBib29sIGZ1bGxGcmFtZSwgYm9vbCBpc1ByaXZhdGVC cm93c2luZ0VuYWJsZWQsIGJvb2wgaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCwgYm9v bCBob3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIpCiB7CiAgICAgTmV0c2NhcGVQbHVnaW5Ib3N0UHJv eHkqIGhvc3RQcm94eSA9IGhvc3RGb3JQbHVnaW4ocGx1Z2luUGF0aCwgcGx1Z2luQXJjaGl0ZWN0 dXJlLCBidW5kbGVJZGVudGlmaWVyKTsKICAgICBpZiAoIWhvc3RQcm94eSkKQEAgLTI0NCw2ICsy NDQsNyBAQCBQYXNzUmVmUHRyPE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eT4gTmV0c2NhcGVQ bHVnaW5Ib3N0TWFuYWdlcjo6aW5zdGFudGlhdGVQbAogICAgIFtwcm9wZXJ0aWVzLmdldCgpIHNl dE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6ZnVsbEZyYW1lXSBmb3JLZXk6QCJmdWxs RnJhbWUiXTsKICAgICBbcHJvcGVydGllcy5nZXQoKSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJl cldpdGhCb29sOmlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZF0gZm9yS2V5OkAicHJpdmF0ZUJyb3dz aW5nRW5hYmxlZCJdOwogICAgIFtwcm9wZXJ0aWVzLmdldCgpIHNldE9iamVjdDpbTlNOdW1iZXIg bnVtYmVyV2l0aEJvb2w6aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZF0gZm9yS2V5OkAi YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQiXTsKKyAgICBbcHJvcGVydGllcy5nZXQoKSBz ZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOmhvc3RMYXllcnNJbldpbmRvd1NlcnZl cl0gZm9yS2V5OkAiaG9zdExheWVyc0luV2luZG93U2VydmVyIl07CiAKICAgICBOU0RhdGEgKmRh dGEgPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIGRhdGFGcm9tUHJvcGVydHlMaXN0OnBy b3BlcnRpZXMuZ2V0KCkgZm9ybWF0Ok5TUHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgZXJy b3JEZXNjcmlwdGlvbjpuaWxdOwogICAgIEFTU0VSVChkYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5t bSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1 Z2luVmlldy5tbQppbmRleCAxYzIyNjMxLi45ZDRhY2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0KKysr IGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvV2ViSG9zdGVkTmV0c2NhcGVQbHVn aW5WaWV3Lm1tCkBAIC02MCw2ICs2MCwxMiBAQCBleHRlcm4gIkMiIHsKICNpbmNsdWRlICJXZWJL aXRQbHVnaW5Ib3N0LmgiCiB9CiAKKyNpZiBIQVZFKExBWUVSX0hPU1RJTkdfSU5fV0lORE9XX1NF UlZFUikKK0BpbnRlcmZhY2UgTlNXaW5kb3cgKERldGFpbHMpCistIChCT09MKV9ob3N0c0xheWVy c0luV2luZG93U2VydmVyOworQGVuZAorI2VuZGlmCisKIEBpbXBsZW1lbnRhdGlvbiBXZWJIb3N0 ZWROZXRzY2FwZVBsdWdpblZpZXcKIAogKyAodm9pZClpbml0aWFsaXplCkBAIC0xMDgsMTMgKzEx NCwxOCBAQCBleHRlcm4gIkMiIHsKICAgICBBU1NFUlQoIV9wcm94eSk7CiAKICAgICBOU1N0cmlu ZyAqdXNlckFnZW50ID0gW1tzZWxmIHdlYlZpZXddIHVzZXJBZ2VudEZvclVSTDpfYmFzZVVSTC5n ZXQoKV07Ci0gICAgQk9PTCBhY2NsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkID0gZmFsc2U7Cisg ICAgQk9PTCBhY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCA9IGZhbHNlOwogI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICBhY2NsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVk ID0gW1tbc2VsZiB3ZWJWaWV3XSBwcmVmZXJlbmNlc10gYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Vu YWJsZWRdOworICAgIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkID0gW1tbc2VsZiB3ZWJW aWV3XSBwcmVmZXJlbmNlc10gYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRdOworI2VuZGlm CisKKyAgICBCT09MIGhvc3RMYXllcnNJbldpbmRvd1NlcnZlciA9IGZhbHNlOworI2lmIEhBVkUo TEFZRVJfSE9TVElOR19JTl9XSU5ET1dfU0VSVkVSKQorICAgIGhvc3RMYXllcnNJbldpbmRvd1Nl cnZlciA9IFtbW3NlbGYgd2ViVmlld10gd2luZG93XSBfaG9zdHNMYXllcnNJbldpbmRvd1NlcnZl cl07CiAjZW5kaWYKICAgICAKICAgICBfcHJveHkgPSBOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2Vy OjpzaGFyZWQoKS5pbnN0YW50aWF0ZVBsdWdpbihbX3BsdWdpblBhY2thZ2UuZ2V0KCkgcGF0aF0s IFtfcGx1Z2luUGFja2FnZS5nZXQoKSBwbHVnaW5Ib3N0QXJjaGl0ZWN0dXJlXSwgW19wbHVnaW5Q YWNrYWdlLmdldCgpIGJ1bmRsZUlkZW50aWZpZXJdLCBzZWxmLCBfTUlNRVR5cGUuZ2V0KCksIF9h dHRyaWJ1dGVLZXlzLmdldCgpLCBfYXR0cmlidXRlVmFsdWVzLmdldCgpLCB1c2VyQWdlbnQsIF9z b3VyY2VVUkwuZ2V0KCksIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9tb2RlID09IE5QX0ZVTEwsIF9pc1ByaXZhdGVC cm93c2luZ0VuYWJsZWQsIGFjY2xlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IF9tb2RlID09IE5QX0ZVTEwsIF9pc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGFjY2VsZXJhdGVk Q29tcG9zaXRpbmdFbmFibGVkLCBob3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIpOwogICAgIGlmICgh X3Byb3h5KSAKICAgICAgICAgcmV0dXJuIE5POwogCkBAIC0xMjMsNyArMTM0LDcgQEAgZXh0ZXJu ICJDIiB7CiAgICAgZWxzZSB7CiAgICAgICAgIF9wbHVnaW5MYXllciA9IFdLTWFrZVJlbmRlckxh eWVyKF9wcm94eS0+cmVuZGVyQ29udGV4dElEKCkpOwogCi0gICAgICAgIGlmIChhY2NsZXJhdGVk Q29tcG9zaXRpbmdFbmFibGVkICYmIF9wcm94eS0+cmVuZGVyZXJUeXBlKCkgPT0gVXNlQWNjZWxl cmF0ZWRDb21wb3NpdGluZykgeworICAgICAgICBpZiAoYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Vu YWJsZWQgJiYgX3Byb3h5LT5yZW5kZXJlclR5cGUoKSA9PSBVc2VBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBjb2RlIGNhbiBiZSBzaGFyZWQgYmV0 d2VlbiBXZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcgYW5kIFdlYk5ldHNjYXBlUGx1Z2luVmll dy4KICAgICAgICAgICAgIC8vIFNpbmNlIHRoaXMgbGF5ZXIgaXNuJ3QgZ29pbmcgdG8gYmUgaW5z ZXJ0ZWQgaW50byBhIHZpZXcsIHdlIG5lZWQgdG8gY3JlYXRlIGFub3RoZXIgbGF5ZXIgYW5kIGZs aXAgaXRzIGdlb21ldHJ5CiAgICAgICAgICAgICAvLyBpbiBvcmRlciB0byBnZXQgdGhlIGNvb3Jk aW5hdGUgc3lzdGVtIHJpZ2h0Lgo= 208667 2013-08-13 13:07:21 -0700 2013-08-13 13:09:13 -0700 patch with dynamic updating plugin-host-opensource.diff text/plain 18823 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCA5M2IxZjVmLi5lYWJjYjY2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsNTcgQEAKKzIwMTMtMDgtMTIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmVtb3RlbHkgaG9zdGVkIHBsdWdpbnMgZG9u4oCZdCB3b3Jr IGluIHdpbmRvdy1zZXJ2ZXItaG9zdGVkIFdlYktpdDEgdmlld3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTcwOQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMTQ3MTc1NzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyLmg6Cisg ICAgICAgIEFkZCBob3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIgYXJndW1lbnQgdG8gaW5zdGFudGlh dGVQbHVnaW4uCisKKyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RN YW5hZ2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyOjpp bnN0YW50aWF0ZVBsdWdpbik6CisgICAgICAgIEFkZCBob3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIg YXJndW1lbnQgdG8gaW5zdGFudGlhdGVQbHVnaW4sIGFuZCBwYXNzIGl0IHRocm91Z2ggdG8gV2Vi S2l0UGx1Z2luSG9zdC4KKworICAgICAgICAqIFBsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2lu SG9zdFByb3h5Lm1tOgorICAgICAgICAoV0tQQ0xheWVySG9zdGluZ01vZGVDaGFuZ2VkKToKKyAg ICAgICAgRm9yd2FyZCB0aGUgbm90aWZpY2F0aW9uIHRoYXQgdGhlIHBsdWdpbiBob3N0IGNoYW5n ZWQgaXRzIGxheWVyIGhvc3RpbmcgbW9kZQorICAgICAgICB0byB0aGUgaW5zdGFuY2UgcHJveHku CisKKyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHku aDoKKyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHku bW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6c2V0U2hv dWxkSG9zdExheWVyc0luV2luZG93U2VydmVyKToKKyAgICAgICAgQXNrIHRoZSBwbHVnaW4gaG9z dCB0byByZS1ob3N0IGl0cyBsYXllcnMgd2hlbiB0aGUgbGF5ZXIgaG9zdGluZyBtb2RlIGNoYW5n ZXMuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpsYXll ckhvc3RpbmdNb2RlQ2hhbmdlZCk6CisgICAgICAgIEluZm9ybSB0aGUgV2ViSG9zdGVkTmV0c2Nh cGVQbHVnaW5WaWV3IG9mIHRoZSBuZXcgbGF5ZXIgaG9zdGluZyBtb2RlCisgICAgICAgIHdoZW4g aXQgY2hhbmdlcy4gQWxzbywgc3RvcmUgdGhlIG5ldyBDQUNvbnRleHQgSUQuCisKKyAgICAgICAg KiBQbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcuaDoKKyAgICAgICAg KiBQbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW06CisgICAgICAg ICgtW1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldyB3aW5kb3dIb3N0c0xheWVyc0luV2luZG93 U2VydmVyXSk6CisgICAgICAgIERldGVybWluZSB3aGV0aGVyIHRoZSBXZWJWaWV3J3MgY3VycmVu dCB3aW5kb3cgdXNlcyB3aW5kb3ctc2VydmVyIGhvc3RpbmcgZm9yIGl0cyBsYXllcnMuCisKKyAg ICAgICAgKC1bV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3IGNyZWF0ZVBsdWdpbl0pOgorICAg ICAgICBEcml2ZS1ieSBzcGVsbGluZyBmaXguCisgICAgICAgIEZhY3RvciBfcGx1Z2luTGF5ZXIg aW5pdGlhbGl6YXRpb24gb3V0IGludG8gY3JlYXRlUGx1Z2luTGF5ZXIuCisgICAgICAgIEluc3Rh bnRpYXRlIHRoZSBwbHVnaW4gd2l0aCB0aGUgYXBwcm9wcmlhdGUgbGF5ZXIgaG9zdGluZyBtb2Rl LgorCisgICAgICAgICgtW1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldyBjcmVhdGVQbHVnaW5M YXllcl0pOgorCisgICAgICAgICgtW1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldyBzZXRIb3N0 c0xheWVyc0luV2luZG93U2VydmVyOl0pOgorICAgICAgICBDcmVhdGUgYSBuZXcgX3BsdWdpbkxh eWVyIGlmIHRoZSBsYXllciBob3N0aW5nIG1vZGUgY2hhbmdlcy4KKyAgICAgICAgQXR0YWNoIHRo ZSBuZXcgX3BsdWdpbkxheWVyIHRvIG91ciBwYXJlbnQgbGF5ZXIuCisKKyAgICAgICAgKC1bV2Vi SG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3IHVwZGF0ZUFuZFNldFdpbmRvd10pOgorICAgICAgICBJ bmZvcm0gdGhlIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eSBpZiB0aGUgbGF5ZXIgaG9zdGlu ZyBtb2RlIGNoYW5nZXMsCisgICAgICAgIHNvIGl0IGNhbiBpbmZvcm0gdGhlIHBsdWdpbiBob3N0 LiBXZSB3aWxsIGFzeW5jaHJvbm91c2x5IHJlY2VpdmUgYSByZXBseQorICAgICAgICB3aXRoIHRo ZSBuZXcgaG9zdGluZyBtb2RlIGFuZCByZW5kZXJDb250ZXh0SUQgYW5kIHN3aXRjaCB0byB0aGUg bmV3IENBQ29udGV4dCwKKyAgICAgICAgaW4gc2V0SG9zdHNMYXllcnNJbldpbmRvd1NlcnZlcjou CisKKyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9XZWJLaXRQbHVnaW5DbGllbnQuZGVmczoKKyAg ICAgICAgKiBQbHVnaW5zL0hvc3RlZC9XZWJLaXRQbHVnaW5Ib3N0LmRlZnM6CisKIDIwMTMtMDgt MDggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgbmF2 aWdhdG9yLnBsdWdpbnMgaGFzIHBsdWdpbnMgaW4gaXQgd2hlbiBwbHVnaW5zIGFyZSBkaXNhYmxl ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQ bHVnaW5Ib3N0TWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0 c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5oCmluZGV4IGE5NzcxMmYuLjE0ODZkOTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdE1h bmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBs dWdpbkhvc3RNYW5hZ2VyLmgKQEAgLTQ0LDE0ICs0NCwxNCBAQCBjbGFzcyBOZXRzY2FwZVBsdWdp bkhvc3RNYW5hZ2VyIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgTmV0c2NhcGVQbHVnaW5Ib3N0TWFu YWdlciYgc2hhcmVkKCk7CiAgICAgCi0gICAgUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbkluc3Rh bmNlUHJveHk+IGluc3RhbnRpYXRlUGx1Z2luKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgY3B1 X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1cmUsIGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmll ciwgV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3ICosIE5TU3RyaW5nICptaW1lVHlwZSwgTlNB cnJheSAqYXR0cmlidXRlS2V5cywgTlNBcnJheSAqYXR0cmlidXRlVmFsdWVzLCBOU1N0cmluZyAq dXNlckFnZW50LCBOU1VSTCAqc291cmNlVVJMLCBib29sIGZ1bGxGcmFtZSwgYm9vbCBpc1ByaXZh dGVCcm93c2luZ0VuYWJsZWQsIGJvb2wgaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCk7 CisgICAgUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk+IGluc3RhbnRpYXRl UGx1Z2luKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRl Y3R1cmUsIGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmllciwgV2ViSG9zdGVkTmV0c2NhcGVQ bHVnaW5WaWV3ICosIE5TU3RyaW5nICptaW1lVHlwZSwgTlNBcnJheSAqYXR0cmlidXRlS2V5cywg TlNBcnJheSAqYXR0cmlidXRlVmFsdWVzLCBOU1N0cmluZyAqdXNlckFnZW50LCBOU1VSTCAqc291 cmNlVVJMLCBib29sIGZ1bGxGcmFtZSwgYm9vbCBpc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGJv b2wgaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCwgYm9vbCBob3N0TGF5ZXJzSW5XaW5k b3dTZXJ2ZXIpOwogCiAgICAgdm9pZCBwbHVnaW5Ib3N0RGllZChOZXRzY2FwZVBsdWdpbkhvc3RQ cm94eSopOwogCiAgICAgdm9pZCBjcmVhdGVQcm9wZXJ0eUxpc3RGaWxlKGNvbnN0IFN0cmluZyYg cGx1Z2luUGF0aCwgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1cmUsIGNvbnN0IFN0cmluZyYg YnVuZGxlSWRlbnRpZmllcik7CiAgICAgCiAgICAgdm9pZCBkaWRDcmVhdGVXaW5kb3coKTsKLSAg ICAKKwogcHJpdmF0ZToKICAgICBOZXRzY2FwZVBsdWdpbkhvc3RQcm94eSogaG9zdEZvclBsdWdp bihjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIGNwdV90eXBlX3QgcGx1Z2luQXJjaGl0ZWN0dXJl LCBjb25zdCBTdHJpbmcmIGJ1bmRsZUlkZW50aWZpZXIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyLm1tIGIv U291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdl ci5tbQppbmRleCBmYmRhNzk5Li4xMDQyODU1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9t YWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyLm1t CkBAIC0yMTgsNyArMjE4LDcgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyOjpwbHVn aW5Ib3N0RGllZChOZXRzY2FwZVBsdWdpbkhvc3RQcm94eSogcGx1Z2luSG8KICAgICB9CiB9CiAK LVBhc3NSZWZQdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5PiBOZXRzY2FwZVBsdWdpbkhv c3RNYW5hZ2VyOjppbnN0YW50aWF0ZVBsdWdpbihjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIGNw dV90eXBlX3QgcGx1Z2luQXJjaGl0ZWN0dXJlLCBjb25zdCBTdHJpbmcmIGJ1bmRsZUlkZW50aWZp ZXIsIFdlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldyAqcGx1Z2luVmlldywgTlNTdHJpbmcgKm1p bWVUeXBlLCBOU0FycmF5ICphdHRyaWJ1dGVLZXlzLCBOU0FycmF5ICphdHRyaWJ1dGVWYWx1ZXMs IE5TU3RyaW5nICp1c2VyQWdlbnQsIE5TVVJMICpzb3VyY2VVUkwsIGJvb2wgZnVsbEZyYW1lLCBi b29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgYm9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRp bmdFbmFibGVkKQorUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk+IE5ldHNj YXBlUGx1Z2luSG9zdE1hbmFnZXI6Omluc3RhbnRpYXRlUGx1Z2luKGNvbnN0IFN0cmluZyYgcGx1 Z2luUGF0aCwgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1cmUsIGNvbnN0IFN0cmluZyYgYnVu ZGxlSWRlbnRpZmllciwgV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3ICpwbHVnaW5WaWV3LCBO U1N0cmluZyAqbWltZVR5cGUsIE5TQXJyYXkgKmF0dHJpYnV0ZUtleXMsIE5TQXJyYXkgKmF0dHJp YnV0ZVZhbHVlcywgTlNTdHJpbmcgKnVzZXJBZ2VudCwgTlNVUkwgKnNvdXJjZVVSTCwgYm9vbCBm dWxsRnJhbWUsIGJvb2wgaXNQcml2YXRlQnJvd3NpbmdFbmFibGVkLCBib29sIGlzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZWQsIGJvb2wgaG9zdExheWVyc0luV2luZG93U2VydmVyKQogewog ICAgIE5ldHNjYXBlUGx1Z2luSG9zdFByb3h5KiBob3N0UHJveHkgPSBob3N0Rm9yUGx1Z2luKHBs dWdpblBhdGgsIHBsdWdpbkFyY2hpdGVjdHVyZSwgYnVuZGxlSWRlbnRpZmllcik7CiAgICAgaWYg KCFob3N0UHJveHkpCkBAIC0yNDQsNiArMjQ0LDcgQEAgUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk+IE5ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXI6Omluc3RhbnRpYXRlUGwK ICAgICBbcHJvcGVydGllcy5nZXQoKSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhCb29s OmZ1bGxGcmFtZV0gZm9yS2V5OkAiZnVsbEZyYW1lIl07CiAgICAgW3Byb3BlcnRpZXMuZ2V0KCkg c2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoQm9vbDppc1ByaXZhdGVCcm93c2luZ0VuYWJs ZWRdIGZvcktleTpAInByaXZhdGVCcm93c2luZ0VuYWJsZWQiXTsKICAgICBbcHJvcGVydGllcy5n ZXQoKSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOmlzQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0VuYWJsZWRdIGZvcktleTpAImFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkIl07 CisgICAgW3Byb3BlcnRpZXMuZ2V0KCkgc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoQm9v bDpob3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXJdIGZvcktleTpAImhvc3RMYXllcnNJbldpbmRvd1Nl cnZlciJdOwogCiAgICAgTlNEYXRhICpkYXRhID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlv biBkYXRhRnJvbVByb3BlcnR5TGlzdDpwcm9wZXJ0aWVzLmdldCgpIGZvcm1hdDpOU1Byb3BlcnR5 TGlzdEJpbmFyeUZvcm1hdF92MV8wIGVycm9yRGVzY3JpcHRpb246bmlsXTsKICAgICBBU1NFUlQo ZGF0YSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRz Y2FwZVBsdWdpbkhvc3RQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVk L05ldHNjYXBlUGx1Z2luSG9zdFByb3h5Lm1tCmluZGV4IDFiOGUyZTMuLjNlYWU5N2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9z dFByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBl UGx1Z2luSG9zdFByb3h5Lm1tCkBAIC0xMDk3LDYgKzEwOTcsMjAgQEAga2Vybl9yZXR1cm5fdCBX S1BDQ29udmVydFBvaW50KG1hY2hfcG9ydF90IGNsaWVudFBvcnQsIHVpbnQzMl90IHBsdWdpbklE LAogICAgIHJldHVybiBLRVJOX1NVQ0NFU1M7CiB9CiAKK2tlcm5fcmV0dXJuX3QgV0tQQ0xheWVy SG9zdGluZ01vZGVDaGFuZ2VkKG1hY2hfcG9ydF90IGNsaWVudFBvcnQsIHVpbnQzMl90IHBsdWdp bklELCBib29sZWFuX3QgaG9zdHNMYXllcnNJbldpbmRvd1NlcnZlciwgdWludDMyX3QgcmVuZGVy Q29udGV4dElEKQoreworICAgIE5ldHNjYXBlUGx1Z2luSG9zdFByb3h5KiBob3N0UHJveHkgPSBw bHVnaW5Qcm94eU1hcCgpLmdldChjbGllbnRQb3J0KTsKKyAgICBpZiAoIWhvc3RQcm94eSkKKyAg ICAgICAgcmV0dXJuIEtFUk5fRkFJTFVSRTsKKworICAgIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQ cm94eSogaW5zdGFuY2VQcm94eSA9IGhvc3RQcm94eS0+cGx1Z2luSW5zdGFuY2UocGx1Z2luSUQp OworICAgIGlmICghaW5zdGFuY2VQcm94eSkKKyAgICAgICAgcmV0dXJuIEtFUk5fRkFJTFVSRTsK KworICAgIGluc3RhbmNlUHJveHktPmxheWVySG9zdGluZ01vZGVDaGFuZ2VkKGhvc3RzTGF5ZXJz SW5XaW5kb3dTZXJ2ZXIsIHJlbmRlckNvbnRleHRJRCk7CisgICAgcmV0dXJuIEtFUk5fU1VDQ0VT UzsKK30KKwoga2Vybl9yZXR1cm5fdCBXS1BDQ2hlY2tJZkFsbG93ZWRUb0xvYWRVUkwobWFjaF9w b3J0X3QgY2xpZW50UG9ydCwgdWludDMyX3QgcGx1Z2luSUQsIGRhdGFfdCB1cmxEYXRhLCBtYWNo X21zZ190eXBlX251bWJlcl90IHVybExlbmd0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRhdGFfdCB0YXJnZXREYXRhLCBtYWNoX21zZ190eXBlX251bWJlcl90 IHRhcmdldExlbmd0aCwgdWludDMyX3QgKmNoZWNrSUQpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5zdGFuY2VQ cm94eS5oCmluZGV4IDk5NTg5NzkuLjZmN2NlODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94 eS5oCkBAIC05MSw2ICs5MSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGZvY3VzQ2hhbmdlZChib29s IGhhc0ZvY3VzKTsKICAgICB2b2lkIHdpbmRvd0ZvY3VzQ2hhbmdlZChib29sIGhhc0ZvY3VzKTsK ICAgICB2b2lkIHdpbmRvd0ZyYW1lQ2hhbmdlZChOU1JlY3QgZnJhbWUpOworCisgICAgdm9pZCBz ZXRTaG91bGRIb3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIoYm9vbCk7CisgICAgdm9pZCBsYXllckhv c3RpbmdNb2RlQ2hhbmdlZChib29sIGhvc3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXIsIHVpbnQzMl90 IHJlbmRlckNvbnRleHRJRCk7CiAgICAgCiAgICAgdm9pZCBtb3VzZUV2ZW50KE5TVmlldyAqcGx1 Z2luVmlldywgTlNFdmVudCAqLCBOUENvY29hRXZlbnRUeXBlKTsKICAgICB2b2lkIGtleUV2ZW50 KE5TVmlldyAqcGx1Z2luVmlldywgTlNFdmVudCAqLCBOUENvY29hRXZlbnRUeXBlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5z dGFuY2VQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBl UGx1Z2luSW5zdGFuY2VQcm94eS5tbQppbmRleCBhZTY0NWNhLi5iM2JiMzYwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkluc3RhbmNl UHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQ bHVnaW5JbnN0YW5jZVByb3h5Lm1tCkBAIC0yNzcsNiArMjc3LDE5IEBAIHZvaWQgTmV0c2NhcGVQ bHVnaW5JbnN0YW5jZVByb3h5OjpyZXNpemUoTlNSZWN0IHNpemUsIE5TUmVjdCBjbGlwUmVjdCkK ICAgICB3YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuUmVw bHk+KHJlcXVlc3RJRCk7CiB9CiAKKwordm9pZCBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6 OnNldFNob3VsZEhvc3RMYXllcnNJbldpbmRvd1NlcnZlcihib29sIHNob3VsZEhvc3RMYXllcnNJ bldpbmRvd1NlcnZlcikKK3sKKyAgICBfV0tQSFBsdWdpblNob3VsZEhvc3RMYXllcnNJbldpbmRv d1NlcnZlckNoYW5nZWQobV9wbHVnaW5Ib3N0UHJveHktPnBvcnQoKSwgbV9wbHVnaW5JRCwgc2hv dWxkSG9zdExheWVyc0luV2luZG93U2VydmVyKTsKK30KKwordm9pZCBOZXRzY2FwZVBsdWdpbklu c3RhbmNlUHJveHk6OmxheWVySG9zdGluZ01vZGVDaGFuZ2VkKGJvb2wgaG9zdHNMYXllcnNJbldp bmRvd1NlcnZlciwgdWludDMyX3QgcmVuZGVyQ29udGV4dElEKQoreworICAgIHNldFJlbmRlckNv bnRleHRJRChyZW5kZXJDb250ZXh0SUQpOworCisgICAgW21fcGx1Z2luVmlldyBzZXRIb3N0c0xh eWVyc0luV2luZG93U2VydmVyOmhvc3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXJdOworfQorCiB2b2lk IE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6c3RvcEFsbFN0cmVhbXMoKQogewogICAgIFZl Y3RvcjxSZWZQdHI8SG9zdGVkTmV0c2NhcGVQbHVnaW5TdHJlYW0+ID4gc3RyZWFtc0NvcHk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRz Y2FwZVBsdWdpblZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhv c3RlZE5ldHNjYXBlUGx1Z2luVmlldy5oCmluZGV4IDQzOTQ3YWIuLjIzMDBkYWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1 Z2luVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhvc3Rl ZE5ldHNjYXBlUGx1Z2luVmlldy5oCkBAIC00MSw2ICs0MSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogICAgIFJldGFpblB0cjxOU0FycmF5PiBfYXR0cmlidXRlVmFsdWVzOwogICAgIAogICAgIFJl dGFpblB0cjxDQUxheWVyPiBfcGx1Z2luTGF5ZXI7CisgICAgQk9PTCBfaG9zdHNMYXllcnNJbldp bmRvd1NlcnZlcjsKICAgICBXS1NvZnR3YXJlQ0FSZW5kZXJlclJlZiBfc29mdHdhcmVSZW5kZXJl cjsKICAgICAKICAgICBOU1NpemUgX3ByZXZpb3VzU2l6ZTsKQEAgLTYxLDYgKzYyLDcgQEAgbmFt ZXNwYWNlIFdlYktpdCB7CiAtIChDQUxheWVyICopcGx1Z2luTGF5ZXI7CiAtIChCT09MKWdldEZv cm1WYWx1ZTooTlNTdHJpbmcgKiopdmFsdWU7CiAtICh2b2lkKXdlYkZyYW1lOihXZWJGcmFtZSAq KXdlYkZyYW1lIGRpZEZpbmlzaExvYWRXaXRoUmVhc29uOihOUFJlYXNvbilyZWFzb247CistICh2 b2lkKXNldEhvc3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXI6KGJvb2wpaG9zdHNMYXllcnNJbldpbmRv d1NlcnZlcjsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5z L0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21h Yy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0KaW5kZXggMWMy MjYzMS4uZDgzYmNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0 ZWQvV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1BsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5tbQpAQCAtNjAsNiAr NjAsMTIgQEAgZXh0ZXJuICJDIiB7CiAjaW5jbHVkZSAiV2ViS2l0UGx1Z2luSG9zdC5oIgogfQog CisjaWYgSEFWRShMQVlFUl9IT1NUSU5HX0lOX1dJTkRPV19TRVJWRVIpCitAaW50ZXJmYWNlIE5T V2luZG93IChEZXRhaWxzKQorLSAoQk9PTClfaG9zdHNMYXllcnNJbldpbmRvd1NlcnZlcjsKK0Bl bmQKKyNlbmRpZgorCiBAaW1wbGVtZW50YXRpb24gV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3 CiAKICsgKHZvaWQpaW5pdGlhbGl6ZQpAQCAtMTAxLDQ4ICsxMDcsMzcgQEAgZXh0ZXJuICJDIiB7 CiAgICAgCiAgICAgX2F0dHJpYnV0ZUtleXMgPSBhZG9wdE5TKFtrZXlzIGNvcHldKTsKICAgICBf YXR0cmlidXRlVmFsdWVzID0gYWRvcHROUyhbdmFsdWVzIGNvcHldKTsKLX0gICAgCit9CisKKy0g KEJPT0wpd2luZG93SG9zdHNMYXllcnNJbldpbmRvd1NlcnZlcgoreworI2lmIEhBVkUoTEFZRVJf SE9TVElOR19JTl9XSU5ET1dfU0VSVkVSKQorICAgIHJldHVybiBbW1tzZWxmIHdlYlZpZXddIHdp bmRvd10gX2hvc3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXJdOworI2Vsc2UKKyAgICByZXR1cm4gZmFs c2U7CisjZW5kaWYKK30KIAogLSAoQk9PTCljcmVhdGVQbHVnaW4KIHsKICAgICBBU1NFUlQoIV9w cm94eSk7CiAKICAgICBOU1N0cmluZyAqdXNlckFnZW50ID0gW1tzZWxmIHdlYlZpZXddIHVzZXJB Z2VudEZvclVSTDpfYmFzZVVSTC5nZXQoKV07Ci0gICAgQk9PTCBhY2NsZXJhdGVkQ29tcG9zaXRp bmdFbmFibGVkID0gZmFsc2U7CisgICAgQk9PTCBhY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxl ZCA9IGZhbHNlOwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICBhY2NsZXJh dGVkQ29tcG9zaXRpbmdFbmFibGVkID0gW1tbc2VsZiB3ZWJWaWV3XSBwcmVmZXJlbmNlc10gYWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRdOworICAgIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdF bmFibGVkID0gW1tbc2VsZiB3ZWJWaWV3XSBwcmVmZXJlbmNlc10gYWNjZWxlcmF0ZWRDb21wb3Np dGluZ0VuYWJsZWRdOwogI2VuZGlmCi0gICAgCi0gICAgX3Byb3h5ID0gTmV0c2NhcGVQbHVnaW5I b3N0TWFuYWdlcjo6c2hhcmVkKCkuaW5zdGFudGlhdGVQbHVnaW4oW19wbHVnaW5QYWNrYWdlLmdl dCgpIHBhdGhdLCBbX3BsdWdpblBhY2thZ2UuZ2V0KCkgcGx1Z2luSG9zdEFyY2hpdGVjdHVyZV0s IFtfcGx1Z2luUGFja2FnZS5nZXQoKSBidW5kbGVJZGVudGlmaWVyXSwgc2VsZiwgX01JTUVUeXBl LmdldCgpLCBfYXR0cmlidXRlS2V5cy5nZXQoKSwgX2F0dHJpYnV0ZVZhbHVlcy5nZXQoKSwgdXNl ckFnZW50LCBfc291cmNlVVJMLmdldCgpLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfbW9kZSA9PSBOUF9GVUxMLCBf aXNQcml2YXRlQnJvd3NpbmdFbmFibGVkLCBhY2NsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKTsK KyAgICBfaG9zdHNMYXllcnNJbldpbmRvd1NlcnZlciA9IFtzZWxmIHdpbmRvd0hvc3RzTGF5ZXJz SW5XaW5kb3dTZXJ2ZXJdOworCisgICAgX3Byb3h5ID0gTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdl cjo6c2hhcmVkKCkuaW5zdGFudGlhdGVQbHVnaW4oW19wbHVnaW5QYWNrYWdlLmdldCgpIHBhdGhd LCBbX3BsdWdpblBhY2thZ2UuZ2V0KCkgcGx1Z2luSG9zdEFyY2hpdGVjdHVyZV0sIFtfcGx1Z2lu UGFja2FnZS5nZXQoKSBidW5kbGVJZGVudGlmaWVyXSwgc2VsZiwgX01JTUVUeXBlLmdldCgpLCBf YXR0cmlidXRlS2V5cy5nZXQoKSwgX2F0dHJpYnV0ZVZhbHVlcy5nZXQoKSwgdXNlckFnZW50LCBf c291cmNlVVJMLmdldCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9tb2RlID09IE5QX0ZVTEwsIF9pc1ByaXZhdGVC cm93c2luZ0VuYWJsZWQsIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkLCBfaG9zdHNMYXll cnNJbldpbmRvd1NlcnZlcik7CiAgICAgaWYgKCFfcHJveHkpIAogICAgICAgICByZXR1cm4gTk87 CiAKICAgICBpZiAoX3Byb3h5LT5yZW5kZXJlclR5cGUoKSA9PSBVc2VTb2Z0d2FyZVJlbmRlcmVy KQogICAgICAgICBfc29mdHdhcmVSZW5kZXJlciA9IFdLU29mdHdhcmVDQVJlbmRlcmVyQ3JlYXRl KF9wcm94eS0+cmVuZGVyQ29udGV4dElEKCkpOwotICAgIGVsc2UgewotICAgICAgICBfcGx1Z2lu TGF5ZXIgPSBXS01ha2VSZW5kZXJMYXllcihfcHJveHktPnJlbmRlckNvbnRleHRJRCgpKTsKLQot ICAgICAgICBpZiAoYWNjbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCAmJiBfcHJveHktPnJlbmRl cmVyVHlwZSgpID09IFVzZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmcpIHsKLSAgICAgICAgICAgIC8v IEZJWE1FOiBUaGlzIGNvZGUgY2FuIGJlIHNoYXJlZCBiZXR3ZWVuIFdlYkhvc3RlZE5ldHNjYXBl UGx1Z2luVmlldyBhbmQgV2ViTmV0c2NhcGVQbHVnaW5WaWV3LgotICAgICAgICAgICAgLy8gU2lu Y2UgdGhpcyBsYXllciBpc24ndCBnb2luZyB0byBiZSBpbnNlcnRlZCBpbnRvIGEgdmlldywgd2Ug bmVlZCB0byBjcmVhdGUgYW5vdGhlciBsYXllciBhbmQgZmxpcCBpdHMgZ2VvbWV0cnkKLSAgICAg ICAgICAgIC8vIGluIG9yZGVyIHRvIGdldCB0aGUgY29vcmRpbmF0ZSBzeXN0ZW0gcmlnaHQuCi0g ICAgICAgICAgICBSZXRhaW5QdHI8Q0FMYXllcj4gcmVhbFBsdWdpbkxheWVyID0gYWRvcHROUyhf cGx1Z2luTGF5ZXIubGVha1JlZigpKTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgX3BsdWdp bkxheWVyID0gYWRvcHROUyhbW0NBTGF5ZXIgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIF9w bHVnaW5MYXllci5nZXQoKS5ib3VuZHMgPSByZWFsUGx1Z2luTGF5ZXIuZ2V0KCkuYm91bmRzOwot ICAgICAgICAgICAgX3BsdWdpbkxheWVyLmdldCgpLmdlb21ldHJ5RmxpcHBlZCA9IFlFUzsKLSAg ICAgICAgICAgIAotICAgICAgICAgICAgcmVhbFBsdWdpbkxheWVyLmdldCgpLmF1dG9yZXNpemlu Z01hc2sgPSBrQ0FMYXllcldpZHRoU2l6YWJsZSB8IGtDQUxheWVySGVpZ2h0U2l6YWJsZTsKLSAg ICAgICAgICAgIFtfcGx1Z2luTGF5ZXIuZ2V0KCkgYWRkU3VibGF5ZXI6cmVhbFBsdWdpbkxheWVy LmdldCgpXTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgLy8gRWFnZXJseSBlbnRlciBjb21w b3NpdGluZyBtb2RlLCBzaW5jZSB3ZSBrbm93IHdlJ2xsIG5lZWQgaXQuIFRoaXMgYXZvaWRzIGZp cmluZyBzZXROZWVkc1N0eWxlUmVjYWxjKCkKLSAgICAgICAgICAgIC8vIGZvciBpZnJhbWVzIHRo YXQgY29udGFpbiBjb21wb3NpdGVkIHBsdWdpbnMgYXQgYmFkIHRpbWVzLiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkwMzMKLSAgICAgICAgICAgIGNvcmUoW3NlbGYg d2ViRnJhbWVdKS0+dmlldygpLT5lbnRlckNvbXBvc2l0aW5nTW9kZSgpOwotICAgICAgICAgICAg W3NlbGYgZWxlbWVudF0tPnNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGljU3R5bGVDaGFuZ2Up OwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHNlbGYud2FudHNMYXllciA9IFlFUzsKLSAg ICB9CisgICAgZWxzZQorICAgICAgICBbc2VsZiBjcmVhdGVQbHVnaW5MYXllcl07CiAgICAgCiAg ICAgLy8gVXBkYXRlIHRoZSB3aW5kb3cgZnJhbWUuCiAgICAgX3Byb3h5LT53aW5kb3dGcmFtZUNo YW5nZWQoW1tzZWxmIHdpbmRvd10gZnJhbWVdKTsKQEAgLTE1MCw2ICsxNDUsNTEgQEAgZXh0ZXJu ICJDIiB7CiAgICAgcmV0dXJuIFlFUzsKIH0KIAorLSAodm9pZCljcmVhdGVQbHVnaW5MYXllcgor eworICAgIEJPT0wgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQgPSBmYWxzZTsKKyNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Vu YWJsZWQgPSBbW1tzZWxmIHdlYlZpZXddIHByZWZlcmVuY2VzXSBhY2NlbGVyYXRlZENvbXBvc2l0 aW5nRW5hYmxlZF07CisjZW5kaWYKKworICAgIF9wbHVnaW5MYXllciA9IFdLTWFrZVJlbmRlckxh eWVyKF9wcm94eS0+cmVuZGVyQ29udGV4dElEKCkpOworCisgICAgaWYgKGFjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkICYmIF9wcm94eS0+cmVuZGVyZXJUeXBlKCkgPT0gVXNlQWNjZWxlcmF0 ZWRDb21wb3NpdGluZykgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBjb2RlIGNhbiBiZSBzaGFy ZWQgYmV0d2VlbiBXZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcgYW5kIFdlYk5ldHNjYXBlUGx1 Z2luVmlldy4KKyAgICAgICAgLy8gU2luY2UgdGhpcyBsYXllciBpc24ndCBnb2luZyB0byBiZSBp bnNlcnRlZCBpbnRvIGEgdmlldywgd2UgbmVlZCB0byBjcmVhdGUgYW5vdGhlciBsYXllciBhbmQg ZmxpcCBpdHMgZ2VvbWV0cnkKKyAgICAgICAgLy8gaW4gb3JkZXIgdG8gZ2V0IHRoZSBjb29yZGlu YXRlIHN5c3RlbSByaWdodC4KKyAgICAgICAgUmV0YWluUHRyPENBTGF5ZXI+IHJlYWxQbHVnaW5M YXllciA9IGFkb3B0TlMoX3BsdWdpbkxheWVyLmxlYWtSZWYoKSk7CisKKyAgICAgICAgX3BsdWdp bkxheWVyID0gYWRvcHROUyhbW0NBTGF5ZXIgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgX3BsdWdp bkxheWVyLmdldCgpLmJvdW5kcyA9IHJlYWxQbHVnaW5MYXllci5nZXQoKS5ib3VuZHM7CisgICAg ICAgIF9wbHVnaW5MYXllci5nZXQoKS5nZW9tZXRyeUZsaXBwZWQgPSBZRVM7CisKKyAgICAgICAg X3BsdWdpbkxheWVyLmdldCgpLmJhY2tncm91bmRDb2xvciA9IENHQ29sb3JDcmVhdGVHZW5lcmlj UkdCKDEsIDAsIDEsIDEpOworCisgICAgICAgIHJlYWxQbHVnaW5MYXllci5nZXQoKS5hdXRvcmVz aXppbmdNYXNrID0ga0NBTGF5ZXJXaWR0aFNpemFibGUgfCBrQ0FMYXllckhlaWdodFNpemFibGU7 CisgICAgICAgIFtfcGx1Z2luTGF5ZXIuZ2V0KCkgYWRkU3VibGF5ZXI6cmVhbFBsdWdpbkxheWVy LmdldCgpXTsKKworICAgICAgICAvLyBFYWdlcmx5IGVudGVyIGNvbXBvc2l0aW5nIG1vZGUsIHNp bmNlIHdlIGtub3cgd2UnbGwgbmVlZCBpdC4gVGhpcyBhdm9pZHMgZmlyaW5nIHNldE5lZWRzU3R5 bGVSZWNhbGMoKQorICAgICAgICAvLyBmb3IgaWZyYW1lcyB0aGF0IGNvbnRhaW4gY29tcG9zaXRl ZCBwbHVnaW5zIGF0IGJhZCB0aW1lcy4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM5MDMzCisgICAgICAgIGNvcmUoW3NlbGYgd2ViRnJhbWVdKS0+dmlldygpLT5lbnRl ckNvbXBvc2l0aW5nTW9kZSgpOworICAgICAgICBbc2VsZiBlbGVtZW50XS0+c2V0TmVlZHNTdHls ZVJlY2FsYyhTeW50aGV0aWNTdHlsZUNoYW5nZSk7CisgICAgfSBlbHNlCisgICAgICAgIHNlbGYu d2FudHNMYXllciA9IFlFUzsKK30KKworLSAodm9pZClzZXRIb3N0c0xheWVyc0luV2luZG93U2Vy dmVyOihib29sKWhvc3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXIKK3sKKyAgICBpZiAoX3Byb3h5LT5y ZW5kZXJlclR5cGUoKSA9PSBVc2VTb2Z0d2FyZVJlbmRlcmVyKQorICAgICAgICByZXR1cm47CisK KyAgICBSZXRhaW5QdHI8Q0FMYXllcj4gY3VycmVudFN1cGVybGF5ZXIgPSBbX3BsdWdpbkxheWVy IHN1cGVybGF5ZXJdOworCisgICAgX2hvc3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXIgPSBob3N0c0xh eWVyc0luV2luZG93U2VydmVyOworCisgICAgW3NlbGYgY3JlYXRlUGx1Z2luTGF5ZXJdOworICAg IFtzZWxmIHNldExheWVyOmN1cnJlbnRTdXBlcmxheWVyLmdldCgpXTsKK30KKwogLy8gRklYTUU6 IFRoaXMgbWV0aG9kIGlzIGFuIGlkZWFsIGNhbmRpZGF0ZSB0byBtb3ZlIHVwIHRvIHRoZSBiYXNl IGNsYXNzCiAtIChDQUxheWVyICopcGx1Z2luTGF5ZXIKIHsKQEAgLTIxNSw2ICsyNTUsMTAgQEAg ZXh0ZXJuICJDIiB7CiAgICAgX3ByZXZpb3VzU2l6ZSA9IGJvdW5kc0luV2luZG93LnNpemU7CiAg ICAgCiAgICAgX3Byb3h5LT5yZXNpemUoYm91bmRzSW5XaW5kb3csIHZpc2libGVSZWN0SW5XaW5k b3cpOworCisgICAgQk9PTCBzaG91bGRIb3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIgPSBbc2VsZiB3 aW5kb3dIb3N0c0xheWVyc0luV2luZG93U2VydmVyXTsKKyAgICBpZiAoX2hvc3RzTGF5ZXJzSW5X aW5kb3dTZXJ2ZXIgIT0gc2hvdWxkSG9zdExheWVyc0luV2luZG93U2VydmVyKQorICAgICAgICBf cHJveHktPnNldFNob3VsZEhvc3RMYXllcnNJbldpbmRvd1NlcnZlcihzaG91bGRIb3N0TGF5ZXJz SW5XaW5kb3dTZXJ2ZXIpOwogfQogCiAtICh2b2lkKXdpbmRvd0ZvY3VzQ2hhbmdlZDooQk9PTClo YXNGb2N1cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvV2Vi S2l0UGx1Z2luQ2xpZW50LmRlZnMgYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9X ZWJLaXRQbHVnaW5DbGllbnQuZGVmcwppbmRleCAxNWZjNWZhLi41NTVmNTdmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJLaXRQbHVnaW5DbGllbnQuZGVm cworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJLaXRQbHVnaW5DbGll bnQuZGVmcwpAQCAtMjA3LDYgKzIwNywxMSBAQCByb3V0aW5lIFBDUmVzb2x2ZVVSTChjbGllbnRQ b3J0IDptYWNoX3BvcnRfdDsKICAgICAgICAgICAgICAgICAgICAgIHRhcmdldCA6ZGF0YV90Owog ICAgICAgICAgICAgICAgICAgICAgb3V0IHJlc29sdmVkVVJMIDpkYXRhX3QsIGRlYWxsb2MpOwog CitzaW1wbGVyb3V0aW5lIFBDTGF5ZXJIb3N0aW5nTW9kZUNoYW5nZWQoY2xpZW50UG9ydCA6bWFj aF9wb3J0X3Q7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGx1Z2lu SUQgOnVpbnQzMl90OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhv c3RzTGF5ZXJzSW5XaW5kb3dTZXJ2ZXIgOmJvb2xlYW5fdDsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZW5kZXJDb250ZXh0SUQgOnVpbnQzMl90KTsKKwogLy8gUmVw bGllcwogc2ltcGxlcm91dGluZSBQQ0luc3RhbnRpYXRlUGx1Z2luUmVwbHkoY2xpZW50UG9ydCA6 bWFjaF9wb3J0X3Q7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGx1Z2lu SUQgOnVpbnQzMl90OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0 ZWQvV2ViS2l0UGx1Z2luSG9zdC5kZWZzIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0 ZWQvV2ViS2l0UGx1Z2luSG9zdC5kZWZzCmluZGV4IGVjZjAxYjMuLjI3MWI2NjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dlYktpdFBsdWdpbkhvc3QuZGVm cworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJLaXRQbHVnaW5Ib3N0 LmRlZnMKQEAgLTcxLDYgKzcxLDggQEAgc2ltcGxlcm91dGluZSBQSFBsdWdpbkluc3RhbmNlV2lu ZG93RnJhbWVDaGFuZ2VkKHBsdWdpbkhvc3RQb3J0IDptYWNoX3BvcnRfdDsKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVpZ2h0IDpkb3VibGU7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heFNjcmVlblkgOmRv dWJsZSk7CiAKK3NpbXBsZXJvdXRpbmUgUEhQbHVnaW5TaG91bGRIb3N0TGF5ZXJzSW5XaW5kb3dT ZXJ2ZXJDaGFuZ2VkKHBsdWdpbkhvc3RQb3J0IDptYWNoX3BvcnRfdDsgcGx1Z2luSUQgOnVpbnQz Ml90OyBzaG91bGRIb3N0TGF5ZXJzSW5XaW5kb3dTZXJ2ZXIgOmJvb2xlYW5fdCk7CisKIHNpbXBs ZXJvdXRpbmUgUEhQbHVnaW5JbnN0YW5jZU1vdXNlRXZlbnQocGx1Z2luSG9zdFBvcnQgOm1hY2hf cG9ydF90OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGx1Z2luSUQg OnVpbnQzMl90OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGltZXN0 YW1wIDpkb3VibGU7Cg==