50657 2010-12-07 16:57:16 -0800 Attribute lost with Flash plugin without mime type set 2011-01-12 03:26:05 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 52288 0 nicolas webkit-unassigned abarth aestes andersca ap aroben commit-queue eric gustavo japhet jhoneycutt mrobinson xan.lopez oldest_to_newest 318504 0 nicolas 2010-12-07 16:57:16 -0800 When a Flash animation is embedded into a page without the mime-type the <embed> tag attributes or <object> parameters are lost. I've track down this issue as only affecting ports that uses the PluginDatabase object, which means all of them EXCEPT Mac, Chromium and EFL. The problem I see is that MIME-Type are not resolved using the PluginDatabase which result into some fallback that recreates the element when the type is finally found. I currently have a fix that make sure extensions are resolved with the plugin database before going into the fallback. I still need to write a test before sending it. This issue breaks transparency of Flash animation on certain pages like this one: http://www.flashdesignerzone.com/help/transparent.htm 319024 1 ap 2010-12-08 14:10:41 -0800 So it sounds like this should affect Safari on Windows. 319034 2 nicolas 2010-12-08 14:23:37 -0800 (In reply to comment #1) > So it sounds like this should affect Safari on Windows. Right, it should if you don't already have the extension/mime information in your win registy. IIRC the windows Flash plugin installer adds an entry to it, so probably that no windows users has been affected so far. 319805 3 76140 nicolas 2010-12-09 17:13:29 -0800 Created attachment 76140 Patch 320072 4 eric 2010-12-10 03:04:25 -0800 Seems sane to me. 320152 5 76140 aroben 2010-12-10 07:37:54 -0800 Comment on attachment 76140 Patch Presumably we'll need to do something similar for WebKit2? 321969 6 nicolas 2010-12-14 08:06:37 -0800 (In reply to comment #5) > (From update of attachment 76140 [details]) > Presumably we'll need to do something similar for WebKit2? Best way to know is to test it. The patch contains a unit test so you can check what happens on platforms running WebKit2 (I'm not doing WebKit2 dev atm). 323851 7 nicolas 2010-12-17 10:21:03 -0800 I just realized the patch is missing the expected results, will update soon ... 323854 8 76888 nicolas 2010-12-17 10:23:48 -0800 Created attachment 76888 Patch 326641 9 76888 eric 2010-12-24 09:15:48 -0800 Comment on attachment 76888 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76888&action=review > LayoutTests/plugins/no-mime-with-valid-extension-expected.txt:2 > +This test checks that bug 50568 is fixed. It runs logSrc test as found in the test plugin which prints the src attribute to stdout. If the bug is present, the logSrc attrbitute that triggers the test will be lost and nothing will be displayed on screen. Uppon success, this test should display the src attribute. I believe it's "upon" :) > LayoutTests/plugins/no-mime-with-valid-extension.html:16 > +and nothing will be displayed on screen. Uppon success, this test should display the src Here is the original Upon > LayoutTests/plugins/no-mime-with-valid-extension.html:22 > + finishTest(); You could just inline the code instead of making it a function call. :) 332335 10 78531 nicolas 2011-01-11 07:56:22 -0800 Created attachment 78531 patch - Rebase against current tree reorganisation - Inline code in test - Fixed Uppon -> Upon 332695 11 78531 abarth 2011-01-11 14:55:49 -0800 Comment on attachment 78531 patch Forwarding Eric's R+. 332707 12 78531 aestes 2011-01-11 15:07:22 -0800 Comment on attachment 78531 patch View in context: https://bugs.webkit.org/attachment.cgi?id=78531&action=review > Source/WebCore/loader/FrameLoader.cpp:972 > +#if !PLATFORM(MAC) && !PLATFORM(CHROMIUM) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does Chromium or EFL > + if (mimeType.isEmpty()) > + mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(extension); > +#endif Shouldn't this code be in the relevant platforms' implementations of MIMETypeRegistry so as to not litter cross-platform code with ifdefs? I know you're probably just following a convention already established in this method, but it still seems ugly. 332722 13 nicolas 2011-01-11 15:17:32 -0800 (In reply to comment #12) > (From update of attachment 78531 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=78531&action=review > > > Source/WebCore/loader/FrameLoader.cpp:972 > > +#if !PLATFORM(MAC) && !PLATFORM(CHROMIUM) && !PLATFORM(EFL) // Mac has no PluginDatabase, nor does Chromium or EFL > > + if (mimeType.isEmpty()) > > + mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(extension); > > +#endif > > Shouldn't this code be in the relevant platforms' implementations of MIMETypeRegistry so as to not litter cross-platform code with ifdefs? I know you're probably just following a convention already established in this method, but it still seems ugly. The ifdef are only there because MAC, Chromium and ELF port have decided not to use the plugin database (we can only blame those port). Also, doing it in the paltform specific MIME database implementation is complex and forces plug-ins to be loaded at start instead of on-demand. This was my conclusion after trying it in GTK port. It fully convinced me that this approach is the right one, and it fixes bug for many port at once. 332747 14 aestes 2011-01-11 15:47:59 -0800 (In reply to comment #13) > The ifdef are only there because MAC, Chromium and ELF port have decided not to use the plugin database (we can only blame those port). Also, doing it in the paltform specific MIME database implementation is complex and forces plug-ins to be loaded at start instead of on-demand. This was my conclusion after trying it in GTK port. It fully convinced me that this approach is the right one, and it fixes bug for many port at once. I wasn't suggesting making a change that affects when plugins load. But it does seem that it would be more elegant to have only one call to make when mapping extensions to MIME types. There would be a way to provide a cross-platform implementation (e.g. MIMETypeRegistry.cpp) with exceptions for the ports that need it (e.g. MIMETypeRegistryWin.cpp), so it wouldn't be that much more complex. Also, there are other places that call getMIMETypeForExtension() (createBlobDataForFile() for instance). Is it correct that this function doesn't also consult the plugin database? Could that lead to bugs if a blob is created with an extension for which a MIME type is registered in the plugin database but not the MIMETypeRegistry? I'm not suggesting this patch isn't correct as-is in that it fixes a bug; I'm just thinking of ways it could perhaps be improved as a follow-on. 332781 15 78531 commit-queue 2011-01-11 16:33:38 -0800 Comment on attachment 78531 patch Clearing flags on attachment: 78531 Committed r75567: <http://trac.webkit.org/changeset/75567> 332782 16 commit-queue 2011-01-11 16:33:44 -0800 All reviewed patches have been landed. Closing bug. 76140 2010-12-09 17:13:29 -0800 2010-12-17 10:23:43 -0800 Patch bug-50657-20101209171327.patch text/plain 4623 nicolas ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmMmQwODAxNmU2ZTI5MzExNjg0YWU4MGZkNTIwMmViMjkwNzEzZTdhLi4wMjA5YzRj YzNmOGRjMjJiYmRhZDg0ODBiOTAzNWY1MDk2YzAwNzA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTAtMTItMDkgIE5pY29sYXMgRHVmcmVzbmUgIDxuaWNvbGFzLmR1ZnJlc25lQGNvbGxhYm9y YS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVc2UgcGx1Zy1pbiBEQiBmb3IgZXh0ZW5zaW9ucyB0byBNSU1FIHR5cGUgY29udmVydGlvbgor CisgICAgICAgIFBsdWdpbnMgZXh0ZW5zaW9uIHRvIE1JTUUgdHlwZSBjb252ZXJzaW9uIHdhcyBu b3QgdXNlZCBpbiB0aGUKKyAgICAgICAgZnJhbWVMb2FkZXIuIFRoaXMgd2FzIGNhdXNpbmcgc29t ZSBmYWxsYmFjayB0byBiZSB1c2Ugd2hpY2ggYXMgdGhlIHNpZGUKKyAgICAgICAgZWZmZWN0IG9m IGxvb3NpbmcgYWxsIHRoZSA8T0JKRUNUPiBwYXJhbWV0ZXJzIG9yIDxFTUJFRD4gYXR0cmlidXRl cy4KKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmUgdGhhdCB3ZSB0cnkgdG8gY29udmVydCB0aGUg ZXh0ZW5zaW9uIHRvIE1JTUUgdHlwZQorICAgICAgICB1c2luZyB0aGUgcGx1Z2luIGRhdGFiYXNl IGJlb2ZyZSB1c2luZyB0aGlzIGZhbGxiYWNrLgorCisgICAgICAgIEF0dHJpYnV0ZSBsb3N0IHdp dGggRmxhc2ggcGx1Z2luIHdpdGhvdXQgbWltZSB0eXBlIHNldAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA2NTcKKworICAgICAgICAqIHBsdWdpbnMv bm8tbWltZS13aXRoLXZhbGlkLWV4dGVuc2lvbi5odG1sOiBBZGRlZC4KKwogMjAxMC0xMi0wOSAg QWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsdWdpbnMvbm8t bWltZS13aXRoLXZhbGlkLWV4dGVuc2lvbi5odG1sIGIvTGF5b3V0VGVzdHMvcGx1Z2lucy9uby1t aW1lLXdpdGgtdmFsaWQtZXh0ZW5zaW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNWM2M2YyY2E5YTI1NTNk ZDJlY2FlYmYyZWJmMmIxOWU0YTVmYjQ0MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L3BsdWdpbnMvbm8tbWltZS13aXRoLXZhbGlkLWV4dGVuc2lvbi5odG1sCkBAIC0wLDAgKzEsMjMg QEAKKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICAgIGxheW91dFRl c3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBmaW5p c2hUZXN0KCkgeworICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAg ICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworICAgIH0KKzwvc2Ny aXB0PgorPHA+CitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjU3Ij5idWcgNTA1Njg8L2E+CitpcyBmaXhlZC4g SXQgcnVucyBsb2dTcmMgdGVzdCBhcyBmb3VuZCBpbiB0aGUgdGVzdCBwbHVnaW4gd2hpY2ggcHJp bnRzIHRoZSBzcmMgYXR0cmlidXRlCit0byBzdGRvdXQuIElmIHRoZSBidWcgaXMgcHJlc2VudCwg dGhlIGxvZ1NyYyBhdHRyYml0dXRlIHRoYXQgdHJpZ2dlcnMgdGhlIHRlc3Qgd2lsbCBiZSBsb3N0 CithbmQgbm90aGluZyB3aWxsIGJlIGRpc3BsYXllZCBvbiBzY3JlZW4uIFVwcG9uIHN1Y2Nlc3Ms IHRoaXMgdGVzdCBzaG91bGQgZGlzcGxheSB0aGUgc3JjCithdHRyaWJ1dGUuCis8L3A+Cis8IS0t IEVtYmVkIHRhZyB3aXRoIG1pc3NpbmcgdHlwZT0iIiBwYXJhbWV0ZXIgLS0+Cis8ZW1iZWQgaWQ9 InBsdWdpbiIgbmFtZT0icGx1Z2luIiBzcmM9InJlc291cmNlcy90ZXN0LnRlc3RuZXRzY2FwZSIg bG9nU3JjPSIxIj4KKzxzY3JpcHQ+CisgICAgZmluaXNoVGVzdCgpOworPC9zY3JpcHQ+CmRpZmYg LS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDVlYmE4 MmE5N2Y0NGVlNDJjNTZjMWE4NGVmNjdhZGU1ODEwNzFjN2QuLjEwMjJmNTRlNjJjOTgzM2FkZWM4 YTVmZDg3ZDNjMDUwYTZjNDY5ZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMTItMDkgIE5pY29sYXMg RHVmcmVzbmUgIDxuaWNvbGFzLmR1ZnJlc25lQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgcGx1Zy1pbiBEQiBmb3Ig ZXh0ZW5zaW9ucyB0byBNSU1FIHR5cGUgY29udmVydGlvbgorCisgICAgICAgIFBsdWdpbnMgZXh0 ZW5zaW9uIHRvIE1JTUUgdHlwZSBjb252ZXJzaW9uIHdhcyBub3QgdXNlZCBpbiB0aGUKKyAgICAg ICAgZnJhbWVMb2FkZXIuIFRoaXMgd2FzIGNhdXNpbmcgc29tZSBmYWxsYmFjayB0byBiZSB1c2Ug d2hpY2ggYXMgdGhlIHNpZGUKKyAgICAgICAgZWZmZWN0IG9mIGxvb3NpbmcgYWxsIHRoZSA8T0JK RUNUPiBwYXJhbWV0ZXJzIG9yIDxFTUJFRD4gYXR0cmlidXRlcy4KKyAgICAgICAgVGhpcyBwYXRj aCBlbnN1cmUgdGhhdCB3ZSB0cnkgdG8gY29udmVydCB0aGUgZXh0ZW5zaW9uIHRvIE1JTUUgdHlw ZQorICAgICAgICB1c2luZyB0aGUgcGx1Z2luIGRhdGFiYXNlIGJlb2ZyZSB1c2luZyB0aGlzIGZh bGxiYWNrLgorCisgICAgICAgIEF0dHJpYnV0ZSBsb3N0IHdpdGggRmxhc2ggcGx1Z2luIHdpdGhv dXQgbWltZSB0eXBlIHNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTA2NTcKKworICAgICAgICBUZXN0OiBwbHVnaW5zL25vLW1pbWUtd2l0aC12YWxp ZC1leHRlbnNpb24uaHRtbAorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUpOiBV c2UgUGx1Z2luRGF0YWJhc2UgZm9yIE1JTUUKKwogMjAxMC0xMi0wOSAgQWJoaXNoZWsgQXJ5YSAg PGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xh emtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCA0MjZmNDU0ZjM1ZTQwYWE4ODg0Yjg1NmFi ZWMxNWQzNmFlNTAxOWM4Li4zOGI4Yzk1MmM3MzgzNmM4MDlhYTg1Y2EzODEzNDI3MWQxZDMxMTU0 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC05NjEsOSArOTYxLDE2IEBAIHZvaWQgRnJhbWVM b2FkZXI6OmxvYWRBcmNoaXZlKFBhc3NSZWZQdHI8QXJjaGl2ZT4gcHJwQXJjaGl2ZSkKIE9iamVj dENvbnRlbnRUeXBlIEZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUoY29uc3Qg S1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlSW4pCiB7CiAgICAgU3RyaW5nIG1pbWVU eXBlID0gbWltZVR5cGVJbjsKKyAgICBTdHJpbmcgZXh0ZW5zaW9uID0gdXJsLnBhdGgoKS5zdWJz dHJpbmcodXJsLnBhdGgoKS5yZXZlcnNlRmluZCgnLicpICsgMSk7CisKICAgICAvLyBXZSBkb24n dCB1c2UgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JQYXRoKCkgYmVjYXVzZSBpdCBy ZXR1cm5zICJhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0iIHVwb24gZmFpbHVyZQogICAgIGlmICht aW1lVHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6 Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24odXJsLnBhdGgoKS5zdWJzdHJpbmcodXJsLnBhdGgoKS5y ZXZlcnNlRmluZCgnLicpICsgMSkpOworICAgICAgICBtaW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0 cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbik7CisKKyNpZiAhUExBVEZPUk0o TUFDKSAmJiAhUExBVEZPUk0oQ0hST01JVU0pICYmICFQTEFURk9STShFRkwpIC8vIE1hYyBoYXMg bm8gUGx1Z2luRGF0YWJhc2UsIG5vciBkb2VzIENocm9taXVtIG9yIEVGTAorICAgIGlmIChtaW1l VHlwZS5pc0VtcHR5KCkpCisgICAgICAgIG1pbWVUeXBlID0gUGx1Z2luRGF0YWJhc2U6Omluc3Rh bGxlZFBsdWdpbnMoKS0+TUlNRVR5cGVGb3JFeHRlbnNpb24oZXh0ZW5zaW9uKTsKKyNlbmRpZgog CiAgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIE9iamVjdENvbnRl bnRGcmFtZTsgLy8gR28gYWhlYWQgYW5kIGhvcGUgdGhhdCB3ZSBjYW4gZGlzcGxheSB0aGUgY29u dGVudC4K 76888 2010-12-17 10:23:48 -0800 2011-01-11 07:56:22 -0800 Patch bug-50657-20101217132346.patch text/plain 5410 nicolas ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5MjgzOGRmNGZmNjJiMTA4NjEyMjc2MmFlNWY0OTM2NjI1ZDcwNDllLi42ODE3ODIx ZjczZGI5ZTY1N2E1OTk5NjYzMmY3MzEyNThjY2ZmM2Q3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMTItMTcgIE5pY29sYXMgRHVmcmVzbmUgIDxuaWNvbGFzLmR1ZnJlc25lQGNvbGxhYm9y YS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVc2UgcGx1Zy1pbiBEQiBmb3IgZXh0ZW5zaW9ucyB0byBNSU1FIHR5cGUgY29udmVydGlvbgor CisgICAgICAgIFBsdWdpbnMgZXh0ZW5zaW9uIHRvIE1JTUUgdHlwZSBjb252ZXJzaW9uIHdhcyBu b3QgdXNlZCBpbiB0aGUKKyAgICAgICAgZnJhbWVMb2FkZXIuIFRoaXMgd2FzIGNhdXNpbmcgc29t ZSBmYWxsYmFjayB0byBiZSB1c2Ugd2hpY2ggYXMgdGhlIHNpZGUKKyAgICAgICAgZWZmZWN0IG9m IGxvb3NpbmcgYWxsIHRoZSA8T0JKRUNUPiBwYXJhbWV0ZXJzIG9yIDxFTUJFRD4gYXR0cmlidXRl cy4KKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmUgdGhhdCB3ZSB0cnkgdG8gY29udmVydCB0aGUg ZXh0ZW5zaW9uIHRvIE1JTUUgdHlwZQorICAgICAgICB1c2luZyB0aGUgcGx1Z2luIGRhdGFiYXNl IGJlb2ZyZSB1c2luZyB0aGlzIGZhbGxiYWNrLgorCisgICAgICAgIEF0dHJpYnV0ZSBsb3N0IHdp dGggRmxhc2ggcGx1Z2luIHdpdGhvdXQgbWltZSB0eXBlIHNldAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA2NTcKKworICAgICAgICAqIHBsdWdpbnMv bm8tbWltZS13aXRoLXZhbGlkLWV4dGVuc2lvbi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbHVn aW5zL25vLW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwog MjAxMC0xMi0wNSAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5z L25vLW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv cGx1Z2lucy9uby1taW1lLXdpdGgtdmFsaWQtZXh0ZW5zaW9uLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4xYjQyOTJjMWRiY2QxODM5NGE2NGI0ZDhjMDUxODc2YzQ5MGZiYTViCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvcGx1Z2lucy9uby1taW1lLXdpdGgtdmFsaWQtZXh0ZW5zaW9u LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAwOiBQ TFVHSU46IHNyYzogcmVzb3VyY2VzL3Rlc3QudGVzdG5ldHNjYXBlCitUaGlzIHRlc3QgY2hlY2tz IHRoYXQgYnVnIDUwNTY4IGlzIGZpeGVkLiBJdCBydW5zIGxvZ1NyYyB0ZXN0IGFzIGZvdW5kIGlu IHRoZSB0ZXN0IHBsdWdpbiB3aGljaCBwcmludHMgdGhlIHNyYyBhdHRyaWJ1dGUgdG8gc3Rkb3V0 LiBJZiB0aGUgYnVnIGlzIHByZXNlbnQsIHRoZSBsb2dTcmMgYXR0cmJpdHV0ZSB0aGF0IHRyaWdn ZXJzIHRoZSB0ZXN0IHdpbGwgYmUgbG9zdCBhbmQgbm90aGluZyB3aWxsIGJlIGRpc3BsYXllZCBv biBzY3JlZW4uIFVwcG9uIHN1Y2Nlc3MsIHRoaXMgdGVzdCBzaG91bGQgZGlzcGxheSB0aGUgc3Jj IGF0dHJpYnV0ZS4KKworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5zL25vLW1pbWUt d2l0aC12YWxpZC1leHRlbnNpb24uaHRtbCBiL0xheW91dFRlc3RzL3BsdWdpbnMvbm8tbWltZS13 aXRoLXZhbGlkLWV4dGVuc2lvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjVjNjNmMmNhOWEyNTUzZGQyZWNh ZWJmMmViZjJiMTllNGE1ZmI0NDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbHVn aW5zL25vLW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24uaHRtbApAQCAtMCwwICsxLDIzIEBACis8 c2NyaXB0PgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gZmluaXNoVGVz dCgpIHsKKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICB9Cis8L3NjcmlwdD4K KzxwPgorVGhpcyB0ZXN0IGNoZWNrcyB0aGF0IDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01MDY1NyI+YnVnIDUwNTY4PC9hPgoraXMgZml4ZWQuIEl0IHJ1 bnMgbG9nU3JjIHRlc3QgYXMgZm91bmQgaW4gdGhlIHRlc3QgcGx1Z2luIHdoaWNoIHByaW50cyB0 aGUgc3JjIGF0dHJpYnV0ZQordG8gc3Rkb3V0LiBJZiB0aGUgYnVnIGlzIHByZXNlbnQsIHRoZSBs b2dTcmMgYXR0cmJpdHV0ZSB0aGF0IHRyaWdnZXJzIHRoZSB0ZXN0IHdpbGwgYmUgbG9zdAorYW5k IG5vdGhpbmcgd2lsbCBiZSBkaXNwbGF5ZWQgb24gc2NyZWVuLiBVcHBvbiBzdWNjZXNzLCB0aGlz IHRlc3Qgc2hvdWxkIGRpc3BsYXkgdGhlIHNyYworYXR0cmlidXRlLgorPC9wPgorPCEtLSBFbWJl ZCB0YWcgd2l0aCBtaXNzaW5nIHR5cGU9IiIgcGFyYW1ldGVyIC0tPgorPGVtYmVkIGlkPSJwbHVn aW4iIG5hbWU9InBsdWdpbiIgc3JjPSJyZXNvdXJjZXMvdGVzdC50ZXN0bmV0c2NhcGUiIGxvZ1Ny Yz0iMSI+Cis8c2NyaXB0PgorICAgIGZpbmlzaFRlc3QoKTsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhMzU0NThiYzU5 YzYyN2I2YjQxMTg3YTExMWE2ZjAxNDA1MTMxNDk4Li5mNmU2NGVlOWQwY2JlODE3Y2Q0NzcyMTBh NzQ4ZTJiMDRiOWVkODcxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEwLTEyLTE3ICBOaWNvbGFzIER1ZnJl c25lICA8bmljb2xhcy5kdWZyZXNuZUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHBsdWctaW4gREIgZm9yIGV4dGVu c2lvbnMgdG8gTUlNRSB0eXBlIGNvbnZlcnRpb24KKworICAgICAgICBQbHVnaW5zIGV4dGVuc2lv biB0byBNSU1FIHR5cGUgY29udmVyc2lvbiB3YXMgbm90IHVzZWQgaW4gdGhlCisgICAgICAgIGZy YW1lTG9hZGVyLiBUaGlzIHdhcyBjYXVzaW5nIHNvbWUgZmFsbGJhY2sgdG8gYmUgdXNlIHdoaWNo IGFzIHRoZSBzaWRlCisgICAgICAgIGVmZmVjdCBvZiBsb29zaW5nIGFsbCB0aGUgPE9CSkVDVD4g cGFyYW1ldGVycyBvciA8RU1CRUQ+IGF0dHJpYnV0ZXMuCisgICAgICAgIFRoaXMgcGF0Y2ggZW5z dXJlIHRoYXQgd2UgdHJ5IHRvIGNvbnZlcnQgdGhlIGV4dGVuc2lvbiB0byBNSU1FIHR5cGUKKyAg ICAgICAgdXNpbmcgdGhlIHBsdWdpbiBkYXRhYmFzZSBiZW9mcmUgdXNpbmcgdGhpcyBmYWxsYmFj ay4KKworICAgICAgICBBdHRyaWJ1dGUgbG9zdCB3aXRoIEZsYXNoIHBsdWdpbiB3aXRob3V0IG1p bWUgdHlwZSBzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUwNjU3CisKKyAgICAgICAgVGVzdDogcGx1Z2lucy9uby1taW1lLXdpdGgtdmFsaWQtZXh0 ZW5zaW9uLmh0bWwKKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKTogVXNlIFBs dWdpbkRhdGFiYXNlIGZvciBNSU1FCisKIDIwMTAtMTItMTcgIEFyaXlhIEhpZGF5YXQgIDxhcml5 YUBzZW5jaGEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKaW5kZXggM2M4MGIyOWRjMDRiYzk2OTE1ZjQwNGFmMDdkOTM0NTFhZTU1 OTI1Zi4uNzJlZTA5ZWIwZDQwMWQ4NDQyY2YxM2E4ODVjZTFhNWVjMTE3MDNmYiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcApAQCAtOTYxLDkgKzk2MSwxNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2Fk QXJjaGl2ZShQYXNzUmVmUHRyPEFyY2hpdmU+IHBycEFyY2hpdmUpCiBPYmplY3RDb250ZW50VHlw ZSBGcmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKGNvbnN0IEtVUkwmIHVybCwg Y29uc3QgU3RyaW5nJiBtaW1lVHlwZUluKQogewogICAgIFN0cmluZyBtaW1lVHlwZSA9IG1pbWVU eXBlSW47CisgICAgU3RyaW5nIGV4dGVuc2lvbiA9IHVybC5wYXRoKCkuc3Vic3RyaW5nKHVybC5w YXRoKCkucmV2ZXJzZUZpbmQoJy4nKSArIDEpOworCiAgICAgLy8gV2UgZG9uJ3QgdXNlIE1JTUVU eXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yUGF0aCgpIGJlY2F1c2UgaXQgcmV0dXJucyAiYXBw bGljYXRpb24vb2N0ZXQtc3RyZWFtIiB1cG9uIGZhaWx1cmUKICAgICBpZiAobWltZVR5cGUuaXNF bXB0eSgpKQotICAgICAgICBtaW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBl Rm9yRXh0ZW5zaW9uKHVybC5wYXRoKCkuc3Vic3RyaW5nKHVybC5wYXRoKCkucmV2ZXJzZUZpbmQo Jy4nKSArIDEpKTsKKyAgICAgICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1F VHlwZUZvckV4dGVuc2lvbihleHRlbnNpb24pOworCisjaWYgIVBMQVRGT1JNKE1BQykgJiYgIVBM QVRGT1JNKENIUk9NSVVNKSAmJiAhUExBVEZPUk0oRUZMKSAvLyBNYWMgaGFzIG5vIFBsdWdpbkRh dGFiYXNlLCBub3IgZG9lcyBDaHJvbWl1bSBvciBFRkwKKyAgICBpZiAobWltZVR5cGUuaXNFbXB0 eSgpKQorICAgICAgICBtaW1lVHlwZSA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5z KCktPk1JTUVUeXBlRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbik7CisjZW5kaWYKIAogICAgIGlmICht aW1lVHlwZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBPYmplY3RDb250ZW50RnJhbWU7IC8v IEdvIGFoZWFkIGFuZCBob3BlIHRoYXQgd2UgY2FuIGRpc3BsYXkgdGhlIGNvbnRlbnQuCg== 78531 2011-01-11 07:56:22 -0800 2011-01-11 16:33:38 -0800 patch 0001-Use-plug-in-DB-for-extensions-to-MIME-type-convertio.patch text/plain 6378 nicolas RnJvbSA4MzgyY2NkZjc1ZTgyY2Q5NTU1ZTExNDQ3MDFiMTQ1OTlkNzZiMmI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGFzIER1ZnJlc25lIDxuaWNvbGFzLmR1ZnJlc25lQGNv bGxhYm9yYS5jby51az4KRGF0ZTogVHVlLCA3IERlYyAyMDEwIDEwOjE0OjA0IC0wODAwClN1Ympl Y3Q6IFtQQVRDSF0gVXNlIHBsdWctaW4gREIgZm9yIGV4dGVuc2lvbnMgdG8gTUlNRSB0eXBlIGNv bnZlcnRpb24KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKUGx1Z2lucyBleHRlbnNpb24g dG8gTUlNRSB0eXBlIGNvbnZlcnNpb24gd2FzIG5vdCB1c2VkIGluIHRoZQpmcmFtZUxvYWRlci4g VGhpcyB3YXMgY2F1c2luZyBzb21lIGZhbGxiYWNrIHRvIGJlIHVzZSB3aGljaCBhcyB0aGUgc2lk ZQplZmZlY3Qgb2YgbG9vc2luZyBhbGwgdGhlIDxPQkpFQ1Q+IHBhcmFtZXRlcnMgb3IgPEVNQkVE PiBhdHRyaWJ1dGVzLgpUaGlzIHBhdGNoIGVuc3VyZSB0aGF0IHdlIHRyeSB0byBjb252ZXJ0IHRo ZSBleHRlbnNpb24gdG8gTUlNRSB0eXBlCnVzaW5nIHRoZSBwbHVnaW4gZGF0YWJhc2UgYmVvZnJl IHVzaW5nIHRoaXMgZmFsbGJhY2suCgpBdHRyaWJ1dGUgbG9zdCB3aXRoIEZsYXNoIHBsdWdpbiB3 aXRob3V0IG1pbWUgdHlwZSBzZXQKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUwNjU3Ci0tLQogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDE4ICsrKysrKysrKysrKysrKysrKwogLi4uL25vLW1pbWUtd2l0aC12YWxp ZC1leHRlbnNpb24tZXhwZWN0ZWQudHh0ICAgICAgfCAgICA0ICsrKysKIC4uLi9wbHVnaW5zL25v LW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24uaHRtbCAgICAgIHwgICAxOSArKysrKysrKysrKysr KysrKysrCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMjAgKysrKysrKysrKysrKysrKysrKysKIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAgICAgICAgICAgICAgIHwgICAgOSArKysrKysrKy0KIDUgZmlsZXMgY2hhbmdl ZCwgNjkgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBM YXlvdXRUZXN0cy9wbHVnaW5zL25vLW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24tZXhwZWN0ZWQu dHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvcGx1Z2lucy9uby1taW1lLXdpdGgt dmFsaWQtZXh0ZW5zaW9uLmh0bWwKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjExNTc0MC4uZDJkNWY4MiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIxIEBACisyMDExLTAxLTEwICBOaWNvbGFzIER1ZnJlc25lICA8bmljb2xhcy5kdWZy ZXNuZUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIHBsdWctaW4gREIgZm9yIGV4dGVuc2lvbnMgdG8gTUlNRSB0eXBl IGNvbnZlcnRpb24KKworICAgICAgICBQbHVnaW5zIGV4dGVuc2lvbiB0byBNSU1FIHR5cGUgY29u dmVyc2lvbiB3YXMgbm90IHVzZWQgaW4gdGhlCisgICAgICAgIGZyYW1lTG9hZGVyLiBUaGlzIHdh cyBjYXVzaW5nIHNvbWUgZmFsbGJhY2sgdG8gYmUgdXNlIHdoaWNoIGFzIHRoZSBzaWRlCisgICAg ICAgIGVmZmVjdCBvZiBsb29zaW5nIGFsbCB0aGUgPE9CSkVDVD4gcGFyYW1ldGVycyBvciA8RU1C RUQ+IGF0dHJpYnV0ZXMuCisgICAgICAgIFRoaXMgcGF0Y2ggZW5zdXJlIHRoYXQgd2UgdHJ5IHRv IGNvbnZlcnQgdGhlIGV4dGVuc2lvbiB0byBNSU1FIHR5cGUKKyAgICAgICAgdXNpbmcgdGhlIHBs dWdpbiBkYXRhYmFzZSBiZW9mcmUgdXNpbmcgdGhpcyBmYWxsYmFjay4KKworICAgICAgICBBdHRy aWJ1dGUgbG9zdCB3aXRoIEZsYXNoIHBsdWdpbiB3aXRob3V0IG1pbWUgdHlwZSBzZXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjU3CisKKyAgICAg ICAgKiBwbHVnaW5zL25vLW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24uaHRtbDogQWRkZWQuCisg ICAgICAgICogcGx1Z2lucy9uby1taW1lLXdpdGgtdmFsaWQtZXh0ZW5zaW9uLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisKIDIwMTEtMDEtMTAgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBzb21lIG5ldyB0ZXN0cyB0byB0aGUgV2luZG93cyBTa2lwcGVkIGZpbGUK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsdWdpbnMvbm8tbWltZS13aXRoLXZhbGlkLWV4dGVu c2lvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL25vLW1pbWUtd2l0aC12YWxp ZC1leHRlbnNpb24tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjMxZTIzODYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL25vLW1p bWUtd2l0aC12YWxpZC1leHRlbnNpb24tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNCBAQAorQ09O U09MRSBNRVNTQUdFOiBsaW5lIDA6IFBMVUdJTjogc3JjOiByZXNvdXJjZXMvdGVzdC50ZXN0bmV0 c2NhcGUKK1RoaXMgdGVzdCBjaGVja3MgdGhhdCBidWcgNTA1NjggaXMgZml4ZWQuIEl0IHJ1bnMg bG9nU3JjIHRlc3QgYXMgZm91bmQgaW4gdGhlIHRlc3QgcGx1Z2luIHdoaWNoIHByaW50cyB0aGUg c3JjIGF0dHJpYnV0ZSB0byBzdGRvdXQuIElmIHRoZSBidWcgaXMgcHJlc2VudCwgdGhlIGxvZ1Ny YyBhdHRyYml0dXRlIHRoYXQgdHJpZ2dlcnMgdGhlIHRlc3Qgd2lsbCBiZSBsb3N0IGFuZCBub3Ro aW5nIHdpbGwgYmUgZGlzcGxheWVkIG9uIHNjcmVlbi4gVXBvbiBzdWNjZXNzLCB0aGlzIHRlc3Qg c2hvdWxkIGRpc3BsYXkgdGhlIHNyYyBhdHRyaWJ1dGUuCisKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGx1Z2lucy9uby1taW1lLXdpdGgtdmFsaWQtZXh0ZW5zaW9uLmh0bWwgYi9MYXlvdXRU ZXN0cy9wbHVnaW5zL25vLW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24uaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zYjA2ZjI3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvcGx1Z2lucy9uby1taW1lLXdpdGgtdmFsaWQtZXh0ZW5zaW9uLmh0bWwKQEAgLTAs MCArMSwxOSBAQAorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVy KSB7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKzwvc2NyaXB0Pgor PHA+CitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUwNjU3Ij5idWcgNTA1Njg8L2E+CitpcyBmaXhlZC4gSXQgcnVu cyBsb2dTcmMgdGVzdCBhcyBmb3VuZCBpbiB0aGUgdGVzdCBwbHVnaW4gd2hpY2ggcHJpbnRzIHRo ZSBzcmMgYXR0cmlidXRlCit0byBzdGRvdXQuIElmIHRoZSBidWcgaXMgcHJlc2VudCwgdGhlIGxv Z1NyYyBhdHRyYml0dXRlIHRoYXQgdHJpZ2dlcnMgdGhlIHRlc3Qgd2lsbCBiZSBsb3N0CithbmQg bm90aGluZyB3aWxsIGJlIGRpc3BsYXllZCBvbiBzY3JlZW4uIFVwb24gc3VjY2VzcywgdGhpcyB0 ZXN0IHNob3VsZCBkaXNwbGF5IHRoZSBzcmMKK2F0dHJpYnV0ZS4KKzwvcD4KKzwhLS0gRW1iZWQg dGFnIHdpdGggbWlzc2luZyB0eXBlPSIiIHBhcmFtZXRlciAtLT4KKzxlbWJlZCBpZD0icGx1Z2lu IiBuYW1lPSJwbHVnaW4iIHNyYz0icmVzb3VyY2VzL3Rlc3QudGVzdG5ldHNjYXBlIiBsb2dTcmM9 IjEiPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cis8L3NjcmlwdD4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBkY2UxMTg0Li4xNDUyZTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIw MTEtMDEtMTAgIE5pY29sYXMgRHVmcmVzbmUgIDxuaWNvbGFzLmR1ZnJlc25lQGNvbGxhYm9yYS5j by51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgcGx1Zy1pbiBEQiBmb3IgZXh0ZW5zaW9ucyB0byBNSU1FIHR5cGUgY29udmVydGlvbgorCisg ICAgICAgIFBsdWdpbnMgZXh0ZW5zaW9uIHRvIE1JTUUgdHlwZSBjb252ZXJzaW9uIHdhcyBub3Qg dXNlZCBpbiB0aGUKKyAgICAgICAgZnJhbWVMb2FkZXIuIFRoaXMgd2FzIGNhdXNpbmcgc29tZSBm YWxsYmFjayB0byBiZSB1c2Ugd2hpY2ggYXMgdGhlIHNpZGUKKyAgICAgICAgZWZmZWN0IG9mIGxv b3NpbmcgYWxsIHRoZSA8T0JKRUNUPiBwYXJhbWV0ZXJzIG9yIDxFTUJFRD4gYXR0cmlidXRlcy4K KyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmUgdGhhdCB3ZSB0cnkgdG8gY29udmVydCB0aGUgZXh0 ZW5zaW9uIHRvIE1JTUUgdHlwZQorICAgICAgICB1c2luZyB0aGUgcGx1Z2luIGRhdGFiYXNlIGJl b2ZyZSB1c2luZyB0aGlzIGZhbGxiYWNrLgorCisgICAgICAgIEF0dHJpYnV0ZSBsb3N0IHdpdGgg Rmxhc2ggcGx1Z2luIHdpdGhvdXQgbWltZSB0eXBlIHNldAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA2NTcKKworICAgICAgICBUZXN0OiBwbHVnaW5z L25vLW1pbWUtd2l0aC12YWxpZC1leHRlbnNpb24uaHRtbAorCisgICAgICAgICogbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpkZWZhdWx0T2Jq ZWN0Q29udGVudFR5cGUpOiBVc2UgUGx1Z2luRGF0YWJhc2UgZm9yIE1JTUUKKwogMjAxMS0wMS0x MCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2luZG93cyBidWls ZCBmaXggYWZ0ZXIgcjc1MzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRl eCA3ZjllOTEzLi4wZGY4ZGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK QEAgLTk2MCw5ICs5NjAsMTYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZEFyY2hpdmUoUGFzc1Jl ZlB0cjxBcmNoaXZlPiBwcnBBcmNoaXZlKQogT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2FkZXI6 OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYg bWltZVR5cGVJbikKIHsKICAgICBTdHJpbmcgbWltZVR5cGUgPSBtaW1lVHlwZUluOworICAgIFN0 cmluZyBleHRlbnNpb24gPSB1cmwucGF0aCgpLnN1YnN0cmluZyh1cmwucGF0aCgpLnJldmVyc2VG aW5kKCcuJykgKyAxKTsKKwogICAgIC8vIFdlIGRvbid0IHVzZSBNSU1FVHlwZVJlZ2lzdHJ5Ojpn ZXRNSU1FVHlwZUZvclBhdGgoKSBiZWNhdXNlIGl0IHJldHVybnMgImFwcGxpY2F0aW9uL29jdGV0 LXN0cmVhbSIgdXBvbiBmYWlsdXJlCiAgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKLSAgICAg ICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbih1 cmwucGF0aCgpLnN1YnN0cmluZyh1cmwucGF0aCgpLnJldmVyc2VGaW5kKCcuJykgKyAxKSk7Cisg ICAgICAgIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNp b24oZXh0ZW5zaW9uKTsKKworI2lmICFQTEFURk9STShNQUMpICYmICFQTEFURk9STShDSFJPTUlV TSkgJiYgIVBMQVRGT1JNKEVGTCkgLy8gTWFjIGhhcyBubyBQbHVnaW5EYXRhYmFzZSwgbm9yIGRv ZXMgQ2hyb21pdW0gb3IgRUZMCisgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAg bWltZVR5cGUgPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5NSU1FVHlwZUZv ckV4dGVuc2lvbihleHRlbnNpb24pOworI2VuZGlmCiAKICAgICBpZiAobWltZVR5cGUuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudEZyYW1lOyAvLyBHbyBhaGVhZCBhbmQg aG9wZSB0aGF0IHdlIGNhbiBkaXNwbGF5IHRoZSBjb250ZW50LgotLSAKMS43LjMuNAoK