89978 2012-06-26 06:56:36 -0700 [GTK] MHTML files not being loaded due to reported mime type not supported 2012-07-19 04:00:04 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 89987 1 mario webkit-unassigned cgarcia japhet jcivelli jochen mrobinson svillar webkit.review.bot oldest_to_newest 657579 0 mario 2012-06-26 06:56:36 -0700 With bug 7168 fixed, we have now MHTML read support in WebKit, which will enable any WebKit-based browser to read MHTML files as if they were "normal" HTML files with the external resources embedded in it (normally using base64 encoding). However, at the moment any WebKitGtk based browser willing to load a MHTML file (typically with a .mht extension) won't be able to do it because the patch for bug 7168 enables WebCore to load files of mime type multipart/related only, when MHTML is enabled at build time: Source/WebCore/loader/archive/ArchiveFactory.cpp ------------------------------------------------ [...] #if ENABLE(MHTML) mimeTypes.set("multipart/related", archiveFactoryCreate<MHTMLArchive>); #endif [...] This seems to be working wonderfully in other WebKit-based browsers (e.g. Chromium) but not in WebKitGtk, since the mimetype obtained for those MHTML files is not multipart/related, but message/rfc822[1] instead. I've been digging this issue for some time today and found out that the sequence of libraries used to retrieve the mime type for a given file, when using WebKitGTK, is as follows: WKGTK -> libsoup -> GIO -> GVFS -> GNOME-VFS -> shared-mime-info (from freedesktop.org) So, I've hacked for a while on shared-mime-info's XML file where the heuristics and matching rules are defined and managed to get it telling me at some point that .mht files generated with WebKit were actually of mime type multipart/related, instead of message/rfc822. Unfortunately, the very same patch in shared-mime-info caused some regressions there, making some files containing true email messages report multipart/related too, instead of message/rfc822. For the sake of completeness, this is the an excerpt of the content of the MHTML file I was using for testing: From: <Saved by WebKit> Subject: Date: Wed, 26 Jun 2012 12:38:36 +0100 MIME-Version: 1.0 Content-Type: multipart/related; type="text/html"; boundary="----=_NextPart_000_47A9_6EDBB149.472FD3B3" ------=_NextPart_000_47A9_6EDBB149.472FD3B3 Content-Type: text/html Content-Transfer-Encoding: quoted-printable Content-Location: file:///home/mario/work/gnome3/WebKitTests/mhtml.html <html><head><meta charset=3D"ISO-8859-1"></head><body> A red box: <img src=3D"data:image/png;base64,iVBORw0...ggg=3D=3D"><br> A blue box: <img src=3D"data:image/png;base64,iVBORw...ggg=3D=3D"> =20 </body></html> ------=_NextPart_000_47A9_6EDBB149.472FD3B3 Content-Type: image/png Content-Transfer-Encoding: base64 Content-Location: data:image/png;base64,iVBORw0...ggg== [...] So, after reaching that point I realized that perhaps the problem was not in shared-mime-info since, after all, despite of it being a .mht file, it is also true that it is written in a perfectly valid e-mail format, so it's not strange that it's returning message/rfc822. So I now think it would be better to make some changes here in WebKit (at least in WebKitGTK) just to support reading MHTML files, hence this bug. Furthermore, we should also consider that there are cases where a MHTML file is not encoded using multipart/related (when no there are no external resources linked, according to [2]), which seems to suggest that the 'multipart/related' rule added with the patch for bug 7168 could be insufficient, and also that making shared-mime-info return that mime tipe instead of message/rfc822 could even be wrong (since they could very well be encoded in text/plain or text/html). So, I'll be working in a patch for fixing this issue, at least in WebKitGTK. Otherwise, the efforts done in bug 89872 and bug 89873 will be pointless, at least for GTK. [1] http://tools.ietf.org/html/rfc822 [2] http://tools.ietf.org/html/rfc2557#section-9.1 657641 1 149543 mario 2012-06-26 09:19:03 -0700 Created attachment 149543 Patch proposal Attaching patch that adds 'message/rfc822' to the list of supported MIME types when MHTML is enabled. The tests for this changeset is the fact that we add new expectations to platform/gtk/mhtml, that will be taken into consideration as soon as we enable MHTML by default at build time (bug+patch coming soon) 659348 2 mario 2012-06-28 02:11:13 -0700 As the author of the the commit adding MHTML read support in WebCore [1], I'm adding Jay Civelli to CC. He could probably be interested in providing feedback about to the following doubts I still have: - Do you agree with this bug and with the proposed solution? (at the moment the current patch is meant to affect GTK only) - As test expectations are identical for GTK than for chromium, would you agree with moving them out from platform/chromium/mhtml to mhtml/? Or would it be better to introduce new expectations files for GTK (even if they are identical) under platform/gtk/mhtml? About the second one, I think it would be better to share expectations (thus moving to mhtml/). After all, platforms building without the MHTML feature enabled will skip that directory when running the tests. [1] http://trac.webkit.org/changeset/87189 672197 3 mario 2012-07-18 03:33:11 -0700 Ping reviewers? 672202 4 149543 cgarcia 2012-07-18 03:40:28 -0700 Comment on attachment 149543 Patch proposal I guess we can land this patch for now, and simply move the test expectation later if chromium guys agree on it. 672467 5 jcivelli 2012-07-18 10:02:47 -0700 Sorry for the late reply. I am OK with adding message/rfc822 as a MHTML mime-type. For the test expectations, yes, we should share them. Feel free to make that in a subsequent patch. Thanks. 672480 6 mario 2012-07-18 10:17:26 -0700 (In reply to comment #5) > Sorry for the late reply. > I am OK with adding message/rfc822 as a MHTML mime-type. > > For the test expectations, yes, we should share them. > Feel free to make that in a subsequent patch. Great. Now I need to leave but I will take care of updating the patch tomorrow already. Thanks for the review. 673366 7 mario 2012-07-19 04:00:04 -0700 Committed r123088: <http://trac.webkit.org/changeset/123088> 149543 2012-06-26 09:19:03 -0700 2012-07-18 03:40:28 -0700 Patch proposal 0001-2012-06-26-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 12083 mario RnJvbSA3MDJiMWJiNTRiZTk0M2M0MTgyOTBlYzcyNmVlZjk4MzU1M2JkMTI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUaHUsIDIxIEp1biAyMDEyIDExOjU4OjU3ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMi0wNi0yNiAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFtHVEtdIE1IVE1MIGZpbGVzIG5vdCBiZWluZyBsb2FkZWQgZHVlIHRvIHJlcG9y dGVkIG1pbWUgdHlwZSBub3Qgc3VwcG9ydGVkCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg5OTc4CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKICAgICAgICBNYWtlICdtZXNzYWdlL3JmYzgyMicgYSBzdXBwb3J0ZWQgTUlNRSB0eXBl IGZvciBNSFRNTCBmaWxlcyBpbiBHVEsuCgogICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxv YWRlci5jcHA6CiAgICAgICAgKFdlYkNvcmU6Ok1haW5SZXNvdXJjZUxvYWRlcjo6Y29udGludWVB ZnRlckNvbnRlbnRQb2xpY3kpOiBBZGQKICAgICAgICAnbWVzc2FnZS9yZmM4MjInIHRvIHRoZSBs aXN0IG9mIE1JTUUgdHlwZXMgdG8gYmUgY29uc2lkZXJlZCB0bwogICAgICAgIGF2b2lkIHRoZW0g YnlwYXNpbmcgY3Jvc3MtZG9tYWluIHNlY3VyaXR5IGNoZWNrcywgb25seSBmb3IgR1RLLgogICAg ICAgICogbG9hZGVyL2FyY2hpdmUvQXJjaGl2ZUZhY3RvcnkuY3BwOgogICAgICAgIChXZWJDb3Jl OjphcmNoaXZlTUlNRVR5cGVzKTogQWRkICdtZXNzYWdlL3JmYzgyMicgdG8gdGhlIGxpc3Qgb2YK ICAgICAgICBzdXBwb3J0ZWQgTUlNRSB0eXBlcyB3aGVuIE1IVE1MIHN1cHBvcnQgaXMgZW5hYmxl ZCBpbiBHVEsuCgoyMDEyLTA2LTI2ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdh bGlhLmNvbT4KCiAgICAgICAgW0dUS10gTUhUTUwgZmlsZXMgbm90IGJlaW5nIGxvYWRlZCBkdWUg dG8gcmVwb3J0ZWQgbWltZSB0eXBlIG5vdCBzdXBwb3J0ZWQKICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk5NzgKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgogICAgICAgIFByb3ZpZGUgR1RLIHNwZWNpZmljIGV4cGVjdGF0aW9ucyBm b3IgTUhUTUwgdGVzdHMsIGFzIGNocm9taXVtLgoKICAgICAgICAqIHBsYXRmb3JtL2d0ay9taHRt bC9tdWx0aV9mcmFtZXNfYmluYXJ5LWV4cGVjdGVkLnR4dDogQWRkZWQuCiAgICAgICAgKiBwbGF0 Zm9ybS9ndGsvbWh0bWwvbXVsdGlfZnJhbWVzX2llLWV4cGVjdGVkLnR4dDogQWRkZWQuCiAgICAg ICAgKiBwbGF0Zm9ybS9ndGsvbWh0bWwvbXVsdGlfZnJhbWVzX3VubWh0LWV4cGVjdGVkLnR4dDog QWRkZWQuCiAgICAgICAgKiBwbGF0Zm9ybS9ndGsvbWh0bWwvcGFnZV93aXRoX2Nzc19hbmRfanNf aWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KICAgICAgICAqIHBsYXRmb3JtL2d0ay9taHRtbC9wYWdl X3dpdGhfY3NzX2FuZF9qc191bm1odC1leHBlY3RlZC50eHQ6IEFkZGVkLgogICAgICAgICogcGxh dGZvcm0vZ3RrL21odG1sL3BhZ2Vfd2l0aF9pbWFnZV9pZS1leHBlY3RlZC50eHQ6IEFkZGVkLgog ICAgICAgICogcGxhdGZvcm0vZ3RrL21odG1sL3BhZ2Vfd2l0aF9pbWFnZV91bm1odC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgogICAgICAgICogcGxhdGZvcm0vZ3RrL21odG1sL3NpbXBsZV9wYWdlX2ll LWV4cGVjdGVkLnR4dDogQWRkZWQuCiAgICAgICAgKiBwbGF0Zm9ybS9ndGsvbWh0bWwvc2ltcGxl X3BhZ2VfdW5taHQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KLS0tCiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKysrKysrCiAuLi4v Z3RrL21odG1sL211bHRpX2ZyYW1lc19iaW5hcnktZXhwZWN0ZWQudHh0ICAgICB8ICAgMzEgKysr KysrKysrKysrKysrKysrKysKIC4uLi9ndGsvbWh0bWwvbXVsdGlfZnJhbWVzX2llLWV4cGVjdGVk LnR4dCAgICAgICAgIHwgICAzMSArKysrKysrKysrKysrKysrKysrKwogLi4uL2d0ay9taHRtbC9t dWx0aV9mcmFtZXNfdW5taHQtZXhwZWN0ZWQudHh0ICAgICAgfCAgIDMxICsrKysrKysrKysrKysr KysrKysrCiAuLi4vZ3RrL21odG1sL3BhZ2Vfd2l0aF9jc3NfYW5kX2pzX2llLWV4cGVjdGVkLnR4 dCB8ICAgIDYgKysrKwogLi4uL21odG1sL3BhZ2Vfd2l0aF9jc3NfYW5kX2pzX3VubWh0LWV4cGVj dGVkLnR4dCAgfCAgICA2ICsrKysKIC4uLi9ndGsvbWh0bWwvcGFnZV93aXRoX2ltYWdlX2llLWV4 cGVjdGVkLnR4dCAgICAgIHwgICAgMyArKwogLi4uL2d0ay9taHRtbC9wYWdlX3dpdGhfaW1hZ2Vf dW5taHQtZXhwZWN0ZWQudHh0ICAgfCAgICAzICsrCiAuLi4vcGxhdGZvcm0vZ3RrL21odG1sL3Np bXBsZV9wYWdlX2llLWV4cGVjdGVkLnR4dCB8ICAgIDMgKysKIC4uLi9ndGsvbWh0bWwvc2ltcGxl X3BhZ2VfdW5taHQtZXhwZWN0ZWQudHh0ICAgICAgIHwgICAgMyArKwogU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE3ICsrKysrKysrKysrCiBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcCAgICAgICB8ICAgIDYg KysrLQogU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvQXJjaGl2ZUZhY3RvcnkuY3BwICAg fCAgICAzICsrCiAxMyBmaWxlcyBjaGFuZ2VkLCAxNjEgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv bigtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9t dWx0aV9mcmFtZXNfYmluYXJ5LWV4cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9tdWx0aV9mcmFtZXNfaWUtZXhwZWN0ZWQudHh0CiBj cmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL211bHRpX2Zy YW1lc191bm1odC1leHBlY3RlZC50eHQKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvbWh0bWwvcGFnZV93aXRoX2Nzc19hbmRfanNfaWUtZXhwZWN0ZWQudHh0CiBj cmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL3BhZ2Vfd2l0 aF9jc3NfYW5kX2pzX3VubWh0LWV4cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9wYWdlX3dpdGhfaW1hZ2VfaWUtZXhwZWN0ZWQudHh0 CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL3BhZ2Vf d2l0aF9pbWFnZV91bm1odC1leHBlY3RlZC50eHQKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvc2ltcGxlX3BhZ2VfaWUtZXhwZWN0ZWQudHh0CiBjcmVh dGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL3NpbXBsZV9wYWdl X3VubWh0LWV4cGVjdGVkLnR4dAoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhNzFiNDQ3Li41Yjc0YmMyIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjIgQEAKKzIwMTItMDYtMjYgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBp Z2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIE1IVE1MIGZpbGVzIG5vdCBiZWluZyBsb2FkZWQg ZHVlIHRvIHJlcG9ydGVkIG1pbWUgdHlwZSBub3Qgc3VwcG9ydGVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTk3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgR1RLIHNwZWNpZmljIGV4cGVj dGF0aW9ucyBmb3IgTUhUTUwgdGVzdHMsIGFzIGNocm9taXVtLgorCisgICAgICAgICogcGxhdGZv cm0vZ3RrL21odG1sL211bHRpX2ZyYW1lc19iaW5hcnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ndGsvbWh0bWwvbXVsdGlfZnJhbWVzX2llLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL21odG1sL211bHRpX2ZyYW1lc191bm1odC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9taHRtbC9wYWdlX3dp dGhfY3NzX2FuZF9qc19pZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3Jt L2d0ay9taHRtbC9wYWdlX3dpdGhfY3NzX2FuZF9qc191bm1odC1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9taHRtbC9wYWdlX3dpdGhfaW1hZ2VfaWUtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvbWh0bWwvcGFnZV93aXRoX2lt YWdlX3VubWh0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL21o dG1sL3NpbXBsZV9wYWdlX2llLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZv cm0vZ3RrL21odG1sL3NpbXBsZV9wYWdlX3VubWh0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisKIDIw MTItMDYtMjYgIFBoaWxpcCBSb2dlcnMgIDxwZHJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBGaXgg c2V0Q3VycmVudFRpbWUgZm9yIHBhdXNlZCBhbmltYXRpb25zCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvbXVsdGlfZnJhbWVzX2JpbmFyeS1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvbXVsdGlfZnJhbWVzX2JpbmFyeS1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDliYTQ2MQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9tdWx0aV9mcmFt ZXNfYmluYXJ5LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMxIEBACitUaGlzIHBhZ2UgY29udGFp bnMgc2V2ZXJhbCBmcmFtZXMuCisKKworCitBbmQgYSByZWQgc3F1YXJlOgorCisKKworLS0tLS0t LS0KK0ZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTAtLT4tLT4nCistLS0tLS0tLQor VGhlIGZpcnN0IGZyYW1lIQorCistLS0tLS0tLQorRnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEt LWZyYW1lMS0tPi0tPicKKy0tLS0tLS0tCitUaGUgc2Vjb25kIGZyYW1lIQorCistLS0tLS0tLQor RnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEtLWZyYW1lMi0tPi0tPicKKy0tLS0tLS0tCitUaGUg dGhpcmQgZnJhbWUhCitUaGlzIG9uZSBjb250YWlucyB5ZXQgYW5vdGhlciBmcmFtZS4gV2hhdCBh IHR3aXN0IQorCisKKy0tLS0tLS0tCitGcmFtZTogJzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUy LS0+LzwhLS1mcmFtZTAtLT4tLT4nCistLS0tLS0tLQorVGhpcyBpcyBmcmFtZSA0IQorCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9tdWx0aV9mcmFtZXNfaWUt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL211bHRpX2ZyYW1l c19pZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDli YTQ2MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9t dWx0aV9mcmFtZXNfaWUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzEgQEAKK1RoaXMgcGFnZSBj b250YWlucyBzZXZlcmFsIGZyYW1lcy4KKworCisKK0FuZCBhIHJlZCBzcXVhcmU6CisKKworCist LS0tLS0tLQorRnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEtLWZyYW1lMC0tPi0tPicKKy0tLS0t LS0tCitUaGUgZmlyc3QgZnJhbWUhCisKKy0tLS0tLS0tCitGcmFtZTogJzwhLS1mcmFtZVBhdGgg Ly88IS0tZnJhbWUxLS0+LS0+JworLS0tLS0tLS0KK1RoZSBzZWNvbmQgZnJhbWUhCisKKy0tLS0t LS0tCitGcmFtZTogJzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUyLS0+LS0+JworLS0tLS0tLS0K K1RoZSB0aGlyZCBmcmFtZSEKK1RoaXMgb25lIGNvbnRhaW5zIHlldCBhbm90aGVyIGZyYW1lLiBX aGF0IGEgdHdpc3QhCisKKworLS0tLS0tLS0KK0ZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1m cmFtZTItLT4vPCEtLWZyYW1lMC0tPi0tPicKKy0tLS0tLS0tCitUaGlzIGlzIGZyYW1lIDQhCisK KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL211bHRpX2ZyYW1l c191bm1odC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvbXVs dGlfZnJhbWVzX3VubWh0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi4wOWJhNDYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL21odG1sL211bHRpX2ZyYW1lc191bm1odC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzMSBA QAorVGhpcyBwYWdlIGNvbnRhaW5zIHNldmVyYWwgZnJhbWVzLgorCisKKworQW5kIGEgcmVkIHNx dWFyZToKKworCisKKy0tLS0tLS0tCitGcmFtZTogJzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUw LS0+LS0+JworLS0tLS0tLS0KK1RoZSBmaXJzdCBmcmFtZSEKKworLS0tLS0tLS0KK0ZyYW1lOiAn PCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTEtLT4tLT4nCistLS0tLS0tLQorVGhlIHNlY29uZCBm cmFtZSEKKworLS0tLS0tLS0KK0ZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTItLT4t LT4nCistLS0tLS0tLQorVGhlIHRoaXJkIGZyYW1lIQorVGhpcyBvbmUgY29udGFpbnMgeWV0IGFu b3RoZXIgZnJhbWUuIFdoYXQgYSB0d2lzdCEKKworCistLS0tLS0tLQorRnJhbWU6ICc8IS0tZnJh bWVQYXRoIC8vPCEtLWZyYW1lMi0tPi88IS0tZnJhbWUwLS0+LS0+JworLS0tLS0tLS0KK1RoaXMg aXMgZnJhbWUgNCEKKworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0 bWwvcGFnZV93aXRoX2Nzc19hbmRfanNfaWUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vZ3RrL21odG1sL3BhZ2Vfd2l0aF9jc3NfYW5kX2pzX2llLWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNzkwNjk4Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL3BhZ2Vfd2l0aF9jc3NfYW5kX2pzX2ll LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK1RoaXMgcGFnZSB0ZXN0cyB0aGF0IENTUyBh bmQgSmF2YVNjcmlwdCByZXNvdXJjZXMgYXJlIHJldHJpZXZlZCBjb3JyZWN0bHkgZm9yIE1IVE1M IGZpbGVzLgorCitUaGVyZSBzaG91bGQgYmUgb25seSBvbmUgcmVkIHNxdWFyZSBiZWxvdzoKKwor CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9wYWdlX3dpdGhf Y3NzX2FuZF9qc191bm1odC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv bWh0bWwvcGFnZV93aXRoX2Nzc19hbmRfanNfdW5taHQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU3OTA2OTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvcGFnZV93aXRoX2Nzc19hbmRfanNfdW5taHQtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorVGhpcyBwYWdlIHRlc3RzIHRoYXQgQ1NTIGFuZCBK YXZhU2NyaXB0IHJlc291cmNlcyBhcmUgcmV0cmlldmVkIGNvcnJlY3RseSBmb3IgTUhUTUwgZmls ZXMuCisKK1RoZXJlIHNob3VsZCBiZSBvbmx5IG9uZSByZWQgc3F1YXJlIGJlbG93OgorCisKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL3BhZ2Vfd2l0aF9pbWFn ZV9pZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvcGFnZV93 aXRoX2ltYWdlX2llLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5iMjg5NTliCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L21odG1sL3BhZ2Vfd2l0aF9pbWFnZV9pZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACitU aGlzIGlzIGEgcmVkIHNxdWFyZToKKworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvbWh0bWwvcGFnZV93aXRoX2ltYWdlX3VubWh0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9taHRtbC9wYWdlX3dpdGhfaW1hZ2VfdW5taHQtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIyODk1OWIKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvcGFnZV93aXRoX2ltYWdlX3Vu bWh0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKK1RoaXMgaXMgYSByZWQgc3F1YXJlOgor CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9zaW1wbGVfcGFn ZV9pZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0bWwvc2ltcGxl X3BhZ2VfaWUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu Ljc0MTY5ZTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvbWh0 bWwvc2ltcGxlX3BhZ2VfaWUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorVGhpcyBpcyBh IHZlcnkgc2ltcGxlIHBhZ2UKKworVmVyeSBiYXNpYyBwYWdlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZ3RrL21odG1sL3NpbXBsZV9wYWdlX3VubWh0LWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9zaW1wbGVfcGFnZV91bm1odC1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzQxNjllNgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9taHRtbC9zaW1wbGVfcGFnZV91 bm1odC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACitUaGlzIGlzIGEgdmVyeSBzaW1wbGUg cGFnZQorCitWZXJ5IGJhc2ljIHBhZ2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhlZGM4MC4uOWNiZTI1NyAx MDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA2LTI2ICBNYXJpbyBTYW5jaGV6IFBy YWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBNSFRNTCBmaWxlcyBu b3QgYmVpbmcgbG9hZGVkIGR1ZSB0byByZXBvcnRlZCBtaW1lIHR5cGUgbm90IHN1cHBvcnRlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk5NzgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlICdtZXNz YWdlL3JmYzgyMicgYSBzdXBwb3J0ZWQgTUlNRSB0eXBlIGZvciBNSFRNTCBmaWxlcyBpbiBHVEsu CisKKyAgICAgICAgKiBsb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok1haW5SZXNvdXJjZUxvYWRlcjo6Y29udGludWVBZnRlckNvbnRlbnRQb2xpY3kpOiBB ZGQKKyAgICAgICAgJ21lc3NhZ2UvcmZjODIyJyB0byB0aGUgbGlzdCBvZiBNSU1FIHR5cGVzIHRv IGJlIGNvbnNpZGVyZWQgdG8KKyAgICAgICAgYXZvaWQgdGhlbSBieXBhc2luZyBjcm9zcy1kb21h aW4gc2VjdXJpdHkgY2hlY2tzLCBvbmx5IGZvciBHVEsuCisgICAgICAgICogbG9hZGVyL2FyY2hp dmUvQXJjaGl2ZUZhY3RvcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXJjaGl2ZU1JTUVUeXBl cyk6IEFkZCAnbWVzc2FnZS9yZmM4MjInIHRvIHRoZSBsaXN0IG9mCisgICAgICAgIHN1cHBvcnRl ZCBNSU1FIHR5cGVzIHdoZW4gTUhUTUwgc3VwcG9ydCBpcyBlbmFibGVkIGluIEdUSy4KKwogMjAx Mi0wNi0yNSAgSm9jZWx5biBUdXJjb3R0ZSAgPHR1cmNvdHRlLmpAZ21haWwuY29tPgogCiAgICAg ICAgIFtRdF0gR3JhcGhpY3NTdXJmYWNlOiBGaXggdGlsZSB1cGRhdGUgYXJ0aWZhY3RzIG9uIE1h YwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAppbmRleCA1 N2QwMTEzLi40OWZjYTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJl c291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNl TG9hZGVyLmNwcApAQCAtMjY2LDcgKzI2NiwxMSBAQCB2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6 Y29udGludWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5QWN0aW9uIGNvbnRlbnRQb2xpY3ksCiAg ICAgc3dpdGNoIChjb250ZW50UG9saWN5KSB7CiAgICAgY2FzZSBQb2xpY3lVc2U6IHsKICAgICAg ICAgLy8gUHJldmVudCByZW1vdGUgd2ViIGFyY2hpdmVzIGZyb20gbG9hZGluZyBiZWNhdXNlIHRo ZXkgY2FuIGNsYWltIHRvIGJlIGZyb20gYW55IGRvbWFpbiBhbmQgdGh1cyBhdm9pZCBjcm9zcy1k b21haW4gc2VjdXJpdHkgY2hlY2tzICg0MTIwMjU1KS4KLSAgICAgICAgYm9vbCBpc1JlbW90ZVdl YkFyY2hpdmUgPSAoZXF1YWxJZ25vcmluZ0Nhc2UoImFwcGxpY2F0aW9uL3gtd2ViYXJjaGl2ZSIs IG1pbWVUeXBlKSB8fCBlcXVhbElnbm9yaW5nQ2FzZSgibXVsdGlwYXJ0L3JlbGF0ZWQiLCBtaW1l VHlwZSkpCisgICAgICAgIGJvb2wgaXNSZW1vdGVXZWJBcmNoaXZlID0gKGVxdWFsSWdub3JpbmdD YXNlKCJhcHBsaWNhdGlvbi94LXdlYmFyY2hpdmUiLCBtaW1lVHlwZSkKKyNpZiBQTEFURk9STShH VEspCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGVxdWFsSWdub3JpbmdD YXNlKCJtZXNzYWdlL3JmYzgyMiIsIG1pbWVUeXBlKQorI2VuZGlmCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHx8IGVxdWFsSWdub3JpbmdDYXNlKCJtdWx0aXBhcnQvcmVsYXRl ZCIsIG1pbWVUeXBlKSkKICAgICAgICAgICAgICYmICFtX3N1YnN0aXR1dGVEYXRhLmlzVmFsaWQo KSAmJiAhU2NoZW1lUmVnaXN0cnk6OnNob3VsZFRyZWF0VVJMU2NoZW1lQXNMb2NhbCh1cmwucHJv dG9jb2woKSk7CiAgICAgICAgIGlmICghZnJhbWVMb2FkZXIoKS0+Y2xpZW50KCktPmNhblNob3dN SU1FVHlwZShtaW1lVHlwZSkgfHwgaXNSZW1vdGVXZWJBcmNoaXZlKSB7CiAgICAgICAgICAgICBm cmFtZUxvYWRlcigpLT5wb2xpY3lDaGVja2VyKCktPmNhbm5vdFNob3dNSU1FVHlwZShyKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL0FyY2hpdmVGYWN0b3J5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL0FyY2hpdmVGYWN0b3J5LmNwcAppbmRl eCA1MjFkZWIxLi5mNjk3MGFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJj aGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hp dmUvQXJjaGl2ZUZhY3RvcnkuY3BwCkBAIC02OCw2ICs2OCw5IEBAIHN0YXRpYyBBcmNoaXZlTUlN RVR5cGVzTWFwJiBhcmNoaXZlTUlNRVR5cGVzKCkKICNlbmRpZgogI2lmIEVOQUJMRShNSFRNTCkK ICAgICBtaW1lVHlwZXMuc2V0KCJtdWx0aXBhcnQvcmVsYXRlZCIsIGFyY2hpdmVGYWN0b3J5Q3Jl YXRlPE1IVE1MQXJjaGl2ZT4pOworI2lmIFBMQVRGT1JNKEdUSykKKyAgICBtaW1lVHlwZXMuc2V0 KCJtZXNzYWdlL3JmYzgyMiIsIGFyY2hpdmVGYWN0b3J5Q3JlYXRlPE1IVE1MQXJjaGl2ZT4pOwor I2VuZGlmCiAjZW5kaWYKIAogICAgIGluaXRpYWxpemVkID0gdHJ1ZTsKLS0gCjEuNy4xMC4yCgo=