71857 2011-11-08 14:31:36 -0800 MHTML always use Base64 encoding (instead of QuotedPrintable for text) 2011-11-09 15:14:21 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jcivelli jcivelli abarth japhet webkit.review.bot oldest_to_newest 498436 0 jcivelli 2011-11-08 14:31:36 -0800 When generating a MHTML archive and binary encoding is not used, all resources are encoded in Base64. Text resources should use QuotedPrintable instead. This bug was introduced in my previous change that added binary encoding support: https://bugs.webkit.org/show_bug.cgi?id=63310 498440 1 114156 jcivelli 2011-11-08 14:37:41 -0800 Created attachment 114156 Patch 498490 2 114156 abarth 2011-11-08 16:05:38 -0800 Comment on attachment 114156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114156&action=review Test? > Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp:181 > + const char* contentEncoding; Please initialize scalars. 499152 3 114317 jcivelli 2011-11-09 11:05:42 -0800 Created attachment 114317 Patch 499161 4 114318 jcivelli 2011-11-09 11:08:52 -0800 Created attachment 114318 Patch 499164 5 jcivelli 2011-11-09 11:10:10 -0800 (In reply to comment #2) > (From update of attachment 114156 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=114156&action=review > > Test? Added a Chromium unit-test (as this cannot be tested with a LayoutTest). > > Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp:181 > > + const char* contentEncoding; > > Please initialize scalars. Done. 499313 6 114318 abarth 2011-11-09 13:34:40 -0800 Comment on attachment 114318 Patch Thanks! 499392 7 114318 webkit.review.bot 2011-11-09 15:14:16 -0800 Comment on attachment 114318 Patch Clearing flags on attachment: 114318 Committed r99766: <http://trac.webkit.org/changeset/99766> 499393 8 webkit.review.bot 2011-11-09 15:14:21 -0800 All reviewed patches have been landed. Closing bug. 114156 2011-11-08 14:37:41 -0800 2011-11-09 11:05:39 -0800 Patch bug-71857-20111108143740.patch text/plain 1955 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYTFiZmUzNDYzNjdlNDkx YmNlNGFjMWMzN2EwYWVkOWE2ODAxN2I1Li40YTAzM2UzNTk3OWZmNWU0Yjc3M2MxNjZmMWZkM2I4 Mjg0ZjZjOWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMDggIEpheSBD aXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCBNSFRNTCBnZW5l cmF0aW9uIHRvIHVzZSB0aGUgUXVvdGVkUHJpbnRhYmxlIGVuY29kaW5nIGZvciB0ZXh0IHJlc291 cmNlcy4KKyAgICAgICAgVGhpcyB3YXMgcmVncmVzc2VkIHdoZW4gd2UgYWRkZWQgYmluYXJ5IGVu Y29kaW5nIHN1cHBvcnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03MTg1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1IVE1MQXJjaGl2ZTo6Z2VuZXJhdGVNSFRNTERhdGEpOgorCiAyMDExLTExLTA4 ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBTcGVjdWxhdGl2ZSBm aXggZm9yIGNyYXNoZXMgc2VlbiBpbiBEb2N1bWVudFdyaXRlcjo6ZGVwcmVjYXRlZEZyYW1lRW5j b2RpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01I VE1MQXJjaGl2ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRN TEFyY2hpdmUuY3BwCmluZGV4IDI5M2M5MjcxMTY0MmVkOWI3ODc1YzkyMTM4MTNkNWFkMDVkN2Jl NDcuLmNhY2YwZDBkNjk5NjUwMDM2NDI0NzhmZGUzNTU3MTI5MzEzM2Q0MGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcApA QCAtMTc4LDcgKzE3OCwxNCBAQCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gTUhUTUxBcmNoaXZl OjpnZW5lcmF0ZU1IVE1MRGF0YShQYWdlKiBwYWdlLCBib29sIHVzZUJpbgogICAgICAgICBzdHJp bmdCdWlsZGVyLmFwcGVuZCgiQ29udGVudC1UeXBlOiAiKTsKICAgICAgICAgc3RyaW5nQnVpbGRl ci5hcHBlbmQocmVzb3VyY2UubWltZVR5cGUpOwogCi0gICAgICAgIGNvbnN0IGNoYXIqIGNvbnRl bnRFbmNvZGluZyA9IHVzZUJpbmFyeUVuY29kaW5nID8gYmluYXJ5IDogYmFzZTY0OworICAgICAg ICBjb25zdCBjaGFyKiBjb250ZW50RW5jb2Rpbmc7CisgICAgICAgIGlmICh1c2VCaW5hcnlFbmNv ZGluZykKKyAgICAgICAgICAgIGNvbnRlbnRFbmNvZGluZyA9IGJpbmFyeTsKKyAgICAgICAgZWxz ZSBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRKYXZhU2NyaXB0TUlNRVR5cGUocmVz b3VyY2UubWltZVR5cGUpIHx8IE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VN SU1FVHlwZShyZXNvdXJjZS5taW1lVHlwZSkpCisgICAgICAgICAgICBjb250ZW50RW5jb2Rpbmcg PSBxdW90ZWRQcmludGFibGU7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNvbnRlbnRFbmNv ZGluZyA9IGJhc2U2NDsKKwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiXHJcbkNvbnRl bnQtVHJhbnNmZXItRW5jb2Rpbmc6ICIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChj b250ZW50RW5jb2RpbmcpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiXHJcbkNvbnRl bnQtTG9jYXRpb246ICIpOwo= 114317 2011-11-09 11:05:42 -0800 2011-11-09 11:08:49 -0800 Patch bug-71857-20111109110541.patch text/plain 9644 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogOTk3MjYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZDJhZmU0Nzc3Zjc0OWUx OTkzMjE0NTJiNjVkODBmMmE3ZmY5NTdjLi4wNzQ1NjJlOGRkZTY5NWVmMGY1YTJhY2QzOGY0N2E4 Mzg1MjYzM2JkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMDggIEpheSBD aXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCBNSFRNTCBnZW5l cmF0aW9uIHRvIHVzZSB0aGUgUXVvdGVkUHJpbnRhYmxlIGVuY29kaW5nIGZvciB0ZXh0IHJlc291 cmNlcy4KKyAgICAgICAgVGhpcyB3YXMgcmVncmVzc2VkIHdoZW4gd2UgYWRkZWQgYmluYXJ5IGVu Y29kaW5nIHN1cHBvcnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03MTg1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1IVE1MQXJjaGl2ZTo6Z2VuZXJhdGVNSFRNTERhdGEpOgorCiAyMDExLTExLTA5 ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBTdHlsZVNoZWV0 OiBEZXZpcnR1YWxpemUgc3R5bGVTaGVldENoYW5nZWQoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggNGYxZmExNTQwNTMzYmUxNGE0ZjZlM2EwZDcwNmQxYWI5NDI4NGE1NC4uMjk3NjA4 YWJiNzFmZjIzNzg3MGJhMWE3ZGUzM2Q1ZDY4MWU1Njc1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0xMS0wOSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxs aUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IE1IVE1MIGdlbmVyYXRpb24gdG8gdXNlIHRo ZSBRdW90ZWRQcmludGFibGUgZW5jb2RpbmcgZm9yIHRleHQgcmVzb3VyY2VzLgorICAgICAgICBU aGlzIHdhcyByZWdyZXNzZWQgd2hlbiB3ZSBhZGRlZCBiaW5hcnkgZW5jb2Rpbmcgc3VwcG9ydC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODU3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9X ZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpMaW5lUmVhZGVy OjpMaW5lUmVhZGVyKToKKyAgICAgICAgKFdlYktpdDo6TGluZVJlYWRlcjo6Z2V0TmV4dExpbmUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlTmV3U2VyaWFsaXplVGVzdDo6c2V0VXBDU1NUZXN0 UGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlRFU1RfRik6CisKIDIwMTEtMTEtMDkgIEhlbnJpayBH cnVuZWxsICA8Z3J1bmVsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkaW5nIG1pc3Npbmcg aW1wbGVtZW50YXRpb24gb2YgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpsYWJlbCgpLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5j cHAKaW5kZXggMjkzYzkyNzExNjQyZWQ5Yjc4NzVjOTIxMzgxM2Q1YWQwNWQ3YmU0Ny4uY2FjZjBk MGQ2OTk2NTAwMzY0MjQ3OGZkZTM1NTcxMjkzMTMzZDQwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwCkBAIC0xNzgsNyAr MTc4LDE0IEBAIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBNSFRNTEFyY2hpdmU6OmdlbmVyYXRl TUhUTUxEYXRhKFBhZ2UqIHBhZ2UsIGJvb2wgdXNlQmluCiAgICAgICAgIHN0cmluZ0J1aWxkZXIu YXBwZW5kKCJDb250ZW50LVR5cGU6ICIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChy ZXNvdXJjZS5taW1lVHlwZSk7CiAKLSAgICAgICAgY29uc3QgY2hhciogY29udGVudEVuY29kaW5n ID0gdXNlQmluYXJ5RW5jb2RpbmcgPyBiaW5hcnkgOiBiYXNlNjQ7CisgICAgICAgIGNvbnN0IGNo YXIqIGNvbnRlbnRFbmNvZGluZzsKKyAgICAgICAgaWYgKHVzZUJpbmFyeUVuY29kaW5nKQorICAg ICAgICAgICAgY29udGVudEVuY29kaW5nID0gYmluYXJ5OworICAgICAgICBlbHNlIGlmIChNSU1F VHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEphdmFTY3JpcHRNSU1FVHlwZShyZXNvdXJjZS5taW1l VHlwZSkgfHwgTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlKHJl c291cmNlLm1pbWVUeXBlKSkKKyAgICAgICAgICAgIGNvbnRlbnRFbmNvZGluZyA9IHF1b3RlZFBy aW50YWJsZTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgY29udGVudEVuY29kaW5nID0gYmFz ZTY0OworCiAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKCJcclxuQ29udGVudC1UcmFuc2Zl ci1FbmNvZGluZzogIik7CiAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKGNvbnRlbnRFbmNv ZGluZyk7CiAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKCJcclxuQ29udGVudC1Mb2NhdGlv bjogIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlBhZ2VO ZXdTZXJpYWxpemVyVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlBh Z2VOZXdTZXJpYWxpemVyVGVzdC5jcHAKaW5kZXggMDY3YWY0MjZjNTNhZjJkNWIyOGYyOTY3YmIx ZWRlODRlMDM5NDIwZS4uNzNmZjIzYjk4YmM3NjQ4NTU2MDRmNTExNjZjODNkZmVjYjVlMDRiOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJQYWdlTmV3U2VyaWFs aXplclRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViUGFnZU5l d1NlcmlhbGl6ZXJUZXN0LmNwcApAQCAtNDksNiArNDksMzEgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YktpdDsKIAogbmFtZXNwYWNlIHsKIAorY2xhc3MgTGluZVJlYWRlciB7CitwdWJsaWM6CisgICAg TGluZVJlYWRlcihjb25zdCBzdGQ6OnN0cmluZyYgdGV4dCkgOiBtX3RleHQodGV4dCksIG1faW5k ZXgoMCkgeyB9CisgICAgYm9vbCBnZXROZXh0TGluZShzdGQ6OnN0cmluZyogbGluZSkKKyAgICB7 CisgICAgICAgIGxpbmUtPmNsZWFyKCk7CisgICAgICAgIGlmIChtX2luZGV4ID49IG1fdGV4dC5s ZW5ndGgoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBzaXplX3QgZW5k T2ZMaW5lSW5kZXggPSBtX3RleHQuZmluZCgiXHJcbiIsIG1faW5kZXgpOworICAgICAgICBpZiAo ZW5kT2ZMaW5lSW5kZXggPT0gc3RkOjpzdHJpbmc6Om5wb3MpIHsKKyAgICAgICAgICAgICpsaW5l ID0gbV90ZXh0LnN1YnN0cihtX2luZGV4KTsKKyAgICAgICAgICAgIG1faW5kZXggPSBtX3RleHQu bGVuZ3RoKCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAqbGluZSA9IG1fdGV4dC5z dWJzdHIobV9pbmRleCwgZW5kT2ZMaW5lSW5kZXggLSBtX2luZGV4KTsKKyAgICAgICAgICAgIG1f aW5kZXggPSBlbmRPZkxpbmVJbmRleCArIDI7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgfQorCitwcml2YXRlOgorICAgIHN0ZDo6c3RyaW5nIG1fdGV4dDsKKyAgICBzaXpl X3QgbV9pbmRleDsKK307CisKIGNsYXNzIFRlc3RXZWJGcmFtZUNsaWVudCA6IHB1YmxpYyBXZWJG cmFtZUNsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+VGVzdFdlYkZyYW1lQ2xpZW50KCkg eyB9CkBAIC05Nyw2ICsxMjIsMjQgQEAgcHJvdGVjdGVkOgogICAgICAgICB3ZWJraXRfc3VwcG9y dDo6UmVnaXN0ZXJNb2NrZWRVUkwodXJsLCByZXNwb25zZSwgV2ViU3RyaW5nOjpmcm9tVVRGOChm aWxlUGF0aCkpOwogICAgIH0KIAorICAgIFdlYlVSTCBzZXRVcENTU1Rlc3RQYWdlKCkKKyAgICB7 CisgICAgICAgIFdlYlVSTCB0b3BGcmFtZVVSTCA9IEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20i KTsKKyAgICAgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKHRvcEZyYW1lVVJMLCBXZWJTdHJpbmc6 OmZyb21VVEY4KCJjc3NfdGVzdF9wYWdlLmh0bWwiKSwgaHRtbE1pbWVUeXBlKCkpOworICAgICAg ICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9saW5rX3N0 eWxlcy5jc3MiKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgibGlua19zdHlsZXMuY3NzIiksIGNzc01p bWVUeXBlKCkpOworICAgICAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3 dy50ZXN0LmNvbS9pbXBvcnRfc3R5bGVfZnJvbV9saW5rLmNzcyIpLCBXZWJTdHJpbmc6OmZyb21V VEY4KCJpbXBvcnRfc3R5bGVfZnJvbV9saW5rLmNzcyIpLCBjc3NNaW1lVHlwZSgpKTsKKyAgICAg ICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20vaW1wb3J0 X3N0eWxlcy5jc3MiKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgiaW1wb3J0X3N0eWxlcy5jc3MiKSwg Y3NzTWltZVR5cGUoKSk7CisgICAgICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJodHRw Oi8vd3d3LnRlc3QuY29tL3JlZF9iYWNrZ3JvdW5kLnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4 KCJyZWRfYmFja2dyb3VuZC5wbmciKSwgcG5nTWltZVR5cGUoKSk7CisgICAgICAgIHJlZ2lzdGVy TW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8vd3d3LnRlc3QuY29tL29yYW5nZV9iYWNrZ3JvdW5k LnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJvcmFuZ2VfYmFja2dyb3VuZC5wbmciKSwgcG5n TWltZVR5cGUoKSk7CisgICAgICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8v d3d3LnRlc3QuY29tL3llbGxvd19iYWNrZ3JvdW5kLnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4 KCJ5ZWxsb3dfYmFja2dyb3VuZC5wbmciKSwgcG5nTWltZVR5cGUoKSk7CisgICAgICAgIHJlZ2lz dGVyTW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8vd3d3LnRlc3QuY29tL2dyZWVuX2JhY2tncm91 bmQucG5nIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoImdyZWVuX2JhY2tncm91bmQucG5nIiksIHBu Z01pbWVUeXBlKCkpOworICAgICAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDov L3d3dy50ZXN0LmNvbS9ibHVlX2JhY2tncm91bmQucG5nIiksIFdlYlN0cmluZzo6ZnJvbVVURjgo ImJsdWVfYmFja2dyb3VuZC5wbmciKSwgcG5nTWltZVR5cGUoKSk7CisgICAgICAgIHJlZ2lzdGVy TW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8vd3d3LnRlc3QuY29tL3B1cnBsZV9iYWNrZ3JvdW5k LnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJwdXJwbGVfYmFja2dyb3VuZC5wbmciKSwgcG5n TWltZVR5cGUoKSk7CisgICAgICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8v d3d3LnRlc3QuY29tL3VsLWRvdC5wbmciKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgidWwtZG90LnBu ZyIpLCBwbmdNaW1lVHlwZSgpKTsKKyAgICAgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwo Imh0dHA6Ly93d3cudGVzdC5jb20vb2wtZG90LnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJv bC1kb3QucG5nIiksIHBuZ01pbWVUeXBlKCkpOworICAgICAgICByZXR1cm4gdG9wRnJhbWVVUkw7 CisgICAgfQorCiAgICAgdm9pZCBsb2FkVVJMSW5Ub3BGcmFtZShjb25zdCBHVVJMJiB1cmwpCiAg ICAgewogICAgICAgICBXZWJVUkxSZXF1ZXN0IHVybFJlcXVlc3Q7CkBAIC0xNzUsMjAgKzIxOCw3 IEBAIFRFU1RfRihXZWJQYWdlTmV3U2VyaWFsaXplVGVzdCwgUGFnZVdpdGhGcmFtZXMpCiBURVNU X0YoV2ViUGFnZU5ld1NlcmlhbGl6ZVRlc3QsIENTU1Jlc291cmNlcykKIHsKICAgICAvLyBSZWdp c3RlciB0aGUgbW9ja2VkIGZyYW1lIGFuZCBsb2FkIGl0LgotICAgIFdlYlVSTCB0b3BGcmFtZVVS TCA9IEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20iKTsKLSAgICByZWdpc3Rlck1vY2tlZFVSTExv YWQodG9wRnJhbWVVUkwsIFdlYlN0cmluZzo6ZnJvbVVURjgoImNzc190ZXN0X3BhZ2UuaHRtbCIp LCBodG1sTWltZVR5cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6 Ly93d3cudGVzdC5jb20vbGlua19zdHlsZXMuY3NzIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoImxp bmtfc3R5bGVzLmNzcyIpLCBjc3NNaW1lVHlwZSgpKTsKLSAgICByZWdpc3Rlck1vY2tlZFVSTExv YWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9pbXBvcnRfc3R5bGVfZnJvbV9saW5rLmNzcyIp LCBXZWJTdHJpbmc6OmZyb21VVEY4KCJpbXBvcnRfc3R5bGVfZnJvbV9saW5rLmNzcyIpLCBjc3NN aW1lVHlwZSgpKTsKLSAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50 ZXN0LmNvbS9pbXBvcnRfc3R5bGVzLmNzcyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJpbXBvcnRf c3R5bGVzLmNzcyIpLCBjc3NNaW1lVHlwZSgpKTsKLSAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQo R1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9yZWRfYmFja2dyb3VuZC5wbmciKSwgV2ViU3RyaW5n Ojpmcm9tVVRGOCgicmVkX2JhY2tncm91bmQucG5nIiksIHBuZ01pbWVUeXBlKCkpOwotICAgIHJl Z2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8vd3d3LnRlc3QuY29tL29yYW5nZV9iYWNr Z3JvdW5kLnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJvcmFuZ2VfYmFja2dyb3VuZC5wbmci KSwgcG5nTWltZVR5cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6 Ly93d3cudGVzdC5jb20veWVsbG93X2JhY2tncm91bmQucG5nIiksIFdlYlN0cmluZzo6ZnJvbVVU RjgoInllbGxvd19iYWNrZ3JvdW5kLnBuZyIpLCBwbmdNaW1lVHlwZSgpKTsKLSAgICByZWdpc3Rl ck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9ncmVlbl9iYWNrZ3JvdW5k LnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJncmVlbl9iYWNrZ3JvdW5kLnBuZyIpLCBwbmdN aW1lVHlwZSgpKTsKLSAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50 ZXN0LmNvbS9ibHVlX2JhY2tncm91bmQucG5nIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoImJsdWVf YmFja2dyb3VuZC5wbmciKSwgcG5nTWltZVR5cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxM b2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20vcHVycGxlX2JhY2tncm91bmQucG5nIiksIFdl YlN0cmluZzo6ZnJvbVVURjgoInB1cnBsZV9iYWNrZ3JvdW5kLnBuZyIpLCBwbmdNaW1lVHlwZSgp KTsKLSAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS91 bC1kb3QucG5nIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoInVsLWRvdC5wbmciKSwgcG5nTWltZVR5 cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5j b20vb2wtZG90LnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJvbC1kb3QucG5nIiksIHBuZ01p bWVUeXBlKCkpOwotCisgICAgV2ViVVJMIHRvcEZyYW1lVVJMID0gc2V0VXBDU1NUZXN0UGFnZSgp OwogICAgIGxvYWRVUkxJblRvcEZyYW1lKHRvcEZyYW1lVVJMKTsKIAogICAgIFdlYlZlY3RvcjxX ZWJQYWdlU2VyaWFsaXplcjo6UmVzb3VyY2U+IHJlc291cmNlczsKQEAgLTI3MCw0ICszMDAsNDMg QEAgVEVTVF9GKFdlYlBhZ2VOZXdTZXJpYWxpemVUZXN0LCBTZXJpYWxpemVYTUxIYXNSaWdodERl Y2xhcmF0aW9uKQogICAgIEFTU0VSVF9UUlVFKHBvcyA9PSBzdGQ6OnN0cmluZzo6bnBvcyk7CiB9 CiAKK1RFU1RfRihXZWJQYWdlTmV3U2VyaWFsaXplVGVzdCwgVGVzdE1IVE1MRW5jb2RpbmcpCit7 CisgICAgLy8gTG9hZCBhIHBhZ2Ugd2l0aCBzb21lIENTUyBhbmQgc29tZSBpbWFnZXMuCisgICAg V2ViVVJMIHRvcEZyYW1lVVJMID0gc2V0VXBDU1NUZXN0UGFnZSgpOworICAgIGxvYWRVUkxJblRv cEZyYW1lKHRvcEZyYW1lVVJMKTsKKworICAgIFdlYkNTdHJpbmcgbWh0bWxEYXRhID0gV2ViUGFn ZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZVRvTUhUTUwobV93ZWJWaWV3KTsKKyAgICBBU1NFUlRfRkFM U0UobWh0bWxEYXRhLmlzRW1wdHkoKSk7CisKKyAgICAvLyBSZWFkIHRoZSBNSFRNTCBkYXRhIGxp bmUgcGVyIGxpbmUgYW5kIGRvIHNvbWUgcHNldWRvLXBhcnNpbmcgdG8gbWFrZSBzdXJlIHRoZSBy aWdodCBlbmNvZGluZyBpcyB1c2VkIGZvciB0aGUgZGlmZmVyZW50IHNlY3Rpb25zLgorICAgIExp bmVSZWFkZXIgbGluZVJlYWRlcihtaHRtbERhdGEpOworICAgIGludCBzZWN0aW9uQ2hlY2tlZENv dW50ID0gMDsKKyAgICBjb25zdCBjaGFyKiBleHBlY3RlZEVuY29kaW5nID0gMDsKKyAgICBzdGQ6 OnN0cmluZyBsaW5lOworICAgIHdoaWxlIChsaW5lUmVhZGVyLmdldE5leHRMaW5lKCZsaW5lKSkg eworICAgICAgICBpZiAoIWxpbmUuZmluZCgiQ29udGVudC1UeXBlOiIpKSB7CisgICAgICAgICAg ICBBU1NFUlRfRkFMU0UoZXhwZWN0ZWRFbmNvZGluZyk7CisgICAgICAgICAgICBpZiAobGluZS5m aW5kKCJtdWx0aXBhcnQvcmVsYXRlZDsiKSAhPSBzdGQ6OnN0cmluZzo6bnBvcykgeworICAgICAg ICAgICAgICAgIC8vIFNraXAgdGhpcyBvbmUsIGl0J3MgcGFydCBvZiB0aGUgTUhUTUwgaGVhZGVy LgorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAg aWYgKGxpbmUuZmluZCgidGV4dC8iKSAhPSBzdGQ6OnN0cmluZzo6bnBvcykKKyAgICAgICAgICAg ICAgICBleHBlY3RlZEVuY29kaW5nID0gInF1b3RlZC1wcmludGFibGUiOworICAgICAgICAgICAg ZWxzZSBpZiAobGluZS5maW5kKCJpbWFnZS8iKSAhPSBzdGQ6OnN0cmluZzo6bnBvcykKKyAgICAg ICAgICAgICAgICBleHBlY3RlZEVuY29kaW5nID0gImJhc2U2NCI7CisgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgRkFJTCgpIDw8ICJVbmV4cGVjdGVkIENvbnRlbnQtVHlwZTogIiA8 PCBsaW5lOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKCFs aW5lLmZpbmQoIkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IikpIHsKKyAgICAgICAgICAgQVNT RVJUX1RSVUUoZXhwZWN0ZWRFbmNvZGluZyk7CisgICAgICAgICAgIEVYUEVDVF9UUlVFKGxpbmUu ZmluZChleHBlY3RlZEVuY29kaW5nKSAhPSBzdGQ6OnN0cmluZzo6bnBvcyk7CisgICAgICAgICAg IGV4cGVjdGVkRW5jb2RpbmcgPSAwOworICAgICAgICAgICBzZWN0aW9uQ2hlY2tlZENvdW50Kys7 CisgICAgICAgIH0KKyAgICB9CisgICAgRVhQRUNUX0VRKDEyLCBzZWN0aW9uQ2hlY2tlZENvdW50 KTsKK30KKwogfQo= 114318 2011-11-09 11:08:52 -0800 2011-11-09 15:14:16 -0800 Patch bug-71857-20111109110851.patch text/plain 9648 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogOTk3MjYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZDJhZmU0Nzc3Zjc0OWUx OTkzMjE0NTJiNjVkODBmMmE3ZmY5NTdjLi4wNzQ1NjJlOGRkZTY5NWVmMGY1YTJhY2QzOGY0N2E4 Mzg1MjYzM2JkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMDggIEpheSBD aXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCBNSFRNTCBnZW5l cmF0aW9uIHRvIHVzZSB0aGUgUXVvdGVkUHJpbnRhYmxlIGVuY29kaW5nIGZvciB0ZXh0IHJlc291 cmNlcy4KKyAgICAgICAgVGhpcyB3YXMgcmVncmVzc2VkIHdoZW4gd2UgYWRkZWQgYmluYXJ5IGVu Y29kaW5nIHN1cHBvcnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03MTg1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1IVE1MQXJjaGl2ZTo6Z2VuZXJhdGVNSFRNTERhdGEpOgorCiAyMDExLTExLTA5 ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBTdHlsZVNoZWV0 OiBEZXZpcnR1YWxpemUgc3R5bGVTaGVldENoYW5nZWQoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggNGYxZmExNTQwNTMzYmUxNGE0ZjZlM2EwZDcwNmQxYWI5NDI4NGE1NC4uMjk3NjA4 YWJiNzFmZjIzNzg3MGJhMWE3ZGUzM2Q1ZDY4MWU1Njc1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0xMS0wOSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxs aUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IE1IVE1MIGdlbmVyYXRpb24gdG8gdXNlIHRo ZSBRdW90ZWRQcmludGFibGUgZW5jb2RpbmcgZm9yIHRleHQgcmVzb3VyY2VzLgorICAgICAgICBU aGlzIHdhcyByZWdyZXNzZWQgd2hlbiB3ZSBhZGRlZCBiaW5hcnkgZW5jb2Rpbmcgc3VwcG9ydC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODU3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9X ZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpMaW5lUmVhZGVy OjpMaW5lUmVhZGVyKToKKyAgICAgICAgKFdlYktpdDo6TGluZVJlYWRlcjo6Z2V0TmV4dExpbmUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlTmV3U2VyaWFsaXplVGVzdDo6c2V0VXBDU1NUZXN0 UGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlRFU1RfRik6CisKIDIwMTEtMTEtMDkgIEhlbnJpayBH cnVuZWxsICA8Z3J1bmVsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkaW5nIG1pc3Npbmcg aW1wbGVtZW50YXRpb24gb2YgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpsYWJlbCgpLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5j cHAKaW5kZXggMjkzYzkyNzExNjQyZWQ5Yjc4NzVjOTIxMzgxM2Q1YWQwNWQ3YmU0Ny4uNDgxMGYy ZDBhYjRjNWUxN2I1NTZhM2FmN2Y1YTgxMzE3NzdiZDA3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwCkBAIC0xNzgsNyAr MTc4LDE0IEBAIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBNSFRNTEFyY2hpdmU6OmdlbmVyYXRl TUhUTUxEYXRhKFBhZ2UqIHBhZ2UsIGJvb2wgdXNlQmluCiAgICAgICAgIHN0cmluZ0J1aWxkZXIu YXBwZW5kKCJDb250ZW50LVR5cGU6ICIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChy ZXNvdXJjZS5taW1lVHlwZSk7CiAKLSAgICAgICAgY29uc3QgY2hhciogY29udGVudEVuY29kaW5n ID0gdXNlQmluYXJ5RW5jb2RpbmcgPyBiaW5hcnkgOiBiYXNlNjQ7CisgICAgICAgIGNvbnN0IGNo YXIqIGNvbnRlbnRFbmNvZGluZyA9IDA7CisgICAgICAgIGlmICh1c2VCaW5hcnlFbmNvZGluZykK KyAgICAgICAgICAgIGNvbnRlbnRFbmNvZGluZyA9IGJpbmFyeTsKKyAgICAgICAgZWxzZSBpZiAo TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRKYXZhU2NyaXB0TUlNRVR5cGUocmVzb3VyY2Uu bWltZVR5cGUpIHx8IE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VNSU1FVHlw ZShyZXNvdXJjZS5taW1lVHlwZSkpCisgICAgICAgICAgICBjb250ZW50RW5jb2RpbmcgPSBxdW90 ZWRQcmludGFibGU7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNvbnRlbnRFbmNvZGluZyA9 IGJhc2U2NDsKKwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiXHJcbkNvbnRlbnQtVHJh bnNmZXItRW5jb2Rpbmc6ICIpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChjb250ZW50 RW5jb2RpbmcpOwogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgiXHJcbkNvbnRlbnQtTG9j YXRpb246ICIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJQ YWdlTmV3U2VyaWFsaXplclRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9X ZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwCmluZGV4IDA2N2FmNDI2YzUzYWYyZDViMjhmMjk2 N2JiMWVkZTg0ZTAzOTQyMGUuLjczZmYyM2I5OGJjNzY0ODU1NjA0ZjUxMTY2YzgzZGZlY2I1ZTA0 YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViUGFnZU5ld1Nl cmlhbGl6ZXJUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlBh Z2VOZXdTZXJpYWxpemVyVGVzdC5jcHAKQEAgLTQ5LDYgKzQ5LDMxIEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7CiAKIG5hbWVzcGFjZSB7CiAKK2NsYXNzIExpbmVSZWFkZXIgeworcHVibGljOgor ICAgIExpbmVSZWFkZXIoY29uc3Qgc3RkOjpzdHJpbmcmIHRleHQpIDogbV90ZXh0KHRleHQpLCBt X2luZGV4KDApIHsgfQorICAgIGJvb2wgZ2V0TmV4dExpbmUoc3RkOjpzdHJpbmcqIGxpbmUpCisg ICAgeworICAgICAgICBsaW5lLT5jbGVhcigpOworICAgICAgICBpZiAobV9pbmRleCA+PSBtX3Rl eHQubGVuZ3RoKCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgc2l6ZV90 IGVuZE9mTGluZUluZGV4ID0gbV90ZXh0LmZpbmQoIlxyXG4iLCBtX2luZGV4KTsKKyAgICAgICAg aWYgKGVuZE9mTGluZUluZGV4ID09IHN0ZDo6c3RyaW5nOjpucG9zKSB7CisgICAgICAgICAgICAq bGluZSA9IG1fdGV4dC5zdWJzdHIobV9pbmRleCk7CisgICAgICAgICAgICBtX2luZGV4ID0gbV90 ZXh0Lmxlbmd0aCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgKmxpbmUgPSBtX3Rl eHQuc3Vic3RyKG1faW5kZXgsIGVuZE9mTGluZUluZGV4IC0gbV9pbmRleCk7CisgICAgICAgICAg ICBtX2luZGV4ID0gZW5kT2ZMaW5lSW5kZXggKyAyOworICAgICAgICB9CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKworcHJpdmF0ZToKKyAgICBzdGQ6OnN0cmluZyBtX3RleHQ7CisgICAg c2l6ZV90IG1faW5kZXg7Cit9OworCiBjbGFzcyBUZXN0V2ViRnJhbWVDbGllbnQgOiBwdWJsaWMg V2ViRnJhbWVDbGllbnQgewogcHVibGljOgogICAgIHZpcnR1YWwgflRlc3RXZWJGcmFtZUNsaWVu dCgpIHsgfQpAQCAtOTcsNiArMTIyLDI0IEBAIHByb3RlY3RlZDoKICAgICAgICAgd2Via2l0X3N1 cHBvcnQ6OlJlZ2lzdGVyTW9ja2VkVVJMKHVybCwgcmVzcG9uc2UsIFdlYlN0cmluZzo6ZnJvbVVU RjgoZmlsZVBhdGgpKTsKICAgICB9CiAKKyAgICBXZWJVUkwgc2V0VXBDU1NUZXN0UGFnZSgpCisg ICAgeworICAgICAgICBXZWJVUkwgdG9wRnJhbWVVUkwgPSBHVVJMKCJodHRwOi8vd3d3LnRlc3Qu Y29tIik7CisgICAgICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCh0b3BGcmFtZVVSTCwgV2ViU3Ry aW5nOjpmcm9tVVRGOCgiY3NzX3Rlc3RfcGFnZS5odG1sIiksIGh0bWxNaW1lVHlwZSgpKTsKKyAg ICAgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20vbGlu a19zdHlsZXMuY3NzIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoImxpbmtfc3R5bGVzLmNzcyIpLCBj c3NNaW1lVHlwZSgpKTsKKyAgICAgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6 Ly93d3cudGVzdC5jb20vaW1wb3J0X3N0eWxlX2Zyb21fbGluay5jc3MiKSwgV2ViU3RyaW5nOjpm cm9tVVRGOCgiaW1wb3J0X3N0eWxlX2Zyb21fbGluay5jc3MiKSwgY3NzTWltZVR5cGUoKSk7Cisg ICAgICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8vd3d3LnRlc3QuY29tL2lt cG9ydF9zdHlsZXMuY3NzIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoImltcG9ydF9zdHlsZXMuY3Nz IiksIGNzc01pbWVUeXBlKCkpOworICAgICAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgi aHR0cDovL3d3dy50ZXN0LmNvbS9yZWRfYmFja2dyb3VuZC5wbmciKSwgV2ViU3RyaW5nOjpmcm9t VVRGOCgicmVkX2JhY2tncm91bmQucG5nIiksIHBuZ01pbWVUeXBlKCkpOworICAgICAgICByZWdp c3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9vcmFuZ2VfYmFja2dy b3VuZC5wbmciKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgib3JhbmdlX2JhY2tncm91bmQucG5nIiks IHBuZ01pbWVUeXBlKCkpOworICAgICAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0 cDovL3d3dy50ZXN0LmNvbS95ZWxsb3dfYmFja2dyb3VuZC5wbmciKSwgV2ViU3RyaW5nOjpmcm9t VVRGOCgieWVsbG93X2JhY2tncm91bmQucG5nIiksIHBuZ01pbWVUeXBlKCkpOworICAgICAgICBy ZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9ncmVlbl9iYWNr Z3JvdW5kLnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJncmVlbl9iYWNrZ3JvdW5kLnBuZyIp LCBwbmdNaW1lVHlwZSgpKTsKKyAgICAgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0 dHA6Ly93d3cudGVzdC5jb20vYmx1ZV9iYWNrZ3JvdW5kLnBuZyIpLCBXZWJTdHJpbmc6OmZyb21V VEY4KCJibHVlX2JhY2tncm91bmQucG5nIiksIHBuZ01pbWVUeXBlKCkpOworICAgICAgICByZWdp c3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9wdXJwbGVfYmFja2dy b3VuZC5wbmciKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgicHVycGxlX2JhY2tncm91bmQucG5nIiks IHBuZ01pbWVUeXBlKCkpOworICAgICAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0 cDovL3d3dy50ZXN0LmNvbS91bC1kb3QucG5nIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoInVsLWRv dC5wbmciKSwgcG5nTWltZVR5cGUoKSk7CisgICAgICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChH VVJMKCJodHRwOi8vd3d3LnRlc3QuY29tL29sLWRvdC5wbmciKSwgV2ViU3RyaW5nOjpmcm9tVVRG OCgib2wtZG90LnBuZyIpLCBwbmdNaW1lVHlwZSgpKTsKKyAgICAgICAgcmV0dXJuIHRvcEZyYW1l VVJMOworICAgIH0KKwogICAgIHZvaWQgbG9hZFVSTEluVG9wRnJhbWUoY29uc3QgR1VSTCYgdXJs KQogICAgIHsKICAgICAgICAgV2ViVVJMUmVxdWVzdCB1cmxSZXF1ZXN0OwpAQCAtMTc1LDIwICsy MTgsNyBAQCBURVNUX0YoV2ViUGFnZU5ld1NlcmlhbGl6ZVRlc3QsIFBhZ2VXaXRoRnJhbWVzKQog VEVTVF9GKFdlYlBhZ2VOZXdTZXJpYWxpemVUZXN0LCBDU1NSZXNvdXJjZXMpCiB7CiAgICAgLy8g UmVnaXN0ZXIgdGhlIG1vY2tlZCBmcmFtZSBhbmQgbG9hZCBpdC4KLSAgICBXZWJVUkwgdG9wRnJh bWVVUkwgPSBHVVJMKCJodHRwOi8vd3d3LnRlc3QuY29tIik7Ci0gICAgcmVnaXN0ZXJNb2NrZWRV UkxMb2FkKHRvcEZyYW1lVVJMLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJjc3NfdGVzdF9wYWdlLmh0 bWwiKSwgaHRtbE1pbWVUeXBlKCkpOwotICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJo dHRwOi8vd3d3LnRlc3QuY29tL2xpbmtfc3R5bGVzLmNzcyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4 KCJsaW5rX3N0eWxlcy5jc3MiKSwgY3NzTWltZVR5cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRV UkxMb2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20vaW1wb3J0X3N0eWxlX2Zyb21fbGluay5j c3MiKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgiaW1wb3J0X3N0eWxlX2Zyb21fbGluay5jc3MiKSwg Y3NzTWltZVR5cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6Ly93 d3cudGVzdC5jb20vaW1wb3J0X3N0eWxlcy5jc3MiKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgiaW1w b3J0X3N0eWxlcy5jc3MiKSwgY3NzTWltZVR5cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxM b2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20vcmVkX2JhY2tncm91bmQucG5nIiksIFdlYlN0 cmluZzo6ZnJvbVVURjgoInJlZF9iYWNrZ3JvdW5kLnBuZyIpLCBwbmdNaW1lVHlwZSgpKTsKLSAg ICByZWdpc3Rlck1vY2tlZFVSTExvYWQoR1VSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS9vcmFuZ2Vf YmFja2dyb3VuZC5wbmciKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgib3JhbmdlX2JhY2tncm91bmQu cG5nIiksIHBuZ01pbWVUeXBlKCkpOwotICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJo dHRwOi8vd3d3LnRlc3QuY29tL3llbGxvd19iYWNrZ3JvdW5kLnBuZyIpLCBXZWJTdHJpbmc6OmZy b21VVEY4KCJ5ZWxsb3dfYmFja2dyb3VuZC5wbmciKSwgcG5nTWltZVR5cGUoKSk7Ci0gICAgcmVn aXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5jb20vZ3JlZW5fYmFja2dy b3VuZC5wbmciKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgiZ3JlZW5fYmFja2dyb3VuZC5wbmciKSwg cG5nTWltZVR5cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6Ly93 d3cudGVzdC5jb20vYmx1ZV9iYWNrZ3JvdW5kLnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJi bHVlX2JhY2tncm91bmQucG5nIiksIHBuZ01pbWVUeXBlKCkpOwotICAgIHJlZ2lzdGVyTW9ja2Vk VVJMTG9hZChHVVJMKCJodHRwOi8vd3d3LnRlc3QuY29tL3B1cnBsZV9iYWNrZ3JvdW5kLnBuZyIp LCBXZWJTdHJpbmc6OmZyb21VVEY4KCJwdXJwbGVfYmFja2dyb3VuZC5wbmciKSwgcG5nTWltZVR5 cGUoKSk7Ci0gICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKEdVUkwoImh0dHA6Ly93d3cudGVzdC5j b20vdWwtZG90LnBuZyIpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJ1bC1kb3QucG5nIiksIHBuZ01p bWVUeXBlKCkpOwotICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChHVVJMKCJodHRwOi8vd3d3LnRl c3QuY29tL29sLWRvdC5wbmciKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgib2wtZG90LnBuZyIpLCBw bmdNaW1lVHlwZSgpKTsKLQorICAgIFdlYlVSTCB0b3BGcmFtZVVSTCA9IHNldFVwQ1NTVGVzdFBh Z2UoKTsKICAgICBsb2FkVVJMSW5Ub3BGcmFtZSh0b3BGcmFtZVVSTCk7CiAKICAgICBXZWJWZWN0 b3I8V2ViUGFnZVNlcmlhbGl6ZXI6OlJlc291cmNlPiByZXNvdXJjZXM7CkBAIC0yNzAsNCArMzAw LDQzIEBAIFRFU1RfRihXZWJQYWdlTmV3U2VyaWFsaXplVGVzdCwgU2VyaWFsaXplWE1MSGFzUmln aHREZWNsYXJhdGlvbikKICAgICBBU1NFUlRfVFJVRShwb3MgPT0gc3RkOjpzdHJpbmc6Om5wb3Mp OwogfQogCitURVNUX0YoV2ViUGFnZU5ld1NlcmlhbGl6ZVRlc3QsIFRlc3RNSFRNTEVuY29kaW5n KQoreworICAgIC8vIExvYWQgYSBwYWdlIHdpdGggc29tZSBDU1MgYW5kIHNvbWUgaW1hZ2VzLgor ICAgIFdlYlVSTCB0b3BGcmFtZVVSTCA9IHNldFVwQ1NTVGVzdFBhZ2UoKTsKKyAgICBsb2FkVVJM SW5Ub3BGcmFtZSh0b3BGcmFtZVVSTCk7CisKKyAgICBXZWJDU3RyaW5nIG1odG1sRGF0YSA9IFdl YlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVUb01IVE1MKG1fd2ViVmlldyk7CisgICAgQVNTRVJU X0ZBTFNFKG1odG1sRGF0YS5pc0VtcHR5KCkpOworCisgICAgLy8gUmVhZCB0aGUgTUhUTUwgZGF0 YSBsaW5lIHBlciBsaW5lIGFuZCBkbyBzb21lIHBzZXVkby1wYXJzaW5nIHRvIG1ha2Ugc3VyZSB0 aGUgcmlnaHQgZW5jb2RpbmcgaXMgdXNlZCBmb3IgdGhlIGRpZmZlcmVudCBzZWN0aW9ucy4KKyAg ICBMaW5lUmVhZGVyIGxpbmVSZWFkZXIobWh0bWxEYXRhKTsKKyAgICBpbnQgc2VjdGlvbkNoZWNr ZWRDb3VudCA9IDA7CisgICAgY29uc3QgY2hhciogZXhwZWN0ZWRFbmNvZGluZyA9IDA7CisgICAg c3RkOjpzdHJpbmcgbGluZTsKKyAgICB3aGlsZSAobGluZVJlYWRlci5nZXROZXh0TGluZSgmbGlu ZSkpIHsKKyAgICAgICAgaWYgKCFsaW5lLmZpbmQoIkNvbnRlbnQtVHlwZToiKSkgeworICAgICAg ICAgICAgQVNTRVJUX0ZBTFNFKGV4cGVjdGVkRW5jb2RpbmcpOworICAgICAgICAgICAgaWYgKGxp bmUuZmluZCgibXVsdGlwYXJ0L3JlbGF0ZWQ7IikgIT0gc3RkOjpzdHJpbmc6Om5wb3MpIHsKKyAg ICAgICAgICAgICAgICAvLyBTa2lwIHRoaXMgb25lLCBpdCdzIHBhcnQgb2YgdGhlIE1IVE1MIGhl YWRlci4KKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIGlmIChsaW5lLmZpbmQoInRleHQvIikgIT0gc3RkOjpzdHJpbmc6Om5wb3MpCisgICAgICAg ICAgICAgICAgZXhwZWN0ZWRFbmNvZGluZyA9ICJxdW90ZWQtcHJpbnRhYmxlIjsKKyAgICAgICAg ICAgIGVsc2UgaWYgKGxpbmUuZmluZCgiaW1hZ2UvIikgIT0gc3RkOjpzdHJpbmc6Om5wb3MpCisg ICAgICAgICAgICAgICAgZXhwZWN0ZWRFbmNvZGluZyA9ICJiYXNlNjQiOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIEZBSUwoKSA8PCAiVW5leHBlY3RlZCBDb250ZW50LVR5cGU6 ICIgPDwgbGluZTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIGlm ICghbGluZS5maW5kKCJDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiIpKSB7CisgICAgICAgICAg IEFTU0VSVF9UUlVFKGV4cGVjdGVkRW5jb2RpbmcpOworICAgICAgICAgICBFWFBFQ1RfVFJVRShs aW5lLmZpbmQoZXhwZWN0ZWRFbmNvZGluZykgIT0gc3RkOjpzdHJpbmc6Om5wb3MpOworICAgICAg ICAgICBleHBlY3RlZEVuY29kaW5nID0gMDsKKyAgICAgICAgICAgc2VjdGlvbkNoZWNrZWRDb3Vu dCsrOworICAgICAgICB9CisgICAgfQorICAgIEVYUEVDVF9FUSgxMiwgc2VjdGlvbkNoZWNrZWRD b3VudCk7Cit9CisKIH0K