152631 2015-12-31 16:39:55 -0800 Web Inspector: Add list-style properties to Visual Sidebar 2017-05-24 20:28:02 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 147563 172574 1 hi hi agomez bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1151814 0 hi 2015-12-31 16:39:55 -0800 Add list-style-type, list-style-position, and list-style-image as another section under Background. 1151815 1 webkit-bug-importer 2015-12-31 16:40:07 -0800 <rdar://problem/24029772> 1151819 2 268061 hi 2015-12-31 18:05:44 -0800 Created attachment 268061 Patch 1152014 3 268061 commit-queue 2016-01-02 12:46:17 -0800 Comment on attachment 268061 Patch Rejecting attachment 268061 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 268061, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: imothy Hatcher']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit Parsed 9 diffs from patch file(s). patching file Source/WebInspectorUI/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. Original content of Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js mismatches at /Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply line 283. Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Timothy Hatcher']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/640709 1152018 4 268110 hi 2016-01-02 13:37:28 -0800 Created attachment 268110 Patch 1152024 5 268110 commit-queue 2016-01-02 14:33:16 -0800 Comment on attachment 268110 Patch Clearing flags on attachment: 268110 Committed r194504: <http://trac.webkit.org/changeset/194504> 1152025 6 commit-queue 2016-01-02 14:33:20 -0800 All reviewed patches have been landed. Closing bug. 1152554 7 268110 joepeck 2016-01-04 15:57:33 -0800 Comment on attachment 268110 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268110&action=review > Source/WebInspectorUI/UserInterface/Images/ListStylePositionInside.svg:1 > +<?xml version="1.0" encoding="utf-8"?> Cool! > Source/WebInspectorUI/UserInterface/Main.html:602 > <script src="Views/VisualStyleUnitSlider.js"></script> > + <script src="Views/VisualStyleURLInput.js"></script> Actually, according to `/usr/bin/sort` these "URL" < "Unit" 1152557 8 268110 hi 2016-01-04 15:59:20 -0800 Comment on attachment 268110 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268110&action=review >> Source/WebInspectorUI/UserInterface/Main.html:602 >> + <script src="Views/VisualStyleURLInput.js"></script> > > Actually, according to `/usr/bin/sort` these "URL" < "Unit" Oh...well I can fix that in the next Visual sidebar patch. 268061 2015-12-31 18:05:44 -0800 2016-01-02 13:37:28 -0800 Patch bug-152631-20151231190510.patch text/plain 15453 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc2ZDdhYTBjNDc0Zjc5ZTMwMDNlYTNhZTY4MWU2 NDAxZWM1N2ZmOTEuLjY3OTljNGQ1ZmI2OTg1NzY3NDNkZWIzMjg3YTgyNDlkZDA3ZWVhMTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE1LTEyLTMxICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEFkZCBsaXN0LXN0eWxlIHByb3BlcnRpZXMgdG8gVmlzdWFsIFNpZGViYXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYzMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlZWluZyBhcyBsaXN0 cyBhcmUgdmVyeSBjb21tb24gaW4gd2ViIHBhZ2VzIGFjcm9zcyB0aGUgaW50ZXJuZXQsIGFkZGlu ZworICAgICAgICBhIHNlY3Rpb24gdG8gbGV0IHVzZXJzIGVkaXQgdGhlIHByb3BlcnRpZXMgdW5p cXVlIHRvIGxpc3RzIHNlZW1zIHBydWRlbnQuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2Vu Lmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9JbWFn ZXMvTGlzdFN0eWxlUG9zaXRpb25JbnNpZGUuc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0ltYWdlcy9MaXN0U3R5bGVQb3NpdGlvbk91dHNpZGUuc3ZnOiBBZGRlZC4KKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDoKKyAgICAgICAgUmUtYWRkZWQgVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVVSTElucHV0LmpzCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX3BvcHVsYXRlTGlzdFN0eWxlU2VjdGlvbik6 CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZEljb25M aXN0LmNzczoKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVyLmtleXdv cmQtaWNvbi1saXN0ID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiAu a2V5d29yZC1pY29uLWxpc3QtY29udGFpbmVyID4gLmtleXdvcmQtaWNvbik6CisgICAgICAgIEFk ZGVkIHNwZWNpZmllZCBjb2xvciBwcm9wZXJ0eSB0byBlbnN1cmUgdGhhdCA6YWN0aXZlIGRvZXNu J3QgYnJlYWsgdGhlIGNvbG9yIG9mIHRoZSBzdmcuCisKKyAgICAgICAgKC52aXN1YWwtc3R5bGUt cHJvcGVydHktY29udGFpbmVyLmtleXdvcmQtaWNvbi1saXN0ID4gLnZpc3VhbC1zdHlsZS1wcm9w ZXJ0eS12YWx1ZS1jb250YWluZXIgPiAua2V5d29yZC1pY29uLWxpc3QtY29udGFpbmVyID4gLmtl eXdvcmQtaWNvbjptYXRjaGVzKC5jb21wdXRlZCwgLnNlbGVjdGVkKSk6CisgICAgICAgICgudmlz dWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWljb24tbGlzdCA+IC52aXN1YWwt c3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gLmtleXdvcmQtaWNvbi1saXN0LWNvbnRh aW5lciA+IC5rZXl3b3JkLWljb24uc2VsZWN0ZWQpOgorICAgICAgICBDaGFuZ2VkIHRoZSBiYWNr Z3JvdW5kLWNvbG9yIGFuZCBib3JkZXItY29sb3IgdmFsdWVzIHRvIG1hdGNoIHRoZSByZXN0IG9m IFdlYiBJbnNwZWN0b3IuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0 eWxlS2V5d29yZEljb25MaXN0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxl S2V5d29yZEljb25MaXN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdv cmRJY29uTGlzdC5kYXNoVG9DYXBpdGFsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdC5jcmVhdGVMaXN0SXRlbSk6CisgICAgICAgIFRo ZSAiaW5pdGlhbCIga2V5d29yZCB3aWxsIGFsc28gdXNlIFVzZXJJbnRlcmZhY2UvSW1hZ2VzL1Zp c3VhbFN0eWxlTm9uZS5zdmcKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVVUkxJbnB1dC5qczogQWRkZWQuCisgICAgICAgIFByZXZpb3VzbHkgcmVtb3ZlZCBpbiBy MTkyNzA1LgorCiAyMDE1LTEyLTI5ICBEZXZpbiBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21h aWwuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0eWxpbmcgb2YgaW52YWxpZCBzZWxl Y3RvciBwZXJzaXN0cyB3aGVuIGNoYW5naW5nIHRoZSBzZWxlY3RlZCBub2RlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA4NDkzZjYzYzRmNWIyMDc2YTIyMmRjYTk2N2FhZTAz ZDM1NzEzNWQ1Li5mZmRmZmMxZjU5N2JkNzgwMTI3NWRmOWZmMjkxZTA5MmFmMWJjNmY3IDEwMDY0 NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDQ0CnljbWNjZmhHcE1kbUpOPVpuMlEtb0NlTkU3RSRH OUwkcEI8Q0NAPSZBJHg0UXQkcUNOLW57N0FBdypVWmo3IUw+bAoKZGVsdGEgMTQKV2NtZG5AbWdV WUhtSk49WkhaUl5KLTJ3blQkcF4qJgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9MaXN0U3R5bGVQb3NpdGlvbkluc2lkZS5zdmcgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvTGlzdFN0eWxlUG9zaXRpb25J bnNpZGUuc3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ4MmRjM2Y4NzQ0NGI1YjFhNGNkZTUyMjkxOWVkYjNkZTMx NTI5MzkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9JbWFnZXMvTGlzdFN0eWxlUG9zaXRpb25JbnNpZGUuc3ZnCkBAIC0wLDAgKzEsNiBAQAor PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KKzwhLS0gQ29weXJpZ2h0IMKp IDIwMTUgRGV2aW4gUm91c3NvIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPi4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4gLS0+Cis8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIg aWQ9InJvb3QiIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDE2IDE2Ij4KKyAgICA8Y2lyY2xl IGZpbGw9ImN1cnJlbnRDb2xvciIgc3Ryb2tlPSJjdXJyZW50Q29sb3IiIGN4PSI4IiBjeT0iNy41 IiByPSIyLjUiLz4KKyAgICA8cmVjdCBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIg eD0iMSIgeT0iMiIgd2lkdGg9IjE0IiBoZWlnaHQ9IjExIi8+Cis8L3N2Zz4KXCBObyBuZXdsaW5l IGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9JbWFnZXMvTGlzdFN0eWxlUG9zaXRpb25PdXRzaWRlLnN2ZyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9MaXN0U3R5bGVQb3NpdGlvbk91dHNpZGUu c3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjllZmJmNTVkMzBlYzI0ODRjZTI5MjU0NTIwOTE3ZGI2NDUwMzc3NDkK LS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9J bWFnZXMvTGlzdFN0eWxlUG9zaXRpb25PdXRzaWRlLnN2ZwpAQCAtMCwwICsxLDYgQEAKKzw/eG1s IHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+Cis8IS0tIENvcHlyaWdodCDCqSAyMDE1 IERldmluIFJvdXNzbyA8ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4uIEFsbCByaWdodHMgcmVz ZXJ2ZWQuIC0tPgorPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJy b290IiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCAxNiAxNiI+CisgICAgPGNpcmNsZSBmaWxs PSJjdXJyZW50Q29sb3IiIHN0cm9rZT0iY3VycmVudENvbG9yIiBjeD0iMy41IiBjeT0iNy41IiBy PSIyLjUiLz4KKyAgICA8cmVjdCBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgeD0i OSIgeT0iMiIgd2lkdGg9IjYiIGhlaWdodD0iMTEiLz4KKzwvc3ZnPgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCmluZGV4IDdiYjlmZGFlNmI1MWUxNTc1 NjZjNGI1ZjE4YWRhYTJmMWViOTkyYzYuLjIyZjk5NWM3NThlNDVjMTdmMThhNjliNjliMGMxNjgy YzQzNDM5NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01haW4uaHRtbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWlu Lmh0bWwKQEAgLTU5OSw2ICs1OTksNyBAQAogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxT dHlsZVRhYmJlZFByb3BlcnRpZXNSb3cuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJW aWV3cy9WaXN1YWxTdHlsZVRpbWluZ0VkaXRvci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBz cmM9IlZpZXdzL1Zpc3VhbFN0eWxlVW5pdFNsaWRlci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlw dCBzcmM9IlZpZXdzL1Zpc3VhbFN0eWxlVVJMSW5wdXQuanMiPjwvc2NyaXB0PgogCiAgICAgPHNj cmlwdCBzcmM9IkNvbnRyb2xsZXJzL0Fubm90YXRvci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCBzcmM9IkNvbnRyb2xsZXJzL0NvZGVNaXJyb3JFZGl0aW5nQ29udHJvbGxlci5qcyI+PC9zY3Jp cHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IDJkZWMwYTJl ODRkNTIxMTc1ZDYxYTFjZjQ2OTkzNzZiNDRiMTQ0ZmQuLjM5ZDU5OWYzM2JmZmE2NTM2YjYwZmRl NmMwNmQwMWEwZGJjODg0YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVs LmpzCkBAIC04OSw4ICs4OSw5IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5l bCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgICAgIHRo aXMuX2dlbmVyYXRlU2VjdGlvbigiYm9yZGVyIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJCb3Jk ZXIiKSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigib3V0bGluZSIsIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiT3V0bGluZSIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9u KCJib3gtc2hhZG93IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaGFkb3ciKSk7CisgICAgICAg IHRoaXMuX2dlbmVyYXRlU2VjdGlvbigibGlzdC1zdHlsZSIsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiTGlzdCBTdHlsZXMiKSk7CiAKLSAgICAgICAgdGhpcy5fc2VjdGlvbnMuYmFja2dyb3VuZCA9 IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24oImJhY2tncm91bmQiLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkJhY2tncm91bmQiKSwgW3RoaXMuX2dyb3Vwcy5iYWNrZ3JvdW5kU3R5bGUu c2VjdGlvbiwgdGhpcy5fZ3JvdXBzLmJvcmRlci5zZWN0aW9uLCB0aGlzLl9ncm91cHMub3V0bGlu ZS5zZWN0aW9uLCB0aGlzLl9ncm91cHMuYm94U2hhZG93LnNlY3Rpb25dKTsKKyAgICAgICAgdGhp cy5fc2VjdGlvbnMuYmFja2dyb3VuZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24o ImJhY2tncm91bmQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJhY2tncm91bmQiKSwgW3RoaXMu X2dyb3Vwcy5iYWNrZ3JvdW5kU3R5bGUuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLmJvcmRlci5zZWN0 aW9uLCB0aGlzLl9ncm91cHMub3V0bGluZS5zZWN0aW9uLCB0aGlzLl9ncm91cHMuYm94U2hhZG93 LnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5saXN0U3R5bGUuc2VjdGlvbl0pOwogICAgICAgICB0aGlz LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fc2VjdGlvbnMuYmFja2dyb3VuZC5lbGVtZW50KTsK IAogICAgICAgICAvLyBBbmltYXRpb24gU2VjdGlvbgpAQCAtMTA0NCw2ICsxMDQ1LDMzIEBAIFdl Ykluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0 YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgICAgIHRoaXMuX3BvcHVsYXRlU2VjdGlvbihncm91 cCwgW2JveFNoYWRvd10pOwogICAgIH0KIAorICAgIF9wb3B1bGF0ZUxpc3RTdHlsZVNlY3Rpb24o KQorICAgIHsKKyAgICAgICAgbGV0IGdyb3VwID0gdGhpcy5fZ3JvdXBzLmxpc3RTdHlsZTsKKyAg ICAgICAgbGV0IHByb3BlcnRpZXMgPSBncm91cC5wcm9wZXJ0aWVzOworCisgICAgICAgIGxldCBs aXN0U3R5bGVUeXBlUm93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKwor ICAgICAgICBwcm9wZXJ0aWVzLmxpc3RTdHlsZVR5cGUgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlS2V5d29yZFBpY2tlcigibGlzdC1zdHlsZS10eXBlIiwgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJUeXBlIiksIHsKKyAgICAgICAgICAgIGJhc2ljOiB0aGlzLl9rZXl3b3Jkcy5kZWZhdWx0 cy5jb25jYXQoWyJOb25lIiwgIkNpcmNsZSIsICJEaXNjIiwgIlNxdWFyZSIsICJEZWNpbWFsIiwg Ikxvd2VyIEFscGhhIiwgIlVwcGVyIEFscGhhIiwgIkxvd2VyIFJvbWFuIiwgIlVwcGVyIFJvbWFu Il0pLAorICAgICAgICAgICAgYWR2YW5jZWQ6IFsiRGVjaW1hbCBMZWFkaW5nIFplcm8iLCAiQXN0 ZXJpc2tzIiwgIkZvb3Rub3RlcyIsICJCaW5hcnkiLCAiT2N0YWwiLCAiTG93ZXIgSGV4YWRlY2lt YWwiLCAiVXBwZXIgSGV4YWRlY2ltYWwiLCAiTG93ZXIgTGF0aW4iLCAiVXBwZXIgTGF0aW4iLCAi TG93ZXIgR3JlZWsiLCAiVXBwZXIgR3JlZWsiLCAiQXJhYmljIEluZGljIiwgIkhlYnJldyIsICJI aXJhZ2FuYSIsICJLYXRha2FuYSIsICJIaXJhZ2FuYSBJcm9oYSIsICJLYXRha2FuYSBJcm9oYSIs ICJDSksgRWFydGhseSBCcmFuY2giLCAiQ0pLIEhlYXZlbmx5IFN0ZW0iLCAiQ0pLIElkZW9ncmFw aGljIiwgIkJlbmdhbGkiLCAiQ2FtYm9kaWFuIiwgIktobWVyIiwgIkRldmFuYWdhcmkiLCAiR3Vq YXJhdGkiLCAiR3VybXVraGkiLCAiS2FubmFkYSIsICJMYW8iLCAiTWFsYXlhbGFtIiwgIk1vbmdv bGlhbiIsICJNeWFubWFyIiwgIk9yaXlhIiwgIlBlcnNpYW4iLCAiVXJkdSIsICJUZWx1Z3UiLCAi QXJtZW5pYW4iLCAiTG93ZXIgQXJtZW5pYW4iLCAiVXBwZXIgQXJtZW5pYW4iLCAiR2VvcmdpYW4i LCAiVGliZXRhbiIsICJUaGFpIiwgIkFmYXIiLCAiSGFuZ3VsIENvbnNvbmFudCIsICJIYW5ndWwi LCAiTG93ZXIgTm9yd2VnaWFuIiwgIlVwcGVyIE5vcndlZ2lhbiIsICJFdGhpb3BpYyIsICJFdGhp b3BpYyBIYWxlaGFtZSBHZXoiLCAiRXRoaW9waWMgSGFsZWhhbWUgQWEgRXQiLCAiRXRoaW9waWMg SGFsZWhhbWUgQWEgRXIiLCAiT3JvbW8iLCAiRXRoaW9waWMgSGFsZWhhbWUgT20gRXQiLCAiU2lk YW1hIiwgIkV0aGlvcGljIEhhbGVoYW1lIFNpZCBFdCIsICJTb21hbGkiLCAiRXRoaW9waWMgSGFs ZWhhbWUgU28gRXQiLCAiQW1oYXJpYyIsICJFdGhpb3BpYyBIYWxlaGFtZSBBbSBFdCIsICJUaWdy ZSIsICJFdGhpb3BpYyBIYWxlaGFtZSBUaWciLCAiVGlncmlueWEgRXIiLCAiRXRoaW9waWMgSGFs ZWhhbWUgVGkgRXIiLCAiVGlncmlueWEgRXQiLCAiRXRoaW9waWMgSGFsZWhhbWUgVGkgRXQiLCAi RXRoaW9waWMgQWJlZ2VkZSIsICJFdGhpb3BpYyBBYmVnZWRlIEdleiIsICJBbWhhcmljIEFiZWdl ZGUiLCAiRXRoaW9waWMgQWJlZ2VkZSBBbSBFdCIsICJUaWdyaW55YSBFciBBYmVnZWRlIiwgIkV0 aGlvcGljIEFiZWdlZGUgVGkgRXIiLCAiVGlncmlueWEgRXQgQWJlZ2VkZSIsICJFdGhpb3BpYyBB YmVnZWRlIFRpIEV0Il0KKyAgICAgICAgfSk7CisKKyAgICAgICAgcHJvcGVydGllcy5saXN0U3R5 bGVQb3NpdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkSWNvbkxpc3Qo Imxpc3Qtc3R5bGUtcG9zaXRpb24iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBvc2l0aW9uIiks IFsiT3V0c2lkZSIsICJJbnNpZGUiLCAiSW5pdGlhbCJdKTsKKworICAgICAgICBsaXN0U3R5bGVU eXBlUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGllcy5saXN0U3R5bGVUeXBlLmVsZW1l bnQpOworICAgICAgICBsaXN0U3R5bGVUeXBlUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVy dGllcy5saXN0U3R5bGVQb3NpdGlvbi5lbGVtZW50KTsKKworICAgICAgICBsZXQgbGlzdFN0eWxl SW1hZ2VSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uUm93OworCisgICAgICAg IHByb3BlcnRpZXMubGlzdFN0eWxlSW1hZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxl VVJMSW5wdXQoImxpc3Qtc3R5bGUtaW1hZ2UiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkltYWdl IiksIHRoaXMuX2tleXdvcmRzLmRlZmF1bHRzLmNvbmNhdChbIk5vbmUiXSkpOworCisgICAgICAg IGxpc3RTdHlsZUltYWdlUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGllcy5saXN0U3R5 bGVJbWFnZS5lbGVtZW50KTsKKworICAgICAgICBsZXQgbGlzdFN0eWxlID0gbmV3IFdlYkluc3Bl Y3Rvci5EZXRhaWxzU2VjdGlvbkdyb3VwKFtsaXN0U3R5bGVUeXBlUm93LCBsaXN0U3R5bGVJbWFn ZVJvd10pOworICAgICAgICB0aGlzLl9wb3B1bGF0ZVNlY3Rpb24oZ3JvdXAsIFtsaXN0U3R5bGVd KTsKKyAgICB9CisKICAgICBfcG9wdWxhdGVUcmFuc2l0aW9uU2VjdGlvbigpCiAgICAgewogICAg ICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91cHMudHJhbnNpdGlvbjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29y ZEljb25MaXN0LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0LmNzcwppbmRleCA5MTcwOTlkNTc3MTdkZmU1Y2U5 NzQwZGM4YjE3MmRjZGYwOTkzMGVjLi40ZjNjODI4YmY2NjA4ZTZjZjk5MDg0YmJlZjM0ODNmNzFj MGY3MWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdC5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVLZXl3b3JkSWNvbkxpc3QuY3Nz CkBAIC0zNSw2ICszNSw3IEBACiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIHdpZHRoOiAy NnB4OwogICAgIGhlaWdodDogMThweDsKKyAgICBjb2xvcjogYmxhY2s7CiAgICAgYmFja2dyb3Vu ZC1jb2xvcjogaHNsKDAsIDEwMCUsIDEwMCUpOwogICAgIGJvcmRlcjogMXB4IHNvbGlkIGhzbCgw LCAwJSwgODMlKTsKICAgICBib3JkZXItcmlnaHQ6IG5vbmU7CkBAIC01NCwxMSArNTUsMTEgQEAK IC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVyLmtleXdvcmQtaWNvbi1saXN0ID4gLnZp c3VhbC1zdHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiAua2V5d29yZC1pY29uLWxpc3Qt Y29udGFpbmVyID4gLmtleXdvcmQtaWNvbjptYXRjaGVzKC5jb21wdXRlZCwgLnNlbGVjdGVkKSB7 CiAgICAgd2lkdGg6IDI3cHg7CiAgICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQ7Ci0gICAgYm9y ZGVyLWNvbG9yOiBoc2woMjEzLCA5MiUsIDU1JSk7CisgICAgYm9yZGVyLWNvbG9yOiBoc2woMjEy LCA5MiUsIDU0JSk7CiB9CiAKIC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVyLmtleXdv cmQtaWNvbi1saXN0ID4gLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiAu a2V5d29yZC1pY29uLWxpc3QtY29udGFpbmVyID4gLmtleXdvcmQtaWNvbi5zZWxlY3RlZCB7Ci0g ICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDIxMywgOTIlLCA1NSUpOworICAgIGJhY2tncm91bmQt Y29sb3I6IGhzbCgyMTIsIDkyJSwgNTQlKTsKICAgICBjb2xvcjogaHNsKDAsIDEwMCUsIDEwMCUp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0LmpzCmluZGV4 IGNmYmZkODgxNjc5ZDk5NGIxMjAyODU2ZWFlZGZmZTUwNTc5MTM1MTAuLjI2NjdmODhkZjdmMGI0 YzY4MjY2YTkzM2MyZTZmZjA4ZTUyODYxNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl S2V5d29yZEljb25MaXN0LmpzCkBAIC0zNiwxMSArMzYsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVLZXl3b3JkSWNvbkxpc3QgPSBjbGFzcyBWaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdCBl eHRlbgogICAgICAgICB0aGlzLl9jb21wdXRlZEljb24gPSBudWxsOwogICAgICAgICB0aGlzLl9z ZWxlY3RlZEljb24gPSBudWxsOwogCi0gICAgICAgIGZ1bmN0aW9uIGRhc2hUb0NhcGl0YWwobWF0 Y2gpIHsKLSAgICAgICAgICAgIHJldHVybiBtYXRjaFsxXS50b1VwcGVyQ2FzZSgpOwotICAgICAg ICB9Ci0KLSAgICAgICAgbGV0IHByZXR0eVByb3BlcnR5UmVmZXJlbmNlTmFtZSA9IHRoaXMuX3By b3BlcnR5UmVmZXJlbmNlTmFtZS5jYXBpdGFsaXplKCkucmVwbGFjZSgvKC0uKS9nLCBkYXNoVG9D YXBpdGFsKTsKKyAgICAgICAgbGV0IHByZXR0eVByb3BlcnR5UmVmZXJlbmNlTmFtZSA9IHRoaXMu X3Byb3BlcnR5UmVmZXJlbmNlTmFtZS5jYXBpdGFsaXplKCkucmVwbGFjZSgvKC0uKS9nLCAobWF0 Y2gpID0+IG1hdGNoWzFdLnRvVXBwZXJDYXNlKCkpOwogCiAgICAgICAgIGZ1bmN0aW9uIGNyZWF0 ZUxpc3RJdGVtKHZhbHVlLCB0aXRsZSkgewogICAgICAgICAgICAgbGV0IGljb25CdXR0b25FbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7CkBAIC00OSw3ICs0NSw3IEBA IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdCA9IGNsYXNzIFZpc3VhbFN0 eWxlS2V5d29yZEljb25MaXN0IGV4dGVuCiAgICAgICAgICAgICBpY29uQnV0dG9uRWxlbWVudC5j bGFzc0xpc3QuYWRkKCJrZXl3b3JkLWljb24iKTsKICAgICAgICAgICAgIGljb25CdXR0b25FbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5faGFuZGxlS2V5d29yZENoYW5nZWQu YmluZCh0aGlzKSk7CiAKLSAgICAgICAgICAgIGxldCBpbWFnZU5hbWUgPSB2YWx1ZSA9PT0gIm5v bmUiID8gIlZpc3VhbFN0eWxlTm9uZSIgOiBwcmV0dHlQcm9wZXJ0eVJlZmVyZW5jZU5hbWUgKyB0 aXRsZS5yZXBsYWNlKC9ccy9nLCAiIik7CisgICAgICAgICAgICBsZXQgaW1hZ2VOYW1lID0gKHZh bHVlID09PSAibm9uZSIgfHwgdmFsdWUgPT09ICJpbml0aWFsIikgPyAiVmlzdWFsU3R5bGVOb25l IiA6IHByZXR0eVByb3BlcnR5UmVmZXJlbmNlTmFtZSArIHRpdGxlLnJlcGxhY2UoL1xzL2csICIi KTsKICAgICAgICAgICAgIGljb25CdXR0b25FbGVtZW50LmFwcGVuZENoaWxkKHVzZVNWR1N5bWJv bCgiSW1hZ2VzLyIgKyBpbWFnZU5hbWUgKyAiLnN2ZyIpKTsKIAogICAgICAgICAgICAgcmV0dXJu IGljb25CdXR0b25FbGVtZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVVUkxJbnB1dC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlVVJMSW5wdXQuanMKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNjk4NTFkN2IxMTgxNzRiN2RiMGZiZmQ3Mzg4Y2IwZmUxMjdiMjZhYwotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlVVJMSW5wdXQuanMKQEAgLTAsMCArMSw3NSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Cisg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNl IGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4g UmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJ UyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JT IGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05U UklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVT SU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK1dlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZVVSTElucHV0ID0gY2xhc3MgVmlzdWFsU3R5bGVVUkxJbnB1dCBleHRl bmRzIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yCit7CisgICAgY29uc3Ry dWN0b3IocHJvcGVydHlOYW1lcywgdGV4dCwgcG9zc2libGVWYWx1ZXMsIGxheW91dFJldmVyc2Vk KQorICAgIHsKKyAgICAgICAgc3VwZXIocHJvcGVydHlOYW1lcywgdGV4dCwgcG9zc2libGVWYWx1 ZXMsIG51bGwsICJ1cmwtaW5wdXQiLCBsYXlvdXRSZXZlcnNlZCk7CisKKyAgICAgICAgdGhpcy5f dXJsSW5wdXRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW5wdXQiKTsKKyAgICAg ICAgdGhpcy5fdXJsSW5wdXRFbGVtZW50LnR5cGUgPSAidXJsIjsKKyAgICAgICAgdGhpcy5fdXJs SW5wdXRFbGVtZW50LnBsYWNlaG9sZGVyID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFbnRlciBh IFVSTCIpOworICAgICAgICB0aGlzLl91cmxJbnB1dEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi a2V5dXAiLCB0aGlzLl92YWx1ZURpZENoYW5nZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5j b250ZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl91cmxJbnB1dEVsZW1lbnQpOworICAgIH0K KworICAgIC8vIFB1YmxpYworCisgICAgZ2V0IHZhbHVlKCkKKyAgICB7CisgICAgICAgIHJldHVy biB0aGlzLl91cmxJbnB1dEVsZW1lbnQudmFsdWU7CisgICAgfQorCisgICAgc2V0IHZhbHVlKHZh bHVlKQorICAgIHsKKyAgICAgICAgaWYgKCh2YWx1ZSAmJiB2YWx1ZSA9PT0gdGhpcy52YWx1ZSkg fHwgdGhpcy5fcHJvcGVydHlNaXNzaW5nKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg IHRoaXMuX3VybElucHV0RWxlbWVudC52YWx1ZSA9IHZhbHVlOworICAgIH0KKworICAgIGdldCBz eW50aGVzaXplZFZhbHVlKCkKKyAgICB7CisgICAgICAgIGxldCB2YWx1ZSA9IHRoaXMudmFsdWU7 CisgICAgICAgIGlmICghdmFsdWUgfHwgIXZhbHVlLmxlbmd0aCkKKyAgICAgICAgICAgIHJldHVy biBudWxsOworCisgICAgICAgIGlmICh0aGlzLnZhbHVlSXNTdXBwb3J0ZWRLZXl3b3JkKHZhbHVl KSkKKyAgICAgICAgICAgIHJldHVybiB2YWx1ZTsKKworICAgICAgICByZXR1cm4gInVybCgiICsg dmFsdWUgKyAiKSI7CisgICAgfQorCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICBwYXJzZVZhbHVl KHRleHQpCisgICAgeworICAgICAgICBpZiAodGhpcy52YWx1ZUlzU3VwcG9ydGVkS2V5d29yZCh0 ZXh0KSkKKyAgICAgICAgICAgIHJldHVybiBbdGV4dCwgdGV4dF07CisKKyAgICAgICAgcmV0dXJu IC9eKD86dXJsXChccyopKFteXCldKikoPzpccypcKVxzKjs/KSQvLmV4ZWModGV4dCk7CisgICAg fQorfTsK 268110 2016-01-02 13:37:28 -0800 2016-01-02 14:33:16 -0800 Patch 152631.diff text/plain 14885 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJmZmQxYTIuLmUzYjc0YjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE2LTAxLTAyICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFk ZCBsaXN0LXN0eWxlIHByb3BlcnRpZXMgdG8gVmlzdWFsIFNpZGViYXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYzMQorCisgICAgICAgIFJldmll d2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICBTZWVpbmcgYXMgbGlzdHMgYXJlIHZl cnkgY29tbW9uIGluIHdlYiBwYWdlcyBhY3Jvc3MgdGhlIGludGVybmV0LCBhZGRpbmcKKyAgICAg ICAgYSBzZWN0aW9uIHRvIGxldCB1c2VycyBlZGl0IHRoZSBwcm9wZXJ0aWVzIHVuaXF1ZSB0byBs aXN0cyBzZWVtcyBwcnVkZW50LgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvSW1hZ2VzL0xpc3RT dHlsZVBvc2l0aW9uSW5zaWRlLnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9J bWFnZXMvTGlzdFN0eWxlUG9zaXRpb25PdXRzaWRlLnN2ZzogQWRkZWQuCisgICAgICAgICogVXNl ckludGVyZmFjZS9NYWluLmh0bWw6CisgICAgICAgIFJlLWFkZGVkIFVzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVVUkxJbnB1dC5qcworCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZURldGFpbHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZUxpc3RTdHlsZVNlY3Rpb24pOgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdC5jc3M6 CisgICAgICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci5rZXl3b3JkLWljb24t bGlzdCA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFsdWUtY29udGFpbmVyID4gLmtleXdvcmQt aWNvbi1saXN0LWNvbnRhaW5lciA+IC5rZXl3b3JkLWljb24pOgorICAgICAgICBBZGRlZCBzcGVj aWZpZWQgY29sb3IgcHJvcGVydHkgdG8gZW5zdXJlIHRoYXQgOmFjdGl2ZSBkb2Vzbid0IGJyZWFr IHRoZSBjb2xvciBvZiB0aGUgc3ZnLgorCisgICAgICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5 LWNvbnRhaW5lci5rZXl3b3JkLWljb24tbGlzdCA+IC52aXN1YWwtc3R5bGUtcHJvcGVydHktdmFs dWUtY29udGFpbmVyID4gLmtleXdvcmQtaWNvbi1saXN0LWNvbnRhaW5lciA+IC5rZXl3b3JkLWlj b246bWF0Y2hlcyguY29tcHV0ZWQsIC5zZWxlY3RlZCkpOgorICAgICAgICAoLnZpc3VhbC1zdHls ZS1wcm9wZXJ0eS1jb250YWluZXIua2V5d29yZC1pY29uLWxpc3QgPiAudmlzdWFsLXN0eWxlLXBy b3BlcnR5LXZhbHVlLWNvbnRhaW5lciA+IC5rZXl3b3JkLWljb24tbGlzdC1jb250YWluZXIgPiAu a2V5d29yZC1pY29uLnNlbGVjdGVkKToKKyAgICAgICAgQ2hhbmdlZCB0aGUgYmFja2dyb3VuZC1j b2xvciBhbmQgYm9yZGVyLWNvbG9yIHZhbHVlcyB0byBtYXRjaCB0aGUgcmVzdCBvZiBXZWIgSW5z cGVjdG9yLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdv cmRJY29uTGlzdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRJ Y29uTGlzdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkSWNvbkxp c3QuZGFzaFRvQ2FwaXRhbCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVLZXl3b3JkSWNvbkxpc3QuY3JlYXRlTGlzdEl0ZW0pOgorICAgICAgICBUaGUgImluaXRp YWwiIGtleXdvcmQgd2lsbCBhbHNvIHVzZSBVc2VySW50ZXJmYWNlL0ltYWdlcy9WaXN1YWxTdHls ZU5vbmUuc3ZnCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlVVJM SW5wdXQuanM6IEFkZGVkLgorICAgICAgICBQcmV2aW91c2x5IHJlbW92ZWQgaW4gcjE5MjcwNS4K KwogMjAxNi0wMS0wMiAgQWxiZXJ0byBHYXJjaWEgIDxiZXJ0b0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdIHdlYmtpdCAyLjMuNSBidWlsZCBmYWlsdXJlIHdpdGggcHl0aG9uIDMuMy40CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBmZmFlYjI2N2Y3ZTc1M2ZjMTZkMWRh ZWM5ZWU0NWFjMzhjZDc5YjJhLi41N2MxYWVmMGZmNzUyZTE2NzAzNjYxYmZkOTk5ZDc4NTYzMjg3 OWFlIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDM3CnNjbWRuPm1TeFU2bUpSYmFGJjh0 R08jVS1MbiR3M05sTDUkUFA/KWEzJVZAck5fOXBvajAzP19WIXZGdlAKCmRlbHRhIDE0CldjbWJS OWolQytkbUpSYmFaRCFtby0yd25RbitISnYKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvTGlzdFN0eWxlUG9zaXRpb25JbnNpZGUuc3ZnIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0xpc3RTdHlsZVBvc2l0 aW9uSW5zaWRlLnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kODJkYzNm Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv SW1hZ2VzL0xpc3RTdHlsZVBvc2l0aW9uSW5zaWRlLnN2ZwpAQCAtMCwwICsxLDYgQEAKKzw/eG1s IHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+Cis8IS0tIENvcHlyaWdodCDCqSAyMDE1 IERldmluIFJvdXNzbyA8ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4uIEFsbCByaWdodHMgcmVz ZXJ2ZWQuIC0tPgorPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJy b290IiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCAxNiAxNiI+CisgICAgPGNpcmNsZSBmaWxs PSJjdXJyZW50Q29sb3IiIHN0cm9rZT0iY3VycmVudENvbG9yIiBjeD0iOCIgY3k9IjcuNSIgcj0i Mi41Ii8+CisgICAgPHJlY3QgZmlsbD0ibm9uZSIgc3Ryb2tlPSJjdXJyZW50Q29sb3IiIHg9IjEi IHk9IjIiIHdpZHRoPSIxNCIgaGVpZ2h0PSIxMSIvPgorPC9zdmc+ClwgTm8gbmV3bGluZSBhdCBl bmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvSW1hZ2VzL0xpc3RTdHlsZVBvc2l0aW9uT3V0c2lkZS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvTGlzdFN0eWxlUG9zaXRpb25PdXRzaWRlLnN2Zwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45ZWZiZjU1Ci0tLSAvZGV2L251bGwK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0xpc3RTdHls ZVBvc2l0aW9uT3V0c2lkZS5zdmcKQEAgLTAsMCArMSw2IEBACis8P3htbCB2ZXJzaW9uPSIxLjAi IGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxNSBEZXZpbiBSb3Vzc28g PGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+LiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KKzxz dmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBpZD0icm9vdCIgdmVyc2lvbj0i MS4xIiB2aWV3Qm94PSIwIDAgMTYgMTYiPgorICAgIDxjaXJjbGUgZmlsbD0iY3VycmVudENvbG9y IiBzdHJva2U9ImN1cnJlbnRDb2xvciIgY3g9IjMuNSIgY3k9IjcuNSIgcj0iMi41Ii8+CisgICAg PHJlY3QgZmlsbD0ibm9uZSIgc3Ryb2tlPSJjdXJyZW50Q29sb3IiIHg9IjkiIHk9IjIiIHdpZHRo PSI2IiBoZWlnaHQ9IjExIi8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01haW4uaHRtbAppbmRleCA3YmI5ZmRhLi4yMmY5OTVjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBAIC01OTksNiArNTk5LDcg QEAKICAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVUYWJiZWRQcm9wZXJ0aWVzUm93 LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVUaW1pbmdF ZGl0b3IuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHlsZVVu aXRTbGlkZXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHls ZVVSTElucHV0LmpzIj48L3NjcmlwdD4KIAogICAgIDxzY3JpcHQgc3JjPSJDb250cm9sbGVycy9B bm5vdGF0b3IuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJDb250cm9sbGVycy9Db2Rl TWlycm9yRWRpdGluZ0NvbnRyb2xsZXIuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZURldGFpbHNQYW5lbC5qcwppbmRleCA1ODllY2FlLi41NzUyNzdhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFp bHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5qcwpAQCAtODksOCArODksOSBAQCBXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5l bCBleHRlbmRzIFdlYgogICAgICAgICB0aGlzLl9nZW5lcmF0ZVNlY3Rpb24oImJvcmRlciIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQm9yZGVyIikpOwogICAgICAgICB0aGlzLl9nZW5lcmF0ZVNl Y3Rpb24oIm91dGxpbmUiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk91dGxpbmUiKSk7CiAgICAg ICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigiYm94LXNoYWRvdyIsIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiQm94IFNoYWRvdyIpKTsKKyAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9uKCJsaXN0 LXN0eWxlIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMaXN0IFN0eWxlcyIpKTsKIAotICAgICAg ICB0aGlzLl9zZWN0aW9ucy5iYWNrZ3JvdW5kID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2Vj dGlvbigiYmFja2dyb3VuZCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQmFja2dyb3VuZCIpLCBb dGhpcy5fZ3JvdXBzLmJhY2tncm91bmRTdHlsZS5zZWN0aW9uLCB0aGlzLl9ncm91cHMuYm9yZGVy LnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5vdXRsaW5lLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5ib3hT aGFkb3cuc2VjdGlvbl0pOworICAgICAgICB0aGlzLl9zZWN0aW9ucy5iYWNrZ3JvdW5kID0gbmV3 IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigiYmFja2dyb3VuZCIsIFdlYkluc3BlY3Rvci5V SVN0cmluZygiQmFja2dyb3VuZCIpLCBbdGhpcy5fZ3JvdXBzLmJhY2tncm91bmRTdHlsZS5zZWN0 aW9uLCB0aGlzLl9ncm91cHMuYm9yZGVyLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5vdXRsaW5lLnNl Y3Rpb24sIHRoaXMuX2dyb3Vwcy5ib3hTaGFkb3cuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLmxpc3RT dHlsZS5zZWN0aW9uXSk7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9z ZWN0aW9ucy5iYWNrZ3JvdW5kLmVsZW1lbnQpOwogCiAgICAgICAgIC8vIEFuaW1hdGlvbiBTZWN0 aW9uCkBAIC0xMDQ0LDYgKzEwNDUsMzMgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWls c1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAg ICAgdGhpcy5fcG9wdWxhdGVTZWN0aW9uKGdyb3VwLCBbYm94U2hhZG93XSk7CiAgICAgfQogCisg ICAgX3BvcHVsYXRlTGlzdFN0eWxlU2VjdGlvbigpCisgICAgeworICAgICAgICBsZXQgZ3JvdXAg PSB0aGlzLl9ncm91cHMubGlzdFN0eWxlOworICAgICAgICBsZXQgcHJvcGVydGllcyA9IGdyb3Vw LnByb3BlcnRpZXM7CisKKyAgICAgICAgbGV0IGxpc3RTdHlsZVR5cGVSb3cgPSBuZXcgV2ViSW5z cGVjdG9yLkRldGFpbHNTZWN0aW9uUm93OworCisgICAgICAgIHByb3BlcnRpZXMubGlzdFN0eWxl VHlwZSA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyKCJsaXN0LXN0 eWxlLXR5cGUiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlR5cGUiKSwgeworICAgICAgICAgICAg YmFzaWM6IHRoaXMuX2tleXdvcmRzLmRlZmF1bHRzLmNvbmNhdChbIk5vbmUiLCAiQ2lyY2xlIiwg IkRpc2MiLCAiU3F1YXJlIiwgIkRlY2ltYWwiLCAiTG93ZXIgQWxwaGEiLCAiVXBwZXIgQWxwaGEi LCAiTG93ZXIgUm9tYW4iLCAiVXBwZXIgUm9tYW4iXSksCisgICAgICAgICAgICBhZHZhbmNlZDog WyJEZWNpbWFsIExlYWRpbmcgWmVybyIsICJBc3Rlcmlza3MiLCAiRm9vdG5vdGVzIiwgIkJpbmFy eSIsICJPY3RhbCIsICJMb3dlciBIZXhhZGVjaW1hbCIsICJVcHBlciBIZXhhZGVjaW1hbCIsICJM b3dlciBMYXRpbiIsICJVcHBlciBMYXRpbiIsICJMb3dlciBHcmVlayIsICJVcHBlciBHcmVlayIs ICJBcmFiaWMgSW5kaWMiLCAiSGVicmV3IiwgIkhpcmFnYW5hIiwgIkthdGFrYW5hIiwgIkhpcmFn YW5hIElyb2hhIiwgIkthdGFrYW5hIElyb2hhIiwgIkNKSyBFYXJ0aGx5IEJyYW5jaCIsICJDSksg SGVhdmVubHkgU3RlbSIsICJDSksgSWRlb2dyYXBoaWMiLCAiQmVuZ2FsaSIsICJDYW1ib2RpYW4i LCAiS2htZXIiLCAiRGV2YW5hZ2FyaSIsICJHdWphcmF0aSIsICJHdXJtdWtoaSIsICJLYW5uYWRh IiwgIkxhbyIsICJNYWxheWFsYW0iLCAiTW9uZ29saWFuIiwgIk15YW5tYXIiLCAiT3JpeWEiLCAi UGVyc2lhbiIsICJVcmR1IiwgIlRlbHVndSIsICJBcm1lbmlhbiIsICJMb3dlciBBcm1lbmlhbiIs ICJVcHBlciBBcm1lbmlhbiIsICJHZW9yZ2lhbiIsICJUaWJldGFuIiwgIlRoYWkiLCAiQWZhciIs ICJIYW5ndWwgQ29uc29uYW50IiwgIkhhbmd1bCIsICJMb3dlciBOb3J3ZWdpYW4iLCAiVXBwZXIg Tm9yd2VnaWFuIiwgIkV0aGlvcGljIiwgIkV0aGlvcGljIEhhbGVoYW1lIEdleiIsICJFdGhpb3Bp YyBIYWxlaGFtZSBBYSBFdCIsICJFdGhpb3BpYyBIYWxlaGFtZSBBYSBFciIsICJPcm9tbyIsICJF dGhpb3BpYyBIYWxlaGFtZSBPbSBFdCIsICJTaWRhbWEiLCAiRXRoaW9waWMgSGFsZWhhbWUgU2lk IEV0IiwgIlNvbWFsaSIsICJFdGhpb3BpYyBIYWxlaGFtZSBTbyBFdCIsICJBbWhhcmljIiwgIkV0 aGlvcGljIEhhbGVoYW1lIEFtIEV0IiwgIlRpZ3JlIiwgIkV0aGlvcGljIEhhbGVoYW1lIFRpZyIs ICJUaWdyaW55YSBFciIsICJFdGhpb3BpYyBIYWxlaGFtZSBUaSBFciIsICJUaWdyaW55YSBFdCIs ICJFdGhpb3BpYyBIYWxlaGFtZSBUaSBFdCIsICJFdGhpb3BpYyBBYmVnZWRlIiwgIkV0aGlvcGlj IEFiZWdlZGUgR2V6IiwgIkFtaGFyaWMgQWJlZ2VkZSIsICJFdGhpb3BpYyBBYmVnZWRlIEFtIEV0 IiwgIlRpZ3JpbnlhIEVyIEFiZWdlZGUiLCAiRXRoaW9waWMgQWJlZ2VkZSBUaSBFciIsICJUaWdy aW55YSBFdCBBYmVnZWRlIiwgIkV0aGlvcGljIEFiZWdlZGUgVGkgRXQiXQorICAgICAgICB9KTsK KworICAgICAgICBwcm9wZXJ0aWVzLmxpc3RTdHlsZVBvc2l0aW9uID0gbmV3IFdlYkluc3BlY3Rv ci5WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdCgibGlzdC1zdHlsZS1wb3NpdGlvbiIsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiUG9zaXRpb24iKSwgWyJPdXRzaWRlIiwgIkluc2lkZSIsICJJbml0 aWFsIl0pOworCisgICAgICAgIGxpc3RTdHlsZVR5cGVSb3cuZWxlbWVudC5hcHBlbmRDaGlsZChw cm9wZXJ0aWVzLmxpc3RTdHlsZVR5cGUuZWxlbWVudCk7CisgICAgICAgIGxpc3RTdHlsZVR5cGVS b3cuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9wZXJ0aWVzLmxpc3RTdHlsZVBvc2l0aW9uLmVsZW1l bnQpOworCisgICAgICAgIGxldCBsaXN0U3R5bGVJbWFnZVJvdyA9IG5ldyBXZWJJbnNwZWN0b3Iu RGV0YWlsc1NlY3Rpb25Sb3c7CisKKyAgICAgICAgcHJvcGVydGllcy5saXN0U3R5bGVJbWFnZSA9 IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVVUkxJbnB1dCgibGlzdC1zdHlsZS1pbWFnZSIs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSW1hZ2UiKSwgdGhpcy5fa2V5d29yZHMuZGVmYXVsdHMu Y29uY2F0KFsiTm9uZSJdKSk7CisKKyAgICAgICAgbGlzdFN0eWxlSW1hZ2VSb3cuZWxlbWVudC5h cHBlbmRDaGlsZChwcm9wZXJ0aWVzLmxpc3RTdHlsZUltYWdlLmVsZW1lbnQpOworCisgICAgICAg IGxldCBsaXN0U3R5bGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAoW2xp c3RTdHlsZVR5cGVSb3csIGxpc3RTdHlsZUltYWdlUm93XSk7CisgICAgICAgIHRoaXMuX3BvcHVs YXRlU2VjdGlvbihncm91cCwgW2xpc3RTdHlsZV0pOworICAgIH0KKwogICAgIF9wb3B1bGF0ZVRy YW5zaXRpb25TZWN0aW9uKCkKICAgICB7CiAgICAgICAgIGxldCBncm91cCA9IHRoaXMuX2dyb3Vw cy50cmFuc2l0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVmlzdWFsU3R5bGVLZXl3b3JkSWNvbkxpc3QuY3NzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVLZXl3b3JkSWNvbkxpc3Qu Y3NzCmluZGV4IDkxNzA5OWQuLjRmM2M4MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0LmNzcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZUtleXdvcmRJY29uTGlzdC5jc3MKQEAgLTM1LDYgKzM1LDcgQEAKICAgICBwb3NpdGlvbjogcmVs YXRpdmU7CiAgICAgd2lkdGg6IDI2cHg7CiAgICAgaGVpZ2h0OiAxOHB4OworICAgIGNvbG9yOiBi bGFjazsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2woMCwgMTAwJSwgMTAwJSk7CiAgICAgYm9y ZGVyOiAxcHggc29saWQgaHNsKDAsIDAlLCA4MyUpOwogICAgIGJvcmRlci1yaWdodDogbm9uZTsK QEAgLTU0LDExICs1NSwxMSBAQAogLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIua2V5 d29yZC1pY29uLWxpc3QgPiAudmlzdWFsLXN0eWxlLXByb3BlcnR5LXZhbHVlLWNvbnRhaW5lciA+ IC5rZXl3b3JkLWljb24tbGlzdC1jb250YWluZXIgPiAua2V5d29yZC1pY29uOm1hdGNoZXMoLmNv bXB1dGVkLCAuc2VsZWN0ZWQpIHsKICAgICB3aWR0aDogMjdweDsKICAgICBib3JkZXItcmlnaHQ6 IDFweCBzb2xpZDsKLSAgICBib3JkZXItY29sb3I6IGhzbCgyMTMsIDkyJSwgNTUlKTsKKyAgICBi b3JkZXItY29sb3I6IGhzbCgyMTIsIDkyJSwgNTQlKTsKIH0KIAogLnZpc3VhbC1zdHlsZS1wcm9w ZXJ0eS1jb250YWluZXIua2V5d29yZC1pY29uLWxpc3QgPiAudmlzdWFsLXN0eWxlLXByb3BlcnR5 LXZhbHVlLWNvbnRhaW5lciA+IC5rZXl3b3JkLWljb24tbGlzdC1jb250YWluZXIgPiAua2V5d29y ZC1pY29uLnNlbGVjdGVkIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2woMjEzLCA5MiUsIDU1 JSk7CisgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDIxMiwgOTIlLCA1NCUpOwogICAgIGNvbG9y OiBoc2woMCwgMTAwJSwgMTAwJSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVLZXl3 b3JkSWNvbkxpc3QuanMKaW5kZXggY2ZiZmQ4OC4uMjY2N2Y4OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVLZXl3b3JkSWNv bkxpc3QuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VmlzdWFsU3R5bGVLZXl3b3JkSWNvbkxpc3QuanMKQEAgLTM2LDExICszNiw3IEBAIFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdCA9IGNsYXNzIFZpc3VhbFN0eWxlS2V5d29y ZEljb25MaXN0IGV4dGVuCiAgICAgICAgIHRoaXMuX2NvbXB1dGVkSWNvbiA9IG51bGw7CiAgICAg ICAgIHRoaXMuX3NlbGVjdGVkSWNvbiA9IG51bGw7CiAKLSAgICAgICAgZnVuY3Rpb24gZGFzaFRv Q2FwaXRhbChtYXRjaCkgewotICAgICAgICAgICAgcmV0dXJuIG1hdGNoWzFdLnRvVXBwZXJDYXNl KCk7Ci0gICAgICAgIH0KLQotICAgICAgICBsZXQgcHJldHR5UHJvcGVydHlSZWZlcmVuY2VOYW1l ID0gdGhpcy5fcHJvcGVydHlSZWZlcmVuY2VOYW1lLmNhcGl0YWxpemUoKS5yZXBsYWNlKC8oLS4p L2csIGRhc2hUb0NhcGl0YWwpOworICAgICAgICBsZXQgcHJldHR5UHJvcGVydHlSZWZlcmVuY2VO YW1lID0gdGhpcy5fcHJvcGVydHlSZWZlcmVuY2VOYW1lLmNhcGl0YWxpemUoKS5yZXBsYWNlKC8o LS4pL2csIChtYXRjaCkgPT4gbWF0Y2hbMV0udG9VcHBlckNhc2UoKSk7CiAKICAgICAgICAgZnVu Y3Rpb24gY3JlYXRlTGlzdEl0ZW0odmFsdWUsIHRpdGxlKSB7CiAgICAgICAgICAgICBsZXQgaWNv bkJ1dHRvbkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKQEAgLTQ5 LDcgKzQ1LDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0ID0gY2xh c3MgVmlzdWFsU3R5bGVLZXl3b3JkSWNvbkxpc3QgZXh0ZW4KICAgICAgICAgICAgIGljb25CdXR0 b25FbGVtZW50LmNsYXNzTGlzdC5hZGQoImtleXdvcmQtaWNvbiIpOwogICAgICAgICAgICAgaWNv bkJ1dHRvbkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9oYW5kbGVLZXl3 b3JkQ2hhbmdlZC5iaW5kKHRoaXMpKTsKIAotICAgICAgICAgICAgbGV0IGltYWdlTmFtZSA9IHZh bHVlID09PSAibm9uZSIgPyAiVmlzdWFsU3R5bGVOb25lIiA6IHByZXR0eVByb3BlcnR5UmVmZXJl bmNlTmFtZSArIHRpdGxlLnJlcGxhY2UoL1xzL2csICIiKTsKKyAgICAgICAgICAgIGxldCBpbWFn ZU5hbWUgPSAodmFsdWUgPT09ICJub25lIiB8fCB2YWx1ZSA9PT0gImluaXRpYWwiKSA/ICJWaXN1 YWxTdHlsZU5vbmUiIDogcHJldHR5UHJvcGVydHlSZWZlcmVuY2VOYW1lICsgdGl0bGUucmVwbGFj ZSgvXHMvZywgIiIpOwogICAgICAgICAgICAgaWNvbkJ1dHRvbkVsZW1lbnQuYXBwZW5kQ2hpbGQo dXNlU1ZHU3ltYm9sKCJJbWFnZXMvIiArIGltYWdlTmFtZSArICIuc3ZnIikpOwogCiAgICAgICAg ICAgICByZXR1cm4gaWNvbkJ1dHRvbkVsZW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVVSTElucHV0LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVVUkxJbnB1 dC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42OTg1MWQ3Ci0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlz dWFsU3R5bGVVUkxJbnB1dC5qcwpAQCAtMCwwICsxLDc1IEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRP UlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENP TlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURF TlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRV VEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9S WSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworV2ViSW5z cGVjdG9yLlZpc3VhbFN0eWxlVVJMSW5wdXQgPSBjbGFzcyBWaXN1YWxTdHlsZVVSTElucHV0IGV4 dGVuZHMgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IKK3sKKyAgICBjb25z dHJ1Y3Rvcihwcm9wZXJ0eU5hbWVzLCB0ZXh0LCBwb3NzaWJsZVZhbHVlcywgbGF5b3V0UmV2ZXJz ZWQpCisgICAgeworICAgICAgICBzdXBlcihwcm9wZXJ0eU5hbWVzLCB0ZXh0LCBwb3NzaWJsZVZh bHVlcywgbnVsbCwgInVybC1pbnB1dCIsIGxheW91dFJldmVyc2VkKTsKKworICAgICAgICB0aGlz Ll91cmxJbnB1dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbnB1dCIpOworICAg ICAgICB0aGlzLl91cmxJbnB1dEVsZW1lbnQudHlwZSA9ICJ1cmwiOworICAgICAgICB0aGlzLl91 cmxJbnB1dEVsZW1lbnQucGxhY2Vob2xkZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVudGVy IGEgVVJMIik7CisgICAgICAgIHRoaXMuX3VybElucHV0RWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJrZXl1cCIsIHRoaXMuX3ZhbHVlRGlkQ2hhbmdlLmJpbmQodGhpcykpOworICAgICAgICB0aGlz LmNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3VybElucHV0RWxlbWVudCk7CisgICAg fQorCisgICAgLy8gUHVibGljCisKKyAgICBnZXQgdmFsdWUoKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX3VybElucHV0RWxlbWVudC52YWx1ZTsKKyAgICB9CisKKyAgICBzZXQgdmFsdWUo dmFsdWUpCisgICAgeworICAgICAgICBpZiAoKHZhbHVlICYmIHZhbHVlID09PSB0aGlzLnZhbHVl KSB8fCB0aGlzLl9wcm9wZXJ0eU1pc3NpbmcpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgdGhpcy5fdXJsSW5wdXRFbGVtZW50LnZhbHVlID0gdmFsdWU7CisgICAgfQorCisgICAgZ2V0 IHN5bnRoZXNpemVkVmFsdWUoKQorICAgIHsKKyAgICAgICAgbGV0IHZhbHVlID0gdGhpcy52YWx1 ZTsKKyAgICAgICAgaWYgKCF2YWx1ZSB8fCAhdmFsdWUubGVuZ3RoKQorICAgICAgICAgICAgcmV0 dXJuIG51bGw7CisKKyAgICAgICAgaWYgKHRoaXMudmFsdWVJc1N1cHBvcnRlZEtleXdvcmQodmFs dWUpKQorICAgICAgICAgICAgcmV0dXJuIHZhbHVlOworCisgICAgICAgIHJldHVybiAidXJsKCIg KyB2YWx1ZSArICIpIjsKKyAgICB9CisKKyAgICAvLyBQcm90ZWN0ZWQKKworICAgIHBhcnNlVmFs dWUodGV4dCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLnZhbHVlSXNTdXBwb3J0ZWRLZXl3b3Jk KHRleHQpKQorICAgICAgICAgICAgcmV0dXJuIFt0ZXh0LCB0ZXh0XTsKKworICAgICAgICByZXR1 cm4gL14oPzp1cmxcKFxzKikoW15cKV0qKSg/OlxzKlwpXHMqOz8pJC8uZXhlYyh0ZXh0KTsKKyAg ICB9Cit9Owo=