90518 2012-07-03 23:57:36 -0700 Web Inspector: Add OtherText resourceType and text/plain tokenizer 2012-07-09 02:06:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 68203 90529 90592 0 tzik tzik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 662692 0 tzik 2012-07-03 23:57:36 -0700 Inspector in ToT has tokenizer for HTML, CSS and JS now, and TextEditorHighlighter uses HTML tokenizer as default. But, I'd like to show a preview for other text file as plain text. IMO, a possible solution is adding OtherText as another ResourceType and using SourceTokenizer as tokenizer for "text/plain". 662693 1 150721 tzik 2012-07-03 23:59:14 -0700 Created attachment 150721 Patch 662695 2 150722 tzik 2012-07-04 00:06:05 -0700 Created attachment 150722 Patch 663712 3 150722 vsevik 2012-07-05 13:46:41 -0700 Comment on attachment 150722 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150722&action=review > Source/WebCore/ChangeLog:3 > + Web Inspector: Add OtherText resource type and text/plain tokenizer I don't think we should add another resource type for this. Resource type are essentially duplicating CachedResource types and we don't want to extend this list. You should use Other instead. Backend could decide whether file has text content or not based on the mime type. Binary content should be served to frontend base64 encoded. (We already have some text detecting heuristics in NetworkResourcesData: http://code.google.com/p/chromium/source/search?q=file%3Ainspector+%22.mimetype+%3D+%22&origq=file%3Ainspector+%22.mimetype+%3D+%22&btnG=Search+Trunk ) Frontend can then show content as text if it is not base64 encoded. 663874 4 pfeldman 2012-07-05 21:32:23 -0700 As per comment #3. 664744 5 150722 tzik 2012-07-09 02:06:26 -0700 Comment on attachment 150722 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150722&action=review >> Source/WebCore/ChangeLog:3 >> + Web Inspector: Add OtherText resource type and text/plain tokenizer > > I don't think we should add another resource type for this. Resource type are essentially duplicating CachedResource types and we don't want to extend this list. > You should use Other instead. > Backend could decide whether file has text content or not based on the mime type. Binary content should be served to frontend base64 encoded. > (We already have some text detecting heuristics in NetworkResourcesData: http://code.google.com/p/chromium/source/search?q=file%3Ainspector+%22.mimetype+%3D+%22&origq=file%3Ainspector+%22.mimetype+%3D+%22&btnG=Search+Trunk ) > Frontend can then show content as text if it is not base64 encoded. I see. OK, I'll go other way than adding OtherText. As back-end side of NetworkResourcesData does, DOMImplementation::is{Text,XML}MIMEType seems to work for detecting text file. 150721 2012-07-03 23:59:14 -0700 2012-07-04 00:06:00 -0700 Patch bug-90518-20120704155913.patch text/plain 8535 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTgyNzc5ZGVkMGEzNWZk ODcxN2M0NzkyNDk3ZDYyZGEzMjFkNzg3NC4uYWUyNWVkZDQ1OTRmZTdjMDBkODliMjJjODE4Yjlj MTEzNmQxODc4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA3LTAzICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgT3RoZXJUZXh0IHJlc291cmNlIHR5cGUgYW5kIHRleHQvcGxhaW4gdG9rZW5pemVyCisKKyAg ICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BTISkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMu IChPT1BTISkKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpyZXNvdXJjZVR5cGVKc29uKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZUltcGwucHJvdG90eXBlLnRvU3RyaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdv cmtEaXNwYXRjaGVyLnByb3RvdHlwZS5fbWltZVR5cGVJc0NvbnNpc3RlbnRXaXRoVHlwZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0UHJldmlld1ZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVxdWVzdFByZXZpZXdWaWV3LnByb3RvdHlwZS5fY3JlYXRlUHJl dmlld1ZpZXcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUeXBlLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZS5wcm90b3R5cGUuY2Fub25pY2Fs TWltZVR5cGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVG9rZW5pemVy LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZVRva2VuaXplci5wcm90b3R5cGUuY3Jl YXRlSW5pdGlhbENvbmRpdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVG9rZW5p emVyLnByb3RvdHlwZS5uZXh0VG9rZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZVRv a2VuaXplci5SZWdpc3RyeSk6CisKIDIwMTItMDctMDMgIEVyaWsgQXJ2aWRzc29uICA8YXJ2QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIFJlbW92ZSBlbmFibGVGYXN0ZXJET01TdG9yZUFj Y2VzcyB3aGljaCBpcyBuZXZlciB1c2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb24KaW5kZXggNTk3OTdhYmY4MWNlNGYzYjE5YWFlZThhMDMxNTdiMWNlNDZmZjY2Ni4uY2Nk MjNkYTAxMzVkY2U0ZTllMjU2YjY2ZTA4ZDZiYzllOWRmZWNjMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTIxLDcgKzEyMSw3IEBACiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgImlkIjogIlJlc291cmNlVHlwZSIsCiAgICAgICAgICAgICAgICAg InR5cGUiOiAic3RyaW5nIiwKLSAgICAgICAgICAgICAgICAiZW51bSI6IFsiRG9jdW1lbnQiLCAi U3R5bGVzaGVldCIsICJJbWFnZSIsICJGb250IiwgIlNjcmlwdCIsICJYSFIiLCAiV2ViU29ja2V0 IiwgIk90aGVyIl0sCisgICAgICAgICAgICAgICAgImVudW0iOiBbIkRvY3VtZW50IiwgIlN0eWxl c2hlZXQiLCAiSW1hZ2UiLCAiRm9udCIsICJTY3JpcHQiLCAiWEhSIiwgIldlYlNvY2tldCIsICJP dGhlclRleHQiLCAiT3RoZXIiXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmVz b3VyY2UgdHlwZSBhcyBpdCB3YXMgcGVyY2VpdmVkIGJ5IHRoZSByZW5kZXJpbmcgZW5naW5lLiIK ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCmluZGV4IDg5MDExNzQ2Yjc0 NWNiOTYyYmM3ODU0ZmJhMzkxN2ZkMjI0M2ZhZGMuLjQ1YTVjZWRmYjZmZWI5MDBjNjFiMWU0MDAw YjI4NjBmODE4NzJmMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCkBAIC0xMDQsNiArMTA0LDExIEBAIHR5cGVkZWYg SW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50OjpGcm9udGVuZFByb3ZpZGVyIEZyb250ZW5kUHJvdmlk ZXI7CiAKIG5hbWVzcGFjZSB7CiAKK2Jvb2wgaXNUZXh0VHlwZShjb25zdCBTdHJpbmcmIG1pbWVU eXBlKQoreworICAgIHJldHVybiBtaW1lVHlwZS5zdGFydHNXaXRoKCJ0ZXh0LyIpIHx8IG1pbWVU eXBlLmVuZHNXaXRoKCIreG1sIikgfHwgbWltZVR5cGUuZW5kc1dpdGgoIi9qYXZhc2NyaXB0Iik7 Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIEJhc2VDYWxsYmFjaywgdHlwZW5hbWUgSGFuZGxlciwg dHlwZW5hbWUgQXJndW1lbnQ+CiBjbGFzcyBDYWxsYmFja0Rpc3BhdGNoZXIgOiBwdWJsaWMgQmFz ZUNhbGxiYWNrIHsKIHB1YmxpYzoKQEAgLTMxMyw2ICszMTgsOCBAQCBib29sIFJlYWREaXJlY3Rv cnlUYXNrOjpkaWRSZWFkRGlyZWN0b3J5RW50cmllcyhFbnRyeUFycmF5KiBlbnRyaWVzKQogICAg ICAgICAgICAgICAgIHJlc291cmNlVHlwZSA9IFJlc291cmNlVHlwZTo6U2NyaXB0OwogICAgICAg ICAgICAgZWxzZSBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWROb25JbWFnZU1JTUVU eXBlKG1pbWVUeXBlKSkKICAgICAgICAgICAgICAgICByZXNvdXJjZVR5cGUgPSBSZXNvdXJjZVR5 cGU6OkRvY3VtZW50OworICAgICAgICAgICAgZWxzZSBpZiAoaXNUZXh0VHlwZShtaW1lVHlwZSkp CisgICAgICAgICAgICAgICAgcmVzb3VyY2VUeXBlID0gUmVzb3VyY2VUeXBlOjpPdGhlclRleHQ7 CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgcmVzb3VyY2VUeXBlID0gUmVzb3Vy Y2VUeXBlOjpPdGhlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UGFnZUFnZW50LmNwcAppbmRleCA0ZTA2YTQzNmI1YzY3MTRiYTBhMzI4NjkyNmEzNmY5YzVhZjNh MmE4Li4yYWU3OGEyZmM2NmIyNjA5NzhkNjU4YTY5ZDNlZTYzNTYzNDUxMmRmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApAQCAtMjc0LDYg KzI3NCw4IEBAIFR5cGVCdWlsZGVyOjpQYWdlOjpSZXNvdXJjZVR5cGU6OkVudW0gSW5zcGVjdG9y UGFnZUFnZW50OjpyZXNvdXJjZVR5cGVKc29uKEluc3BlCiAgICAgICAgIHJldHVybiBUeXBlQnVp bGRlcjo6UGFnZTo6UmVzb3VyY2VUeXBlOjpYSFI7CiAgICAgY2FzZSBXZWJTb2NrZXRSZXNvdXJj ZToKICAgICAgICAgcmV0dXJuIFR5cGVCdWlsZGVyOjpQYWdlOjpSZXNvdXJjZVR5cGU6OldlYlNv Y2tldDsKKyAgICBjYXNlIE90aGVyVGV4dFJlc291cmNlOgorICAgICAgICByZXR1cm4gVHlwZUJ1 aWxkZXI6OlBhZ2U6OlJlc291cmNlVHlwZTo6T3RoZXJUZXh0OwogICAgIGNhc2UgT3RoZXJSZXNv dXJjZToKICAgICAgICAgcmV0dXJuIFR5cGVCdWlsZGVyOjpQYWdlOjpSZXNvdXJjZVR5cGU6Ok90 aGVyOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdl bnQuaAppbmRleCA5NjRiYzg1ZmM2MzY0OGFmMzhmMmRjMTJmYzgzZjc5NzFiOTNhNjYzLi4yODk2 YjcyMzc0M2FlZTgyMDE5YWUwOWM1MjNlNmE0OTBlMmYyY2U2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCkBAIC03NCw2ICs3NCw3IEBAIHB1Ymxp YzoKICAgICAgICAgU2NyaXB0UmVzb3VyY2UsCiAgICAgICAgIFhIUlJlc291cmNlLAogICAgICAg ICBXZWJTb2NrZXRSZXNvdXJjZSwKKyAgICAgICAgT3RoZXJUZXh0UmVzb3VyY2UsCiAgICAgICAg IE90aGVyUmVzb3VyY2UKICAgICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCBmZDZmNjFjMGMzZjE2YWYzOGZl ZmFjMzUzODg0OGMzMjBjMDAxZjQ3Li45ODIzNmI1ZDE1YTRkMWJmN2I3NTI1NTNkMTE3NWE1N2Zi MzY4NDczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya01hbmFnZXIuanMKQEAgLTIzNyw2ICsyMzcsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29y a0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAg ICAgICAgaWYgKHR5cGVvZiBuZXR3b3JrUmVxdWVzdC50eXBlID09PSAidW5kZWZpbmVkIgorICAg ICAgICAgICAgfHwgbmV0d29ya1JlcXVlc3QudHlwZSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNl VHlwZXMuT3RoZXJUZXh0CiAgICAgICAgICAgICB8fCBuZXR3b3JrUmVxdWVzdC50eXBlID09PSBX ZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5PdGhlcgogICAgICAgICAgICAgfHwgbmV0d29ya1Jl cXVlc3QudHlwZSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuWEhSCiAgICAgICAgICAg ICB8fCBuZXR3b3JrUmVxdWVzdC50eXBlID09PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5X ZWJTb2NrZXQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1JlcXVlc3RQcmV2aWV3Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUmVxdWVzdFByZXZpZXdWaWV3LmpzCmluZGV4IDRiZjNhMjRkNDQ4M2QwM2UxOWIxMzFjYjFj NjEyM2M2NjI0ZTI0YzIuLmFkMzhmYTQ4NDJjMjMzM2VlMzVkMmQ2M2QxNzI2NzUyMzc2MjY3NTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVxdWVzdFBy ZXZpZXdWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVx dWVzdFByZXZpZXdWaWV3LmpzCkBAIC04Niw3ICs4Niw3IEBAIFdlYkluc3BlY3Rvci5SZXF1ZXN0 UHJldmlld1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fcmVzcG9uc2VWaWV3 LnNvdXJjZVZpZXcpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fcmVzcG9uc2VWaWV3LnNvdXJj ZVZpZXc7CiAKLSAgICAgICAgaWYgKHRoaXMucmVxdWVzdC50eXBlID09PSBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VUeXBlcy5PdGhlcikKKyAgICAgICAgaWYgKHRoaXMucmVxdWVzdC50eXBlID09PSBX ZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5PdGhlclRleHQgfHwgdGhpcy5yZXF1ZXN0LnR5cGUg PT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLk90aGVyKQogICAgICAgICAgICAgcmV0dXJu IHRoaXMuX2NyZWF0ZUVtcHR5VmlldygpOwogCiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3Iu UmVxdWVzdFZpZXcubm9uU291cmNlVmlld0ZvclJlcXVlc3QodGhpcy5yZXF1ZXN0KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUeXBlLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMKaW5k ZXggMmY4OGE2YmJiYjU2ZGFjZGQxYzBkNzQ2YzFmOGEwNGQ0NWE2Y2Q1Yy4uNTExYzg1MmZhOWM5 NzE4OTYwYmFmY2Y4YjExMTA0ZGFhMGVhY2JkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMKQEAgLTEwNCw2ICsxMDQsOCBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVy biAidGV4dC9qYXZhc2NyaXB0IjsKICAgICAgICAgaWYgKHRoaXMgPT09IFdlYkluc3BlY3Rvci5y ZXNvdXJjZVR5cGVzLlN0eWxlc2hlZXQpCiAgICAgICAgICAgICByZXR1cm4gInRleHQvY3NzIjsK KyAgICAgICAgaWYgKHRoaXMgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLk90aGVyVGV4 dCkKKyAgICAgICAgICAgIHJldHVybiAidGV4dC9wbGFpbiI7CiAgICAgICAgIHJldHVybiAiIjsK ICAgICB9CiB9CkBAIC0xMTcsNSArMTE5LDYgQEAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMg PSB7CiAgICAgWEhSOiBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZSgieGhyIiwgIlhIUiIs ICJYSFIiLCAicmdiKDIzMSwyMzEsMTApIiwgdHJ1ZSksCiAgICAgRm9udDogbmV3IFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVR5cGUoImZvbnQiLCAiRm9udCIsICJGb250cyIsICJyZ2IoMjU1LDgyLDYy KSIsIGZhbHNlKSwKICAgICBXZWJTb2NrZXQ6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBl KCJ3ZWJzb2NrZXQiLCAiV2ViU29ja2V0IiwgIldlYlNvY2tldHMiLCAicmdiKDE4NiwxODYsMTg2 KSIsIGZhbHNlKSwgLy8gRklYTUU6IERlY2lkZSB0aGUgY29sb3IuCisgICAgT3RoZXJUZXh0OiBu ZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZSgib3RoZXJ0ZXh0IiwgIk90aGVyVGV4dCIsICJP dGhlclRleHQiLCAicmdiKDE4NiwxODYsMTg2KSIsIHRydWUpLAogICAgIE90aGVyOiBuZXcgV2Vi SW5zcGVjdG9yLlJlc291cmNlVHlwZSgib3RoZXIiLCAiT3RoZXIiLCAiT3RoZXIiLCAicmdiKDE4 NiwxODYsMTg2KSIsIGZhbHNlKQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Tb3VyY2VUb2tlbml6ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZVRva2VuaXplci5qcwppbmRleCA3YThhNmFjZmJiMmI2MzgzMGU3 NTQyZTJkYTIzM2MxYzE1NTVjZWIzLi43MTkzNGE1YjFkODI2NzRiOGZjYzExZmNkZGZjMDVhOGU0 MTljNWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZVRva2VuaXplci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZVRva2VuaXplci5qcwpAQCAtNjgsMTAgKzY4LDEyIEBAIFdlYkluc3BlY3Rvci5Tb3Vy Y2VUb2tlbml6ZXIucHJvdG90eXBlID0gewogCiAgICAgY3JlYXRlSW5pdGlhbENvbmRpdGlvbjog ZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgcmV0dXJuIHt9OwogICAgIH0sCiAKICAgICBuZXh0 VG9rZW46IGZ1bmN0aW9uKGN1cnNvcikKICAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9saW5l Lmxlbmd0aDsKICAgICB9CiB9CiAKQEAgLTgzLDcgKzg1LDggQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZVRva2VuaXplci5SZWdpc3RyeSA9IGZ1bmN0aW9uKCkgewogICAgIHRoaXMuX3Rva2VuaXplckNv bnN0cnVjdG9ycyA9IHsKICAgICAgICAgInRleHQvY3NzIjogIlNvdXJjZUNTU1Rva2VuaXplciIs CiAgICAgICAgICJ0ZXh0L2h0bWwiOiAiU291cmNlSFRNTFRva2VuaXplciIsCi0gICAgICAgICJ0 ZXh0L2phdmFzY3JpcHQiOiAiU291cmNlSmF2YVNjcmlwdFRva2VuaXplciIKKyAgICAgICAgInRl eHQvamF2YXNjcmlwdCI6ICJTb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyIiwKKyAgICAgICAgInRl eHQvcGxhaW4iOiAiU291cmNlVG9rZW5pemVyIgogICAgIH07CiB9CiAK 150722 2012-07-04 00:06:05 -0700 2012-07-09 02:06:26 -0700 Patch bug-90518-20120704160604.patch text/plain 8501 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTgyNzc5ZGVkMGEzNWZk ODcxN2M0NzkyNDk3ZDYyZGEzMjFkNzg3NC4uZTdmZjRiZTY2ZWRiMWUyOTczMTM1ZTk0NjA0Zjdl MzNjMzcyYTcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTAzICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgT3RoZXJUZXh0IHJlc291cmNlIHR5cGUgYW5kIHRleHQvcGxhaW4gdG9rZW5pemVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDUxOAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv clBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnJl c291cmNlVHlwZUpzb24pOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu aDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUudG9TdHJpbmcp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLl9taW1lVHlwZUlz Q29uc2lzdGVudFdpdGhUeXBlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1JlcXVl c3RQcmV2aWV3Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXF1ZXN0UHJldmlld1Zp ZXcucHJvdG90eXBlLl9jcmVhdGVQcmV2aWV3Vmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVR5cGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VU eXBlLnByb3RvdHlwZS5jYW5vbmljYWxNaW1lVHlwZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Tb3VyY2VUb2tlbml6ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNl VG9rZW5pemVyLnByb3RvdHlwZS5jcmVhdGVJbml0aWFsQ29uZGl0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VUb2tlbml6ZXIucHJvdG90eXBlLm5leHRUb2tlbik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlVG9rZW5pemVyLlJlZ2lzdHJ5KToKKwogMjAxMi0wNy0wMyAg RXJpayBBcnZpZHNzb24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtWOF0gUmVtb3Zl IGVuYWJsZUZhc3RlckRPTVN0b3JlQWNjZXNzIHdoaWNoIGlzIG5ldmVyIHVzZWQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA1OTc5N2FiZjgxY2U0ZjNiMTlhYWVl OGEwMzE1N2IxY2U0NmZmNjY2Li5jY2QyM2RhMDEzNWRjZTRlOWUyNTZiNjZlMDhkNmJjOWU5ZGZl Y2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xMjEsNyAr MTIxLDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAiaWQiOiAiUmVzb3VyY2VU eXBlIiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJzdHJpbmciLAotICAgICAgICAgICAgICAg ICJlbnVtIjogWyJEb2N1bWVudCIsICJTdHlsZXNoZWV0IiwgIkltYWdlIiwgIkZvbnQiLCAiU2Ny aXB0IiwgIlhIUiIsICJXZWJTb2NrZXQiLCAiT3RoZXIiXSwKKyAgICAgICAgICAgICAgICAiZW51 bSI6IFsiRG9jdW1lbnQiLCAiU3R5bGVzaGVldCIsICJJbWFnZSIsICJGb250IiwgIlNjcmlwdCIs ICJYSFIiLCAiV2ViU29ja2V0IiwgIk90aGVyVGV4dCIsICJPdGhlciJdLAogICAgICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJSZXNvdXJjZSB0eXBlIGFzIGl0IHdhcyBwZXJjZWl2ZWQgYnkg dGhlIHJlbmRlcmluZyBlbmdpbmUuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2Vu dC5jcHAKaW5kZXggODkwMTE3NDZiNzQ1Y2I5NjJiYzc4NTRmYmEzOTE3ZmQyMjQzZmFkYy4uNDVh NWNlZGZiNmZlYjkwMGM2MWIxZTQwMDBiMjg2MGY4MTg3MmYwNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZpbGVTeXN0ZW1BZ2VudC5jcHAKQEAgLTEw NCw2ICsxMDQsMTEgQEAgdHlwZWRlZiBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OkZyb250ZW5k UHJvdmlkZXIgRnJvbnRlbmRQcm92aWRlcjsKIAogbmFtZXNwYWNlIHsKIAorYm9vbCBpc1RleHRU eXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCit7CisgICAgcmV0dXJuIG1pbWVUeXBlLnN0YXJ0 c1dpdGgoInRleHQvIikgfHwgbWltZVR5cGUuZW5kc1dpdGgoIit4bWwiKSB8fCBtaW1lVHlwZS5l bmRzV2l0aCgiL2phdmFzY3JpcHQiKTsKK30KKwogdGVtcGxhdGU8dHlwZW5hbWUgQmFzZUNhbGxi YWNrLCB0eXBlbmFtZSBIYW5kbGVyLCB0eXBlbmFtZSBBcmd1bWVudD4KIGNsYXNzIENhbGxiYWNr RGlzcGF0Y2hlciA6IHB1YmxpYyBCYXNlQ2FsbGJhY2sgewogcHVibGljOgpAQCAtMzEzLDYgKzMx OCw4IEBAIGJvb2wgUmVhZERpcmVjdG9yeVRhc2s6OmRpZFJlYWREaXJlY3RvcnlFbnRyaWVzKEVu dHJ5QXJyYXkqIGVudHJpZXMpCiAgICAgICAgICAgICAgICAgcmVzb3VyY2VUeXBlID0gUmVzb3Vy Y2VUeXBlOjpTY3JpcHQ7CiAgICAgICAgICAgICBlbHNlIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojpp c1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUobWltZVR5cGUpKQogICAgICAgICAgICAgICAgIHJl c291cmNlVHlwZSA9IFJlc291cmNlVHlwZTo6RG9jdW1lbnQ7CisgICAgICAgICAgICBlbHNlIGlm IChpc1RleHRUeXBlKG1pbWVUeXBlKSkKKyAgICAgICAgICAgICAgICByZXNvdXJjZVR5cGUgPSBS ZXNvdXJjZVR5cGU6Ok90aGVyVGV4dDsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICByZXNvdXJjZVR5cGUgPSBSZXNvdXJjZVR5cGU6Ok90aGVyOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IDRlMDZhNDM2YjVjNjcx NGJhMGEzMjg2OTI2YTM2ZjljNWFmM2EyYTguLjJhZTc4YTJmYzY2YjI2MDk3OGQ2NThhNjlkM2Vl NjM1NjM0NTEyZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQ YWdlQWdlbnQuY3BwCkBAIC0yNzQsNiArMjc0LDggQEAgVHlwZUJ1aWxkZXI6OlBhZ2U6OlJlc291 cmNlVHlwZTo6RW51bSBJbnNwZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNlVHlwZUpzb24oSW5zcGUK ICAgICAgICAgcmV0dXJuIFR5cGVCdWlsZGVyOjpQYWdlOjpSZXNvdXJjZVR5cGU6OlhIUjsKICAg ICBjYXNlIFdlYlNvY2tldFJlc291cmNlOgogICAgICAgICByZXR1cm4gVHlwZUJ1aWxkZXI6OlBh Z2U6OlJlc291cmNlVHlwZTo6V2ViU29ja2V0OworICAgIGNhc2UgT3RoZXJUZXh0UmVzb3VyY2U6 CisgICAgICAgIHJldHVybiBUeXBlQnVpbGRlcjo6UGFnZTo6UmVzb3VyY2VUeXBlOjpPdGhlclRl eHQ7CiAgICAgY2FzZSBPdGhlclJlc291cmNlOgogICAgICAgICByZXR1cm4gVHlwZUJ1aWxkZXI6 OlBhZ2U6OlJlc291cmNlVHlwZTo6T3RoZXI7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCmluZGV4IDk2NGJjODVmYzYzNjQ4YWYzOGYyZGMx MmZjODNmNzk3MWI5M2E2NjMuLjI4OTZiNzIzNzQzYWVlODIwMTlhZTA5YzUyM2U2YTQ5MGUyZjJj ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdl bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgK QEAgLTc0LDYgKzc0LDcgQEAgcHVibGljOgogICAgICAgICBTY3JpcHRSZXNvdXJjZSwKICAgICAg ICAgWEhSUmVzb3VyY2UsCiAgICAgICAgIFdlYlNvY2tldFJlc291cmNlLAorICAgICAgICBPdGhl clRleHRSZXNvdXJjZSwKICAgICAgICAgT3RoZXJSZXNvdXJjZQogICAgIH07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmlu ZGV4IGZkNmY2MWMwYzNmMTZhZjM4ZmVmYWMzNTM4ODQ4YzMyMGMwMDFmNDcuLjk4MjM2YjVkMTVh NGQxYmY3Yjc1MjU1M2QxMTc1YTU3ZmIzNjg0NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAtMjM3LDYgKzIzNyw3 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAgICBpZiAodHlwZW9mIG5ldHdvcmtSZXF1ZXN0LnR5 cGUgPT09ICJ1bmRlZmluZWQiCisgICAgICAgICAgICB8fCBuZXR3b3JrUmVxdWVzdC50eXBlID09 PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5PdGhlclRleHQKICAgICAgICAgICAgIHx8IG5l dHdvcmtSZXF1ZXN0LnR5cGUgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLk90aGVyCiAg ICAgICAgICAgICB8fCBuZXR3b3JrUmVxdWVzdC50eXBlID09PSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VUeXBlcy5YSFIKICAgICAgICAgICAgIHx8IG5ldHdvcmtSZXF1ZXN0LnR5cGUgPT09IFdlYklu c3BlY3Rvci5yZXNvdXJjZVR5cGVzLldlYlNvY2tldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVxdWVzdFByZXZpZXdWaWV3LmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0UHJldmlld1ZpZXcuanMKaW5kZXggNGJm M2EyNGQ0NDgzZDAzZTE5YjEzMWNiMWM2MTIzYzY2MjRlMjRjMi4uYWQzOGZhNDg0MmMyMzMzZWUz NWQyZDYzZDE3MjY3NTIzNzYyNjc1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXF1ZXN0UHJldmlld1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0UHJldmlld1ZpZXcuanMKQEAgLTg2LDcgKzg2LDcg QEAgV2ViSW5zcGVjdG9yLlJlcXVlc3RQcmV2aWV3Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAg IGlmICh0aGlzLl9yZXNwb25zZVZpZXcuc291cmNlVmlldykKICAgICAgICAgICAgIHJldHVybiB0 aGlzLl9yZXNwb25zZVZpZXcuc291cmNlVmlldzsKIAotICAgICAgICBpZiAodGhpcy5yZXF1ZXN0 LnR5cGUgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLk90aGVyKQorICAgICAgICBpZiAo dGhpcy5yZXF1ZXN0LnR5cGUgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLk90aGVyVGV4 dCB8fCB0aGlzLnJlcXVlc3QudHlwZSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuT3Ro ZXIpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fY3JlYXRlRW1wdHlWaWV3KCk7CiAKICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5SZXF1ZXN0Vmlldy5ub25Tb3VyY2VWaWV3Rm9yUmVxdWVz dCh0aGlzLnJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVR5cGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlVHlwZS5qcwppbmRleCAyZjg4YTZiYmJiNTZkYWNkZDFjMGQ3NDZjMWY4YTA0 ZDQ1YTZjZDVjLi41MTFjODUyZmE5Yzk3MTg5NjBiYWZjZjhiMTExMDRkYWEwZWFjYmQ5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHlwZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHlwZS5q cwpAQCAtMTA0LDYgKzEwNCw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVR5cGUucHJvdG90eXBl ID0gewogICAgICAgICAgICAgcmV0dXJuICJ0ZXh0L2phdmFzY3JpcHQiOwogICAgICAgICBpZiAo dGhpcyA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuU3R5bGVzaGVldCkKICAgICAgICAg ICAgIHJldHVybiAidGV4dC9jc3MiOworICAgICAgICBpZiAodGhpcyA9PT0gV2ViSW5zcGVjdG9y LnJlc291cmNlVHlwZXMuT3RoZXJUZXh0KQorICAgICAgICAgICAgcmV0dXJuICJ0ZXh0L3BsYWlu IjsKICAgICAgICAgcmV0dXJuICIiOwogICAgIH0KIH0KQEAgLTExNyw1ICsxMTksNiBAQCBXZWJJ bnNwZWN0b3IucmVzb3VyY2VUeXBlcyA9IHsKICAgICBYSFI6IG5ldyBXZWJJbnNwZWN0b3IuUmVz b3VyY2VUeXBlKCJ4aHIiLCAiWEhSIiwgIlhIUiIsICJyZ2IoMjMxLDIzMSwxMCkiLCB0cnVlKSwK ICAgICBGb250OiBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZSgiZm9udCIsICJGb250Iiwg IkZvbnRzIiwgInJnYigyNTUsODIsNjIpIiwgZmFsc2UpLAogICAgIFdlYlNvY2tldDogbmV3IFdl Ykluc3BlY3Rvci5SZXNvdXJjZVR5cGUoIndlYnNvY2tldCIsICJXZWJTb2NrZXQiLCAiV2ViU29j a2V0cyIsICJyZ2IoMTg2LDE4NiwxODYpIiwgZmFsc2UpLCAvLyBGSVhNRTogRGVjaWRlIHRoZSBj b2xvci4KKyAgICBPdGhlclRleHQ6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlKCJvdGhl cnRleHQiLCAiT3RoZXJUZXh0IiwgIk90aGVyVGV4dCIsICJyZ2IoMTg2LDE4NiwxODYpIiwgdHJ1 ZSksCiAgICAgT3RoZXI6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlKCJvdGhlciIsICJP dGhlciIsICJPdGhlciIsICJyZ2IoMTg2LDE4NiwxODYpIiwgZmFsc2UpCiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVRva2VuaXplci5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVG9rZW5pemVyLmpzCmlu ZGV4IDdhOGE2YWNmYmIyYjYzODMwZTc1NDJlMmRhMjMzYzFjMTU1NWNlYjMuLjcxOTM0YTViMWQ4 MjY3NGI4ZmNjMTFmY2RkZmMwNWE4ZTQxOWM1ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVG9rZW5pemVyLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVG9rZW5pemVyLmpzCkBAIC02OCwxMCArNjgs MTIgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVRva2VuaXplci5wcm90b3R5cGUgPSB7CiAKICAgICBj cmVhdGVJbml0aWFsQ29uZGl0aW9uOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICByZXR1cm4g e307CiAgICAgfSwKIAogICAgIG5leHRUb2tlbjogZnVuY3Rpb24oY3Vyc29yKQogICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX2xpbmUubGVuZ3RoOwogICAgIH0KIH0KIApAQCAtODMsNyArODUs OCBAQCBXZWJJbnNwZWN0b3IuU291cmNlVG9rZW5pemVyLlJlZ2lzdHJ5ID0gZnVuY3Rpb24oKSB7 CiAgICAgdGhpcy5fdG9rZW5pemVyQ29uc3RydWN0b3JzID0gewogICAgICAgICAidGV4dC9jc3Mi OiAiU291cmNlQ1NTVG9rZW5pemVyIiwKICAgICAgICAgInRleHQvaHRtbCI6ICJTb3VyY2VIVE1M VG9rZW5pemVyIiwKLSAgICAgICAgInRleHQvamF2YXNjcmlwdCI6ICJTb3VyY2VKYXZhU2NyaXB0 VG9rZW5pemVyIgorICAgICAgICAidGV4dC9qYXZhc2NyaXB0IjogIlNvdXJjZUphdmFTY3JpcHRU b2tlbml6ZXIiLAorICAgICAgICAidGV4dC9wbGFpbiI6ICJTb3VyY2VUb2tlbml6ZXIiCiAgICAg fTsKIH0KIAo=