112552 2013-03-18 03:37:02 -0700 Web Inspector: Debugger scripts should visually differ from network/filesystem files in workspace. 2013-03-19 02:08:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 856957 0 vsevik 2013-03-18 03:37:02 -0700 Patch to follow 857012 1 193538 vsevik 2013-03-18 05:18:12 -0700 Created attachment 193538 Patch 858068 2 vsevik 2013-03-19 02:08:29 -0700 Committed r146191: <http://trac.webkit.org/changeset/146191> 193538 2013-03-18 05:18:12 -0700 2013-03-18 09:50:40 -0700 Patch bug-112552-20130318161403.patch text/plain 29052 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ4NTBjYzQxNzM0NmVm MzA4OWVmMGE2NjUwZmNlNGQwODE2ZTI0Yy4uNjRlNjZmNGIzMWZiMTQwZmU3OTRjMDk0MjI1ZWFk ZmFjNmQwMjNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDEzLTAzLTE4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERlYnVnZ2VyIHNjcmlwdHMgc2hvdWxkIHZpc3VhbGx5IGRpZmZlciBmcm9tIG5ldHdvcmsv ZmlsZXN5c3RlbSBmaWxlcyBpbiB3b3Jrc3BhY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBFeHRyYWN0ZWQgQ29udGVudFByb3ZpZGVyQmFzZWRQcm9q ZWN0RGVsZWdhdGUgZnJvbSBTaW1wbGVQcm9qZWN0RGVsZWdhdGUuCisgICAgICAgIEltcGxlbWVu dGVkIERlYnVnZ2VyUHJvamVjdERlbGVnYXRlIGZvciBEZWZhdWx0U2NyaXB0TWFwcGluZy4KKyAg ICAgICAgRGVidWdnZXIgc2NyaXB0cyBhcmUgbm93IGFkZGVkIHRvIHdvcmtzcGFjZSB3aXRoIGEg bmFtZSBzdGFydGluZyB3aXRoIFtWTV0gYW5kIGVuZGluZyB3aXRoIHNjcmlwdElkLgorICAgICAg ICBBZGRlZCB5ZWxsb3cgYmFja2dyb3VuZCB0byBkZWJ1Z2dlciBzY3JpcHRzIGVkaXRvci4KKwor ICAgICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3Jl LnZjcHJvajoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXJCYXNlZFByb2plY3REZWxl Z2F0ZS5qczogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0U2Ny aXB0TWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0U2NyaXB0TWFwcGlu Zyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVmYXVsdFNjcmlwdE1hcHBpbmcucHJvdG90eXBl LmFkZFNjcmlwdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVmYXVsdFNjcmlwdE1hcHBpbmcu cHJvdG90eXBlLl9kZWJ1Z2dlclJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByb2plY3REZWxlZ2F0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcm9qZWN0 RGVsZWdhdGUucHJvdG90eXBlLmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy b2plY3REZWxlZ2F0ZS5wcm90b3R5cGUudHlwZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlLmRpc3BsYXlOYW1lKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUuYWRkU2NyaXB0KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvUGFyc2VkVVJMLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlBhcnNlZFVSTC5zcGxpdFVSTCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1w bGVXb3Jrc3BhY2VQcm92aWRlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaW1wbGVQcm9q ZWN0RGVsZWdhdGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpbXBsZVByb2plY3REZWxlZ2F0 ZS5wcm90b3R5cGUuYWRkRmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2ltcGxlUHJvamVj dERlbGVnYXRlLnByb3RvdHlwZS5fZW5zdXJlVW5pcXVlUGF0aCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIucHJvdG90eXBlLl9pbm5lckFkZEZpbGVGb3JV UkwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYzoKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Xb3Jrc3BhY2UucHJvdG90eXBlLnVpU291cmNlQ29kZUZvclVSTCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL2phdmFTY3JpcHRTb3VyY2VGcmFtZS5jc3M6IEFkZGVkLgorICAgICAgICAoLnNvdXJj ZS1mcmFtZS1kZWJ1Z2dlci1zY3JpcHQpOgorCiAyMDEzLTAzLTE3ICBEb21pbmljIE1henpvbmkg IDxkbWF6em9uaUBnb29nbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgV2luZG93cyBIVE1MU2Vs ZWN0RWxlbWVudCBrZXlzdHJva2VzIG9uIENocm9taXVtIHdpbgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4 IGJlY2JhYzgyMDYyNmQ2MDk4OWEyZmJjYmNhNjdlYzRkYjk2NzRhMzguLjBhMjE0YzM0MTFkNDJh MTYxOTJhZWYzZjE2MDViZDZiZGNkOTYxNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZ3lwaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTUzMTcsNiAr NTMxNyw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlUGFuZWwu anMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMnLAog ICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFByb3ZpZGVyLmpzJywKKyAg ICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQcm92aWRlckJhc2VkUHJvamVj dERlbGVnYXRlLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQ cm92aWRlcnMuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGV4dE1l bnUuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3 LmpzJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUu dmNwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5k ZXggN2EzNTAzZGI3NWJhMmMzOWFkNTdlYTZhYmE4ZTRmNGJjOTIzN2M0My4uNjUyYjVmZjJhNzNh MmQ1ZDlhY2JlYzIwYjBiYjIyNDk2YThlYjMxMCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKQEAgLTc3MjEwLDYgKzc3MjEwLDEwIEBACiAJCQkJCT4K IAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3Jc ZnJvbnQtZW5kXENvbnRlbnRQcm92aWRlckJhc2VkUHJvamVjdERlbGVnYXRlLmpzIgorCQkJCQk+ CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9y XGZyb250LWVuZFxDb250ZW50UHJvdmlkZXJzLmpzIgogCQkJCQk+CiAJCQkJPC9GaWxlPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5IGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CmluZGV4IGNkYzcw Yzk3ZTBmMDY5MDIzYzQ5MzVlYmY1ZGIwNmE1OGIwZWFhMjQuLjNmYjQ5OGM4MjUzYTg2ZmE5MDMw NmI2MGRjZjQwYzkzZmJjZDEyZTYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9jb21waWxlLWZyb250LWVuZC5weQorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29t cGlsZS1mcm9udC1lbmQucHkKQEAgLTY1LDYgKzY1LDcgQEAgbW9kdWxlcyA9IFsKICAgICAgICAg ICAgICJDb21waWxlclNjcmlwdE1hcHBpbmcuanMiLAogICAgICAgICAgICAgIkNvbnNvbGVNb2Rl bC5qcyIsCiAgICAgICAgICAgICAiQ29udGVudFByb3ZpZGVyLmpzIiwKKyAgICAgICAgICAgICJD b250ZW50UHJvdmlkZXJCYXNlZFByb2plY3REZWxlZ2F0ZS5qcyIsCiAgICAgICAgICAgICAiQ29u dGVudFByb3ZpZGVycy5qcyIsCiAgICAgICAgICAgICAiQ29va2llUGFyc2VyLmpzIiwKICAgICAg ICAgICAgICJDU1NNZXRhZGF0YS5qcyIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQcm92aWRlckJhc2VkUHJvamVjdERlbGVnYXRlLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXJCYXNlZFBy b2plY3REZWxlZ2F0ZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ZjQ4OTdlNDlkMGQ4ODQ5ZWZjOTczNzExMDY5 MjNmNjJhZjQ1ZjFhCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXJCYXNlZFByb2plY3REZWxlZ2F0ZS5qcwpAQCAtMCww ICsxLDE1MiBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBHb29nbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0 OgorICoKKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy CisgKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlCisgKiBkaXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9m IEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmlidXRvcnMgbWF5IGJl IHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorICogdGhp cyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBB TkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJ Q1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlS SUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyAqIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorICovCisKKyAvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGltcGxlbWVudHMge1dlYkluc3Bl Y3Rvci5Qcm9qZWN0RGVsZWdhdGV9CisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0K KyAqIEBwYXJhbSB7c3RyaW5nfSB0eXBlCisgKi8KK1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlk ZXJCYXNlZFByb2plY3REZWxlZ2F0ZSA9IGZ1bmN0aW9uKHR5cGUpCit7CisgICAgdGhpcy5fdHlw ZSA9IHR5cGU7CisgICAgLyoqIEB0eXBlIHtPYmplY3QuPHN0cmluZywgV2ViSW5zcGVjdG9yLkNv bnRlbnRQcm92aWRlcj59ICovCisgICAgdGhpcy5fY29udGVudFByb3ZpZGVycyA9IHt9OworfQor CitXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyQmFzZWRQcm9qZWN0RGVsZWdhdGUucHJvdG90 eXBlID0geworICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICBp ZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgLy8gT3ZlcnJpZGRkZW4gYnkgc3ViY2xhc3Nl cworICAgICAgICByZXR1cm4gIiI7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4g e3N0cmluZ30KKyAgICAgKi8KKyAgICB0eXBlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fdHlwZTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7c3Ry aW5nfQorICAgICAqLworICAgIGRpc3BsYXlOYW1lOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICAvLyBPdmVycmlkZGRlbiBieSBzdWJjbGFzc2VzCisgICAgICAgIHJldHVybiAiIjsKKyAgICB9 LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAorICAgICAq IEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyxib29sZWFuLHN0cmluZyl9IGNhbGxiYWNrCisgICAg ICovCisgICAgcmVxdWVzdEZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBjYWxsYmFjaykKKyAg ICB7CisgICAgICAgIHZhciBjb250ZW50UHJvdmlkZXIgPSB0aGlzLl9jb250ZW50UHJvdmlkZXJz W3BhdGguam9pbigiLyIpXTsKKyAgICAgICAgY29udGVudFByb3ZpZGVyLnJlcXVlc3RDb250ZW50 KGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0K KyAgICAgKi8KKyAgICBjYW5TZXRGaWxlQ29udGVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0FycmF5 LjxzdHJpbmc+fSBwYXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IG5ld0NvbnRlbnQKKyAgICAg KiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjaworICAgICAqLworICAgIHNldEZp bGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBuZXdDb250ZW50LCBjYWxsYmFjaykKKyAgICB7Cisg ICAgICAgIGNhbGxiYWNrKG51bGwpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0g e0FycmF5LjxzdHJpbmc+fSBwYXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IHF1ZXJ5CisgICAg ICogQHBhcmFtIHtib29sZWFufSBjYXNlU2Vuc2l0aXZlCisgICAgICogQHBhcmFtIHtib29sZWFu fSBpc1JlZ2V4CisgICAgICogQHBhcmFtIHtmdW5jdGlvbihBcnJheS48V2ViSW5zcGVjdG9yLkNv bnRlbnRQcm92aWRlci5TZWFyY2hNYXRjaD4pfSBjYWxsYmFjaworICAgICAqLworICAgIHNlYXJj aEluRmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHBhdGgsIHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1Jl Z2V4LCBjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHZhciBjb250ZW50UHJvdmlkZXIgPSB0aGlz Ll9jb250ZW50UHJvdmlkZXJzW3BhdGguam9pbigiLyIpXTsKKyAgICAgICAgY29udGVudFByb3Zp ZGVyLnNlYXJjaEluQ29udGVudChxdWVyeSwgY2FzZVNlbnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJh Y2spOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBw YXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IHVybAorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLkNvbnRlbnRQcm92aWRlcn0gY29udGVudFByb3ZpZGVyCisgICAgICogQHBhcmFtIHtib29s ZWFufSBpc0VkaXRhYmxlCisgICAgICogQHBhcmFtIHtib29sZWFuPX0gaXNDb250ZW50U2NyaXB0 CisgICAgICogQHJldHVybiB7QXJyYXkuPHN0cmluZz59CisgICAgICovCisgICAgYWRkQ29udGVu dFByb3ZpZGVyOiBmdW5jdGlvbihwYXRoLCB1cmwsIGNvbnRlbnRQcm92aWRlciwgaXNFZGl0YWJs ZSwgaXNDb250ZW50U2NyaXB0KQorICAgIHsKKyAgICAgICAgdmFyIGZpbGVEZXNjcmlwdG9yID0g bmV3IFdlYkluc3BlY3Rvci5GaWxlRGVzY3JpcHRvcihwYXRoLCB1cmwsIHVybCwgY29udGVudFBy b3ZpZGVyLmNvbnRlbnRUeXBlKCksIGlzRWRpdGFibGUsIGlzQ29udGVudFNjcmlwdCk7CisgICAg ICAgIHRoaXMuX2NvbnRlbnRQcm92aWRlcnNbcGF0aC5qb2luKCIvIildID0gY29udGVudFByb3Zp ZGVyOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu UHJvamVjdERlbGVnYXRlLkV2ZW50cy5GaWxlQWRkZWQsIGZpbGVEZXNjcmlwdG9yKTsKKyAgICAg ICAgcmV0dXJuIHBhdGg7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7QXJyYXku PHN0cmluZz59IHBhdGgKKyAgICAgKi8KKyAgICByZW1vdmVGaWxlOiBmdW5jdGlvbihwYXRoKQor ICAgIHsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2NvbnRlbnRQcm92aWRlcnNbcGF0aC5qb2luKCIv IildOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu UHJvamVjdERlbGVnYXRlLkV2ZW50cy5GaWxlUmVtb3ZlZCwgcGF0aCk7CisgICAgfSwKKworICAg IC8qKgorICAgICAqIEByZXR1cm4ge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuQ29udGVu dFByb3ZpZGVyPn0KKyAgICAgKi8KKyAgICBjb250ZW50UHJvdmlkZXJzOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fY29udGVudFByb3ZpZGVyczsKKyAgICB9LAorCisg ICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2NvbnRlbnRQcm92aWRl cnMgPSB7fTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLlByb2plY3REZWxlZ2F0ZS5FdmVudHMuUmVzZXQsIG51bGwpOworICAgIH0sCisgICAgCisg ICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZQorfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0U2NyaXB0TWFwcGlu Zy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFNjcmlwdE1h cHBpbmcuanMKaW5kZXggNTZhNmJiM2M4NDcyOGE2NjU4MDMyOTcyMzQ3NDJkYWYzOTJkNGFlYy4u MzY4ODRlZTAxNThhMDNjNDY1OWU2ZjIzMzkzYTI4NjBjMjUzZjk5ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0U2NyaXB0TWFwcGluZy5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRTY3JpcHRNYXBw aW5nLmpzCkBAIC0zNSw3ICszNSw5IEBACiAgKi8KIFdlYkluc3BlY3Rvci5EZWZhdWx0U2NyaXB0 TWFwcGluZyA9IGZ1bmN0aW9uKHdvcmtzcGFjZSkKIHsKLSAgICB0aGlzLl93b3Jrc3BhY2VQcm92 aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIod29ya3NwYWNl LCBXZWJJbnNwZWN0b3IucHJvamVjdFR5cGVzLkRlYnVnZ2VyKTsKKyAgICB0aGlzLl9wcm9qZWN0 RGVsZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJvamVjdERlbGVnYXRlKCk7Cisg ICAgdGhpcy5fd29ya3NwYWNlID0gd29ya3NwYWNlOworICAgIHRoaXMuX3dvcmtzcGFjZS5hZGRQ cm9qZWN0KHRoaXMuX3Byb2plY3REZWxlZ2F0ZSk7CiAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMu R2xvYmFsT2JqZWN0Q2xlYXJlZCwgdGhpcy5fZGVidWdnZXJSZXNldCwgdGhpcyk7CiAgICAgdGhp cy5fZGVidWdnZXJSZXNldCgpOwogfQpAQCAtNzMsOSArNzUsOCBAQCBXZWJJbnNwZWN0b3IuRGVm YXVsdFNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGFkZFNjcmlwdDog ZnVuY3Rpb24oc2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IHNj cmlwdC5pc0lubGluZVNjcmlwdCgpID8gbmV3IFdlYkluc3BlY3Rvci5Db25jYXRlbmF0ZWRTY3Jp cHRzQ29udGVudFByb3ZpZGVyKFtzY3JpcHRdKSA6IHNjcmlwdDsKLSAgICAgICAgdmFyIHVpU291 cmNlQ29kZSA9IHRoaXMuX3dvcmtzcGFjZVByb3ZpZGVyLmFkZFVuaXF1ZUZpbGVGb3JVUkwoc2Ny aXB0LnNvdXJjZVVSTCwgY29udGVudFByb3ZpZGVyLCBmYWxzZSwgc2NyaXB0LmlzQ29udGVudFNj cmlwdCk7Ci0KKyAgICAgICAgdmFyIHBhdGggPSB0aGlzLl9wcm9qZWN0RGVsZWdhdGUuYWRkU2Ny aXB0KHNjcmlwdCk7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSB0aGlzLl93b3Jrc3BhY2Uu dWlTb3VyY2VDb2RlKHRoaXMuX3Byb2plY3REZWxlZ2F0ZS5pZCgpLCBwYXRoKTsKICAgICAgICAg dGhpcy5fdWlTb3VyY2VDb2RlRm9yU2NyaXB0SWRbc2NyaXB0LnNjcmlwdElkXSA9IHVpU291cmNl Q29kZTsKICAgICAgICAgdGhpcy5fc2NyaXB0SWRGb3JVSVNvdXJjZUNvZGUucHV0KHVpU291cmNl Q29kZSwgc2NyaXB0LnNjcmlwdElkKTsKICAgICAgICAgdWlTb3VyY2VDb2RlLnNldFNvdXJjZU1h cHBpbmcodGhpcyk7CkBAIC05OSw2ICsxMDAsNDggQEAgV2ViSW5zcGVjdG9yLkRlZmF1bHRTY3Jp cHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgLyoqIEB0eXBlIHtPYmplY3QuPHN0cmlu ZywgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59ICovCiAgICAgICAgIHRoaXMuX3VpU291cmNl Q29kZUZvclNjcmlwdElkID0ge307CiAgICAgICAgIHRoaXMuX3NjcmlwdElkRm9yVUlTb3VyY2VD b2RlID0gbmV3IE1hcCgpOwotICAgICAgICB0aGlzLl93b3Jrc3BhY2VQcm92aWRlci5yZXNldCgp OworICAgICAgICB0aGlzLl9wcm9qZWN0RGVsZWdhdGUucmVzZXQoKTsKICAgICB9CiB9CisKKy8q KgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92 aWRlckJhc2VkUHJvamVjdERlbGVnYXRlfQorICovCitXZWJJbnNwZWN0b3IuRGVidWdnZXJQcm9q ZWN0RGVsZWdhdGUgPSBmdW5jdGlvbigpCit7CisgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92 aWRlckJhc2VkUHJvamVjdERlbGVnYXRlLmNhbGwodGhpcywgV2ViSW5zcGVjdG9yLnByb2plY3RU eXBlcy5EZWJ1Z2dlcik7Cit9CisKK1dlYkluc3BlY3Rvci5EZWJ1Z2dlclByb2plY3REZWxlZ2F0 ZS5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAgICAq LworICAgIGlkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gImRlYnVnZ2VyOiI7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAg ICBkaXNwbGF5TmFtZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuICJkZWJ1Z2dl ciI7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNjcmlw dH0gc2NyaXB0CisgICAgICogQHJldHVybiB7QXJyYXkuPHN0cmluZz59CisgICAgICovCisgICAg YWRkU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCisgICAgeworICAgICAgICB2YXIgY29udGVudFBy b3ZpZGVyID0gc2NyaXB0LmlzSW5saW5lU2NyaXB0KCkgPyBuZXcgV2ViSW5zcGVjdG9yLkNvbmNh dGVuYXRlZFNjcmlwdHNDb250ZW50UHJvdmlkZXIoW3NjcmlwdF0pIDogc2NyaXB0OworICAgICAg ICB2YXIgc3BsaXR0ZWRVUkwgPSBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMLnNwbGl0VVJMKHNjcmlw dC5zb3VyY2VVUkwpOworICAgICAgICB2YXIgbmFtZSA9IHNwbGl0dGVkVVJMW3NwbGl0dGVkVVJM Lmxlbmd0aCAtIDFdOworICAgICAgICBuYW1lID0gIltWTV0gIiArIG5hbWUgKyAiICgiICsgc2Ny aXB0LnNjcmlwdElkICsgIikiOworICAgICAgICByZXR1cm4gdGhpcy5hZGRDb250ZW50UHJvdmlk ZXIoW25hbWVdLCBzY3JpcHQuc291cmNlVVJMLCBjb250ZW50UHJvdmlkZXIsIGZhbHNlLCBzY3Jp cHQuaXNDb250ZW50U2NyaXB0KTsKKyAgICB9LAorICAgIAorICAgIF9fcHJvdG9fXzogV2ViSW5z cGVjdG9yLkNvbnRlbnRQcm92aWRlckJhc2VkUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZQorfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0 U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFT Y3JpcHRTb3VyY2VGcmFtZS5qcwppbmRleCA4MGJjNmZjZmIwZjU5OTZiN2NkNzJiNGIyMzcwM2Q0 MDAyZmYxZDQwLi5kMDE3MWUzZjcyY2JhMGIxYTIyYWY5YzdiNTY5Y2E1OTcxNjYyMzU2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3Vy Y2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFT Y3JpcHRTb3VyY2VGcmFtZS5qcwpAQCAtNDUsNiArNDUsOCBAQCBXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lID0gZnVuY3Rpb24oc2NyaXB0c1BhbmVsLCB1aVNvdXJjZUNvZGUpCiAg ICAgICAgIHRoaXMuX2JyZWFrcG9pbnRBZGRlZCh7ZGF0YTpsb2NhdGlvbnNbaV19KTsKIAogICAg IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5jYWxsKHRoaXMsIHVpU291cmNlQ29kZSk7 CisgICAgaWYgKHVpU291cmNlQ29kZS5wcm9qZWN0KCkudHlwZSgpID09PSBXZWJJbnNwZWN0b3Iu cHJvamVjdFR5cGVzLkRlYnVnZ2VyKQorICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFz cygic291cmNlLWZyYW1lLWRlYnVnZ2VyLXNjcmlwdCIpOwogCiAgICAgdGhpcy5fcG9wb3Zlckhl bHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UG9wb3ZlckhlbHBlcih0aGlzLnRleHRFZGl0 b3IuZWxlbWVudCwKICAgICAgICAgICAgIHRoaXMuX2dldFBvcG92ZXJBbmNob3IuYmluZCh0aGlz KSwgdGhpcy5fcmVzb2x2ZU9iamVjdEZvclBvcG92ZXIuYmluZCh0aGlzKSwgdGhpcy5fb25IaWRl UG9wb3Zlci5iaW5kKHRoaXMpLCB0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUGFyc2VkVVJMLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9QYXJzZWRVUkwuanMKaW5kZXggOWE4MDJiYjFmZThjYmRiNDI5NGU1MTU4OWRi NTY5NTRhOGZhYTUzMS4uYTZiY2ExZGM5NjQ4ODkwNTJmNDA1ODZmZmM1MWMzNWY3ZDIxMzUyMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYXJzZWRVUkwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYXJzZWRVUkwuanMK QEAgLTg3LDYgKzg3LDM3IEBAIFdlYkluc3BlY3Rvci5QYXJzZWRVUkwgPSBmdW5jdGlvbih1cmwp CiB9CiAKIC8qKgorICogQHBhcmFtIHtzdHJpbmd9IHVybAorICogQHJldHVybiB7QXJyYXkuPHN0 cmluZz59CisgKi8KK1dlYkluc3BlY3Rvci5QYXJzZWRVUkwuc3BsaXRVUkwgPSBmdW5jdGlvbih1 cmwpCit7CisgICAgdmFyIHBhcnNlZFVSTCA9IG5ldyBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMKHVy bCk7CisgICAgdmFyIG9yaWdpbjsKKyAgICB2YXIgZm9sZGVyUGF0aDsKKyAgICB2YXIgbmFtZTsK KyAgICBpZiAocGFyc2VkVVJMLmlzVmFsaWQpIHsKKyAgICAgICAgb3JpZ2luID0gcGFyc2VkVVJM LnNjaGVtZSArICI6Ly8iICsgcGFyc2VkVVJMLmhvc3Q7CisgICAgICAgIGlmIChwYXJzZWRVUkwu cG9ydCkKKyAgICAgICAgICAgIG9yaWdpbiArPSAiOiIgKyBwYXJzZWRVUkwucG9ydDsKKyAgICAg ICAgZm9sZGVyUGF0aCA9IHBhcnNlZFVSTC5mb2xkZXJQYXRoQ29tcG9uZW50czsKKyAgICAgICAg bmFtZSA9IHBhcnNlZFVSTC5sYXN0UGF0aENvbXBvbmVudDsKKyAgICAgICAgaWYgKHBhcnNlZFVS TC5xdWVyeVBhcmFtcykKKyAgICAgICAgICAgIG5hbWUgKz0gIj8iICsgcGFyc2VkVVJMLnF1ZXJ5 UGFyYW1zOworICAgIH0gZWxzZSB7CisgICAgICAgIG9yaWdpbiA9ICIiOworICAgICAgICBmb2xk ZXJQYXRoID0gIiI7CisgICAgICAgIG5hbWUgPSB1cmw7CisgICAgfQorICAgIHZhciByZXN1bHQg PSBbb3JpZ2luXTsKKyAgICB2YXIgc3BsaXR0ZWRQYXRoID0gZm9sZGVyUGF0aC5zcGxpdCgiLyIp OworICAgIGZvciAodmFyIGkgPSAxOyBpIDwgc3BsaXR0ZWRQYXRoLmxlbmd0aDsgKytpKQorICAg ICAgICByZXN1bHQucHVzaChzcGxpdHRlZFBhdGhbaV0pOworICAgIHJlc3VsdC5wdXNoKG5hbWUp OworICAgIHJldHVybiByZXN1bHQ7Cit9CisKKy8qKgogICogQHBhcmFtIHtzdHJpbmd9IGJhc2VV UkwKICAqIEBwYXJhbSB7c3RyaW5nfSBocmVmCiAgKiBAcmV0dXJuIHs/c3RyaW5nfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1wbGVXb3Jrc3BhY2VQ cm92aWRlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2ltcGxlV29y a3NwYWNlUHJvdmlkZXIuanMKaW5kZXggOWQzY2QyNDZlMzdmYmUzODgwMjdhNDdjMGFhYWNiMmMw NGMyM2E2Yy4uNGU1NDk5MTQzYzY2Nzg0ZDhlYTlkMGUxMzhiYzE1YzVkZGQwNDY2NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1wbGVXb3Jrc3BhY2VQ cm92aWRlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpbXBs ZVdvcmtzcGFjZVByb3ZpZGVyLmpzCkBAIC0zMCwxNSArMzAsMTQgQEAKIAogLyoqCiAgKiBAY29u c3RydWN0b3IKLSAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuUHJvamVjdERlbGVnYXRlfQot ICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3R9CisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVj dG9yLkNvbnRlbnRQcm92aWRlckJhc2VkUHJvamVjdERlbGVnYXRlfQorICogQHBhcmFtIHtzdHJp bmd9IG5hbWUKKyAqIEBwYXJhbSB7c3RyaW5nfSB0eXBlCiAgKi8KIFdlYkluc3BlY3Rvci5TaW1w bGVQcm9qZWN0RGVsZWdhdGUgPSBmdW5jdGlvbihuYW1lLCB0eXBlKQogeworICAgIFdlYkluc3Bl Y3Rvci5Db250ZW50UHJvdmlkZXJCYXNlZFByb2plY3REZWxlZ2F0ZS5jYWxsKHRoaXMsIHR5cGUp OwogICAgIHRoaXMuX25hbWUgPSBuYW1lOwotICAgIHRoaXMuX3R5cGUgPSB0eXBlOwotICAgIC8q KiBAdHlwZSB7T2JqZWN0LjxzdHJpbmcsIFdlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXI+fSAq LwotICAgIHRoaXMuX2NvbnRlbnRQcm92aWRlcnMgPSB7fTsKICAgICB0aGlzLl9sYXN0VW5pcXVl U3VmZml4ID0gMDsKIH0KIApAQCAtNTQsMTUgKzUzLDcgQEAgV2ViSW5zcGVjdG9yLlNpbXBsZVBy b2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgaWQ6IGZ1bmN0aW9uKCkK ICAgICB7Ci0gICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuU2ltcGxlUHJvamVjdERlbGVnYXRl LnByb2plY3RJZCh0aGlzLl9uYW1lLCB0aGlzLl90eXBlKTsKLSAgICB9LAotCi0gICAgLyoqCi0g ICAgICogQHJldHVybiB7c3RyaW5nfQotICAgICAqLwotICAgIHR5cGU6IGZ1bmN0aW9uKCkKLSAg ICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl90eXBlOworICAgICAgICByZXR1cm4gV2ViSW5zcGVj dG9yLlNpbXBsZVByb2plY3REZWxlZ2F0ZS5wcm9qZWN0SWQodGhpcy5fbmFtZSwgdGhpcy50eXBl KCkpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTczLDcgKzY0LDcgQEAgV2ViSW5zcGVjdG9yLlNp bXBsZVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0eXBlb2YgdGhp cy5fZGlzcGxheU5hbWUgIT09ICJ1bmRlZmluZWQiKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMu X2Rpc3BsYXlOYW1lOwogICAgICAgICBpZiAoIXRoaXMuX25hbWUpIHsKLSAgICAgICAgICAgIHRo aXMuX2Rpc3BsYXlOYW1lID0gdGhpcy5fdHlwZSAhPT0gV2ViSW5zcGVjdG9yLnByb2plY3RUeXBl cy5TbmlwcGV0cyA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKG5vIGRvbWFpbikiKSA6ICIiOwor ICAgICAgICAgICAgdGhpcy5fZGlzcGxheU5hbWUgPSB0aGlzLnR5cGUoKSAhPT0gV2ViSW5zcGVj dG9yLnByb2plY3RUeXBlcy5TbmlwcGV0cyA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKG5vIGRv bWFpbikiKSA6ICIiOwogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2Rpc3BsYXlOYW1lOwogICAg ICAgICB9CiAgICAgICAgIHZhciBwYXJzZWRVUkwgPSBuZXcgV2ViSW5zcGVjdG9yLlBhcnNlZFVS TCh0aGlzLl9uYW1lKTsKQEAgLTg5LDQ3ICs4MCw2IEBAIFdlYkluc3BlY3Rvci5TaW1wbGVQcm9q ZWN0RGVsZWdhdGUucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtBcnJh eS48c3RyaW5nPn0gcGF0aAotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyxib29sZWFu LHN0cmluZyl9IGNhbGxiYWNrCi0gICAgICovCi0gICAgcmVxdWVzdEZpbGVDb250ZW50OiBmdW5j dGlvbihwYXRoLCBjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIHZhciBjb250ZW50UHJvdmlkZXIg PSB0aGlzLl9jb250ZW50UHJvdmlkZXJzW3BhdGguam9pbigiLyIpXTsKLSAgICAgICAgY29udGVu dFByb3ZpZGVyLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrKTsKLSAgICB9LAotCi0gICAgLyoqCi0g ICAgICogQHJldHVybiB7Ym9vbGVhbn0KLSAgICAgKi8KLSAgICBjYW5TZXRGaWxlQ29udGVudDog ZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0sCi0KLSAgICAv KioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCi0gICAgICogQHBhcmFtIHtz dHJpbmd9IG5ld0NvbnRlbnQKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxs YmFjawotICAgICAqLwotICAgIHNldEZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBuZXdDb250 ZW50LCBjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIGNhbGxiYWNrKG51bGwpOwotICAgIH0sCi0K LSAgICAvKioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCi0gICAgICogQHBh cmFtIHtzdHJpbmd9IHF1ZXJ5Ci0gICAgICogQHBhcmFtIHtib29sZWFufSBjYXNlU2Vuc2l0aXZl Ci0gICAgICogQHBhcmFtIHtib29sZWFufSBpc1JlZ2V4Ci0gICAgICogQHBhcmFtIHtmdW5jdGlv bihBcnJheS48V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92aWRlci5TZWFyY2hNYXRjaD4pfSBjYWxs YmFjawotICAgICAqLwotICAgIHNlYXJjaEluRmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHBhdGgsIHF1 ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCBjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIHZh ciBjb250ZW50UHJvdmlkZXIgPSB0aGlzLl9jb250ZW50UHJvdmlkZXJzW3BhdGguam9pbigiLyIp XTsKLSAgICAgICAgY29udGVudFByb3ZpZGVyLnNlYXJjaEluQ29udGVudChxdWVyeSwgY2FzZVNl bnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJhY2spOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBA cGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHVybAog ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92aWRlcn0gY29udGVudFByb3Zp ZGVyCiAgICAgICogQHBhcmFtIHtib29sZWFufSBpc0VkaXRhYmxlCkBAIC0xNDAsMTAgKzkwLDcg QEAgV2ViSW5zcGVjdG9yLlNpbXBsZVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAg ewogICAgICAgICBpZiAoZm9yY2VVbmlxdWVQYXRoKQogICAgICAgICAgICAgdGhpcy5fZW5zdXJl VW5pcXVlUGF0aChwYXRoKTsKLSAgICAgICAgdmFyIGZpbGVEZXNjcmlwdG9yID0gbmV3IFdlYklu c3BlY3Rvci5GaWxlRGVzY3JpcHRvcihwYXRoLCB1cmwsIHVybCwgY29udGVudFByb3ZpZGVyLmNv bnRlbnRUeXBlKCksIGlzRWRpdGFibGUsIGlzQ29udGVudFNjcmlwdCk7Ci0gICAgICAgIHRoaXMu X2NvbnRlbnRQcm92aWRlcnNbcGF0aC5qb2luKCIvIildID0gY29udGVudFByb3ZpZGVyOwotICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUHJvamVjdERl bGVnYXRlLkV2ZW50cy5GaWxlQWRkZWQsIGZpbGVEZXNjcmlwdG9yKTsKLSAgICAgICAgcmV0dXJu IHBhdGg7CisgICAgICAgIHJldHVybiB0aGlzLmFkZENvbnRlbnRQcm92aWRlcihwYXRoLCB1cmws IGNvbnRlbnRQcm92aWRlciwgaXNFZGl0YWJsZSwgaXNDb250ZW50U2NyaXB0KTsKICAgICB9LAog CiAgICAgLyoqCkBAIC0xNTMsMjkgKzEwMCwxNSBAQCBXZWJJbnNwZWN0b3IuU2ltcGxlUHJvamVj dERlbGVnYXRlLnByb3RvdHlwZSA9IHsKICAgICAgewogICAgICAgICB2YXIgdW5pcXVlUGF0aCA9 IHBhdGguam9pbigiLyIpOwogICAgICAgICB2YXIgc3VmZml4ID0gIiI7Ci0gICAgICAgIHdoaWxl ICh0aGlzLl9jb250ZW50UHJvdmlkZXJzW3VuaXF1ZVBhdGhdKSB7CisgICAgICAgIHZhciBjb250 ZW50UHJvdmlkZXJzID0gdGhpcy5jb250ZW50UHJvdmlkZXJzKCk7CisgICAgICAgIHdoaWxlIChj b250ZW50UHJvdmlkZXJzW3VuaXF1ZVBhdGhdKSB7CiAgICAgICAgICAgICBzdWZmaXggPSAiICgi ICsgKCsrdGhpcy5fbGFzdFVuaXF1ZVN1ZmZpeCkgKyAiKSI7CiAgICAgICAgICAgICB1bmlxdWVQ YXRoID0gcGF0aCArIHN1ZmZpeDsKICAgICAgICAgfQogICAgICAgICBwYXRoW3BhdGgubGVuZ3Ro IC0gMV0gKz0gc3VmZml4OwogICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge0FycmF5 LjxzdHJpbmc+fSBwYXRoCi0gICAgICovCi0gICAgcmVtb3ZlRmlsZTogZnVuY3Rpb24ocGF0aCkK LSAgICB7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9jb250ZW50UHJvdmlkZXJzW3BhdGguam9pbigi LyIpXTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LlByb2plY3REZWxlZ2F0ZS5FdmVudHMuRmlsZVJlbW92ZWQsIHBhdGgpOwotICAgIH0sCi0KLSAg ICByZXNldDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5fY29udGVudFByb3ZpZGVy cyA9IHt9OwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuUHJvamVjdERlbGVnYXRlLkV2ZW50cy5SZXNldCwgbnVsbCk7Ci0gICAgfSwKICAgICAKLSAg ICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlCisgICAgX19wcm90b19f OiBXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyQmFzZWRQcm9qZWN0RGVsZWdhdGUucHJvdG90 eXBlCiB9CiAKIC8qKgpAQCAtMTkyLDM3ICsxMjUsNiBAQCBXZWJJbnNwZWN0b3IuU2ltcGxlV29y a3NwYWNlUHJvdmlkZXIgPSBmdW5jdGlvbih3b3Jrc3BhY2UsIHR5cGUpCiB9CiAKIC8qKgotICog QHBhcmFtIHtzdHJpbmd9IHVybAotICogQHJldHVybiB7QXJyYXkuPHN0cmluZz59Ci0gKi8KLVdl Ykluc3BlY3Rvci5TaW1wbGVXb3Jrc3BhY2VQcm92aWRlci5zcGxpdFVSTCA9IGZ1bmN0aW9uKHVy bCkKLXsKLSAgICB2YXIgcGFyc2VkVVJMID0gbmV3IFdlYkluc3BlY3Rvci5QYXJzZWRVUkwodXJs KTsKLSAgICB2YXIgb3JpZ2luOwotICAgIHZhciBmb2xkZXJQYXRoOwotICAgIHZhciBuYW1lOwot ICAgIGlmIChwYXJzZWRVUkwuaXNWYWxpZCkgewotICAgICAgICBvcmlnaW4gPSBwYXJzZWRVUkwu c2NoZW1lICsgIjovLyIgKyBwYXJzZWRVUkwuaG9zdDsKLSAgICAgICAgaWYgKHBhcnNlZFVSTC5w b3J0KQotICAgICAgICAgICAgb3JpZ2luICs9ICI6IiArIHBhcnNlZFVSTC5wb3J0OwotICAgICAg ICBmb2xkZXJQYXRoID0gcGFyc2VkVVJMLmZvbGRlclBhdGhDb21wb25lbnRzOwotICAgICAgICBu YW1lID0gcGFyc2VkVVJMLmxhc3RQYXRoQ29tcG9uZW50OwotICAgICAgICBpZiAocGFyc2VkVVJM LnF1ZXJ5UGFyYW1zKQotICAgICAgICAgICAgbmFtZSArPSAiPyIgKyBwYXJzZWRVUkwucXVlcnlQ YXJhbXM7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgb3JpZ2luID0gIiI7Ci0gICAgICAgIGZvbGRl clBhdGggPSAiIjsKLSAgICAgICAgbmFtZSA9IHVybDsKLSAgICB9Ci0gICAgdmFyIHJlc3VsdCA9 IFtvcmlnaW5dOwotICAgIHZhciBzcGxpdHRlZFBhdGggPSBmb2xkZXJQYXRoLnNwbGl0KCIvIik7 Ci0gICAgZm9yICh2YXIgaSA9IDE7IGkgPCBzcGxpdHRlZFBhdGgubGVuZ3RoOyArK2kpCi0gICAg ICAgIHJlc3VsdC5wdXNoKHNwbGl0dGVkUGF0aFtpXSk7Ci0gICAgcmVzdWx0LnB1c2gobmFtZSk7 Ci0gICAgcmV0dXJuIHJlc3VsdDsKLX0KLQotLyoqCiAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+ fSBzcGxpdHRlZFVSTAogICogQHJldHVybiB7QXJyYXkuPHN0cmluZz59CiAgKi8KQEAgLTI4Miw3 ICsxODQsNyBAQCBXZWJJbnNwZWN0b3IuU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIucHJvdG90eXBl ID0gewogICAgICAqLwogICAgIF9pbm5lckFkZEZpbGVGb3JVUkw6IGZ1bmN0aW9uKHVybCwgY29u dGVudFByb3ZpZGVyLCBpc0VkaXRhYmxlLCBmb3JjZVVuaXF1ZSwgaXNDb250ZW50U2NyaXB0KQog ICAgIHsKLSAgICAgICAgdmFyIHNwbGl0dGVkVVJMID0gV2ViSW5zcGVjdG9yLlNpbXBsZVdvcmtz cGFjZVByb3ZpZGVyLnNwbGl0VVJMKHVybCk7CisgICAgICAgIHZhciBzcGxpdHRlZFVSTCA9IFdl Ykluc3BlY3Rvci5QYXJzZWRVUkwuc3BsaXRVUkwodXJsKTsKICAgICAgICAgdmFyIHByb2plY3RO YW1lID0gc3BsaXR0ZWRVUkxbMF07CiAgICAgICAgIHZhciBwYXRoID0gV2ViSW5zcGVjdG9yLlNp bXBsZVdvcmtzcGFjZVByb3ZpZGVyLnBhdGhGb3JTcGxpdHRlZFVSTChzcGxpdHRlZFVSTCk7CiAg ICAgICAgIHJldHVybiB0aGlzLl9pbm5lckFkZEZpbGUocHJvamVjdE5hbWUsIHBhdGgsIHVybCwg Y29udGVudFByb3ZpZGVyLCBpc0VkaXRhYmxlLCBmb3JjZVVuaXF1ZSwgaXNDb250ZW50U2NyaXB0 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0 LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRl eCA0OTlkZWU0YTYxMDUyMzcyNTk1OWZlNzc3NDE4ZDBmYTFkMDQ0ZDhlLi5mZjRiNTQ4ZDE4Yjlm MzEwZDM1MTBhODAyODEyMmVhMGNmMTkzMjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCkBAIC0yNSw2ICsyNSw3IEBACiAgICAgPGZpbGU+Q29u c29sZVBhbmVsLmpzPC9maWxlPgogICAgIDxmaWxlPkNvbnNvbGVWaWV3LmpzPC9maWxlPgogICAg IDxmaWxlPkNvbnRlbnRQcm92aWRlci5qczwvZmlsZT4KKyAgICA8ZmlsZT5Db250ZW50UHJvdmlk ZXJCYXNlZFByb2plY3REZWxlZ2F0ZS5qczwvZmlsZT4KICAgICA8ZmlsZT5Db250ZW50UHJvdmlk ZXJzLmpzPC9maWxlPgogICAgIDxmaWxlPkNvbnRleHRNZW51LmpzPC9maWxlPgogICAgIDxmaWxl PkNvb2tpZUl0ZW1zVmlldy5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKaW5kZXggNjYyY2JiNjdjYTliODAwYTliZGY0ZDMwY2Jk YmQ1N2RkNzJmMTQ0My4uNjRhYWY4MDRlNDU5MWIwZWU5M2YxMWU5Y2E0MWI2ODc0ZjUyMDI5NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2Uu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMK QEAgLTQ1MCw3ICs0NTAsNyBAQCBXZWJJbnNwZWN0b3IuV29ya3NwYWNlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdmFyIGVudHJ5ID0gdGhpcy5fZmlsZU1hcHBpbmcubWFwcGluZ0VudHJ5Rm9yVVJM KHVybCk7CiAgICAgICAgIHZhciBmaWxlU3lzdGVtUGF0aCA9IGVudHJ5ID8gdGhpcy5fZmlsZVN5 c3RlbVBhdGhGb3JFbnRyeShlbnRyeSkgOiBudWxsOwogICAgICAgICBpZiAoIWZpbGVTeXN0ZW1Q YXRoKSB7Ci0gICAgICAgICAgICB2YXIgc3BsaXR0ZWRVUkwgPSBXZWJJbnNwZWN0b3IuU2ltcGxl V29ya3NwYWNlUHJvdmlkZXIuc3BsaXRVUkwodXJsKTsKKyAgICAgICAgICAgIHZhciBzcGxpdHRl ZFVSTCA9IFdlYkluc3BlY3Rvci5QYXJzZWRVUkwuc3BsaXRVUkwodXJsKTsKICAgICAgICAgICAg IHZhciBwcm9qZWN0SWQgPSBXZWJJbnNwZWN0b3IuU2ltcGxlUHJvamVjdERlbGVnYXRlLnByb2pl Y3RJZChzcGxpdHRlZFVSTFswXSwgV2ViSW5zcGVjdG9yLnByb2plY3RUeXBlcy5OZXR3b3JrKTsK ICAgICAgICAgICAgIHZhciBwYXRoID0gV2ViSW5zcGVjdG9yLlNpbXBsZVdvcmtzcGFjZVByb3Zp ZGVyLnBhdGhGb3JTcGxpdHRlZFVSTChzcGxpdHRlZFVSTCk7CiAgICAgICAgICAgICB2YXIgcHJv amVjdCA9IHRoaXMucHJvamVjdChwcm9qZWN0SWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggMzA1MWE4MjllYTBkZTI2ZGJh ZjJlNDM4MDMyOTM5OGM0NGEyZjBkYi4uZDljZTk4YmJjZDYyYjA4YmJhYWFkNTAxNjE4ZjZmM2Mz YmU4YmNlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5odG1sCkBAIC0xNDYsNiArMTQ2LDcgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJJc29sYXRlZEZpbGVTeXN0ZW1NYW5hZ2VyLmpzIj48 L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJGaWxlTWFw cGluZy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNy Yz0iV29ya3NwYWNlLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNj cmlwdCIgc3JjPSJDb250ZW50UHJvdmlkZXJCYXNlZFByb2plY3REZWxlZ2F0ZS5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2ltcGxlV29ya3Nw YWNlUHJvdmlkZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9IkJyZWFrcG9pbnRNYW5hZ2VyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJDb250ZW50UHJvdmlkZXJzLmpzIj48L3NjcmlwdD4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc2NyaXB0c1Bh bmVsLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc2NyaXB0c1BhbmVs LmNzcwppbmRleCA2ZjNkZjU2MTI4MmU2ZWYxNzRlOWM0NWVjOWMyZDJlYTI3YjA4MDU0Li40YWM5 OTJkZWU3NmY1ZWJiZGUxOGEzYzNiOWU4OGY3NGM0M2VkOTljIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NjcmlwdHNQYW5lbC5jc3MKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zY3JpcHRzUGFuZWwuY3NzCkBAIC0zMjYsMyAr MzI2LDcgQEAgYS53b3JrZXItaXRlbSB7CiBhLndvcmtlci1pdGVtOmhvdmVyIHsKICAgICBjb2xv cjogcmdiKDE1JSwgMTUlLCAxNSUpOwogfQorCisuc291cmNlLWZyYW1lLWRlYnVnZ2VyLXNjcmlw dCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAxOTQsIDAuNSk7Cit9CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggNzE5ZmU4ZTU1ZWFlNmQwOTY4M2YwNDQwMWI5OTNhMmE1NjZlNWNmNC4uMzVhMDRlNmQ0 MzVmZGM0ZDQwMGZiZTYwZDAyYWNiZWVlNDRkZmE5ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisy MDEzLTAzLTE4ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IERlYnVnZ2VyIHNjcmlwdHMgc2hvdWxkIHZpc3VhbGx5IGRpZmZl ciBmcm9tIG5ldHdvcmsvZmlsZXN5c3RlbSBmaWxlcyBpbiB3b3Jrc3BhY2UuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI1NTIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dl ci9saXZlLWVkaXQtYnJlYWtwb2ludHMtZXhwZWN0ZWQudHh0OgorCiAyMDEzLTAzLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1hcmsgc29tZSBt b3JlIHRlc3RzIGFzIGZsYWtleSwgb3IgYXNzZXJ0aW5nIGluIGRlYnVnLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUtZWRpdC1icmVha3BvaW50cy1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1lZGl0LWJyZWFr cG9pbnRzLWV4cGVjdGVkLnR4dAppbmRleCBhZTFlNjk3YzNkMzI4MjEwY2Y4ZDJiYWM2OGE3MTQy ODUwNGU2MjA1Li44M2QzY2Y0OTA4ZDYwY2IyYWRmNTQzNzMwYTNiZWE1ZjUwYTdlYTUxIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1lZGl0LWJyZWFrcG9p bnRzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2 ZS1lZGl0LWJyZWFrcG9pbnRzLWV4cGVjdGVkLnR4dApAQCAtMTcsNyArMTcsNyBAQCBFZGl0aW5n IHNvdXJjZToKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgc3RvcmFnZQogICAgICAgICBlZGl0LW1l LWJyZWFrcG9pbnRzLmpzOjIsIGVuYWJsZWQ6dHJ1ZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBs b2NhdGlvbnMKLSAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5lTnVtYmVy OiAyLCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1Z2dlcjpmaWxlOi8v CisgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJv amVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDogZGVidWdnZXI6CiBVbmRvaW5nIHNvdXJj ZSBlZGl0aW5nOgogICAgIE9yaWdpbmFsVGV4dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVO dW1iZXIgPSAyKQogICAgIFRleHRFZGl0b3IucmVtb3ZlQnJlYWtwb2ludChsaW5lTnVtYmVyID0g MikKQEAgLTQ2LDcgKzQ2LDcgQEAgRWRpdGluZyBzb3VyY2U6CiAgICAgRHVtcGluZyBicmVha3Bv aW50IHN0b3JhZ2UKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRy dWUKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCi0gICAgICAgIHVybDogZWRpdC1t ZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwg cHJvamVjdCBpZDogZGVidWdnZXI6ZmlsZTovLworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtw b2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2plY3Qg aWQ6IGRlYnVnZ2VyOgogQ29tbWl0dGluZyBlZGl0ZWQgc291cmNlOgogICAgIE9yaWdpbmFsVGV4 dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAyKQogICAgIFRleHRFZGl0b3Iu cmVtb3ZlQnJlYWtwb2ludChsaW5lTnVtYmVyID0gMikKQEAgLTc1LDE3ICs3NSwxNyBAQCBFZGl0 aW5nIHNvdXJjZToKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgc3RvcmFnZQogICAgICAgICBlZGl0 LW1lLWJyZWFrcG9pbnRzLmpzOjIsIGVuYWJsZWQ6dHJ1ZQogICAgIER1bXBpbmcgYnJlYWtwb2lu dCBsb2NhdGlvbnMKLSAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5lTnVt YmVyOiAyLCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1Z2dlcjpmaWxl Oi8vCisgICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwg cHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDogZGVidWdnZXI6CiBDb21taXR0aW5n IGVkaXRlZCBzb3VyY2U6CiAgICAgRHVtcGluZyBicmVha3BvaW50IHN0b3JhZ2UKICAgICAgICAg ZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAgICBEdW1waW5nIGJyZWFr cG9pbnQgbG9jYXRpb25zCi0gICAgICAgIHVybDogZWRpdC1tZS1icmVha3BvaW50cy5qcywgbGlu ZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVjdCBpZDogZGVidWdnZXI6 ZmlsZTovLworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6 IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2plY3QgaWQ6IGRlYnVnZ2VyOgogRWRpdGlu ZyBzb3VyY2UgYWdhaW4gc28gdGhhdCBsaXZlIGVkaXQgY291bGQgc3VjY2VlZDoKICAgICBEdW1w aW5nIGJyZWFrcG9pbnQgc3RvcmFnZQogICAgICAgICBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzOjIs IGVuYWJsZWQ6dHJ1ZQogICAgIER1bXBpbmcgYnJlYWtwb2ludCBsb2NhdGlvbnMKLSAgICAgICAg dXJsOiBlZGl0LW1lLWJyZWFrcG9pbnRzLmpzLCBsaW5lTnVtYmVyOiAyLCBwcm9qZWN0IHR5cGU6 IGRlYnVnZ2VyLCBwcm9qZWN0IGlkOiBkZWJ1Z2dlcjpmaWxlOi8vCisgICAgICAgIHVybDogZWRp dC1tZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dl ciwgcHJvamVjdCBpZDogZGVidWdnZXI6CiBDb21taXR0aW5nIGVkaXRlZCBzb3VyY2UgYWdhaW46 CiAgICAgT3JpZ2luYWxUZXh0RWRpdG9yLnJlbW92ZUJyZWFrcG9pbnQobGluZU51bWJlciA9IDIp CiAgICAgVGV4dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAyKQpAQCAtMTE0 LDE3ICsxMTQsMTcgQEAgRWRpdGluZyBzb3VyY2U6CiAgICAgRHVtcGluZyBicmVha3BvaW50IHN0 b3JhZ2UKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRydWUKICAg ICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCi0gICAgICAgIHVybDogZWRpdC1tZS1icmVh a3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwgcHJvamVj dCBpZDogZGVidWdnZXI6ZmlsZTovLworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtwb2ludHMu anMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2plY3QgaWQ6IGRl YnVnZ2VyOgogQ29tbWl0dGluZyBlZGl0ZWQgc291cmNlOgogICAgIER1bXBpbmcgYnJlYWtwb2lu dCBzdG9yYWdlCiAgICAgICAgIGVkaXQtbWUtYnJlYWtwb2ludHMuanM6MiwgZW5hYmxlZDp0cnVl CiAgICAgRHVtcGluZyBicmVha3BvaW50IGxvY2F0aW9ucwotICAgICAgICB1cmw6IGVkaXQtbWUt YnJlYWtwb2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHBy b2plY3QgaWQ6IGRlYnVnZ2VyOmZpbGU6Ly8KKyAgICAgICAgdXJsOiBlZGl0LW1lLWJyZWFrcG9p bnRzLmpzLCBsaW5lTnVtYmVyOiAyLCBwcm9qZWN0IHR5cGU6IGRlYnVnZ2VyLCBwcm9qZWN0IGlk OiBkZWJ1Z2dlcjoKIFVuZG9pbmcgc291cmNlIGVkaXRpbmc6CiAgICAgRHVtcGluZyBicmVha3Bv aW50IHN0b3JhZ2UKICAgICAgICAgZWRpdC1tZS1icmVha3BvaW50cy5qczoyLCBlbmFibGVkOnRy dWUKICAgICBEdW1waW5nIGJyZWFrcG9pbnQgbG9jYXRpb25zCi0gICAgICAgIHVybDogZWRpdC1t ZS1icmVha3BvaW50cy5qcywgbGluZU51bWJlcjogMiwgcHJvamVjdCB0eXBlOiBkZWJ1Z2dlciwg cHJvamVjdCBpZDogZGVidWdnZXI6ZmlsZTovLworICAgICAgICB1cmw6IGVkaXQtbWUtYnJlYWtw b2ludHMuanMsIGxpbmVOdW1iZXI6IDIsIHByb2plY3QgdHlwZTogZGVidWdnZXIsIHByb2plY3Qg aWQ6IGRlYnVnZ2VyOgogQ29tbWl0dGluZyBlZGl0ZWQgc291cmNlIGFnYWluOgogICAgIE9yaWdp bmFsVGV4dEVkaXRvci5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIgPSAyKQogICAgIFRleHRF ZGl0b3IucmVtb3ZlQnJlYWtwb2ludChsaW5lTnVtYmVyID0gMikK