321706 2013-06-28 11:46:37 +0000 Some file type association can't be changed anymore 2014-07-10 22:45:13 +0000 1 1 2 Applications systemsettings kcm_filetypes 4.10.97 Other Linux RESOLVED FIXED regression NOR major --- 1 kde faure Admc amichai2 arthur briceguido cfeck ciprian.lica dietrichmathias e.gerber eugene.shalygin+bugzilla.kde george.labuschagne hrvoje.senjan janow49420 jonan88 kfunk l12436.tw lnxusr mahen master.homer mattloss34 mklapetek oss pierino.the.living.joke rcburness rdieter rohan serhiy.int stupor_scurvy343 subscriber s_chriscollins tomboy1986 http://commits.kde.org/kdelibs/7f42bf2530090526d0150428fe58b87123317e2e 4.11.1 0 oldest_to_newest 1379942 0 kde 2013-06-28 11:46:37 +0000 The file type association dialog is broken in 4.11 beta1. When I want to change the order of the default applications for a file the setting is simply not remembered. I can remove applications from the list and I can add new ones, but I can't reorder the already existing associations. Reproducible: Always Steps to Reproduce: 1. Either go to System Settings->File associations or right click on a file in Dolphin and click Properties->File Type Options 2. Reorder the default applications for a file type and click OK. 3. Reopen the dialog Actual Results: The order of the file associations is the same as before, nothing has changed. Expected Results: The new order should be remembered. This bug only occurs for the default file type associations that are already present. When I add a new application to the list I can change its position, but all default (i.e. system-wide) MIME associations can't be reordered in any way. This may be related to Bug 319359. 1379988 1 rohan 2013-06-28 14:03:22 +0000 Seems to work for me, can you check if you have rw permissions for ~/.local/share/applications/mimeapps.list ? 1380009 2 cfeck 2013-06-28 16:10:28 +0000 It seems to depend on the file type. Here, I can reorder applications for image/jpeg, but not for video/x-ms-wmv. I have rw permission to mimeapps.list. 1380012 3 rohan 2013-06-28 16:15:32 +0000 Indeed, I can't change the order of applications for video/x-ms-wmv as well. However, this seems to be more of a UI issue since my mimeapps.list does have the correct ordering. 1380047 4 kde 2013-06-28 18:16:37 +0000 I tried it for Matroska files. Probably a general issue with foo/x-bar MIME types? 1380049 5 kde 2013-06-28 18:23:00 +0000 Addition: just tried for MP3 files, it works. It still does not work for MKVs, though. But although the correct entry is written to the mimeapps.list file, this is definitely not just a UI issue because the file still opens in the wrong application. E.g. when I have an MKV file and it has the applications mkvinfo, VLC, Handbrake (in order) and I put VLC first, it still opens in mkvinfo after saving the changes. 1380615 6 arthur 2013-07-01 16:55:18 +0000 I also observed this issue with the mkv filetype. 1384095 7 eugene.shalygin+bugzilla.kde 2013-07-17 17:54:07 +0000 I have the similar problem: can edit, for instance, image/x-eps, but can not application/rtf. Moreover, not only keditfiletype application/rtf can not save assotiation (mimeapps.list is updated), but even after $ xdg-mime default libreoffice-writer.desktop application/rtf (mimeapps.list is updated) $ xdg-mime query default application/rtf prints kate.desktop Does it mean that the problem is not in KDE? 1387626 8 master.homer 2013-08-02 12:49:57 +0000 I too have this problem using KDE 4.11 (4.10.95). @Eugene Shalygin xdg-mime uses KDE programs to query and set mime types. So if you edit xdg-mime and make detectDE set DE to gnome for example it will most likely work. I believe KDE uses ktraderclient to find out the mimetypes list (which internally pulls its data from ksycoca4), you can try this yourself using ktraderclient --mimetype application/rtf --servicetype Application. 1388072 9 master.homer 2013-08-05 14:39:18 +0000 I have done some more testing and it appears like this problem is due to how KDE handles mimetypes and their parents, it seems like it doesn't adhere to the ordering if a mimetype has a parent. For example application/rtf has the parent text/plain, and video/x-matroska application/x-matroska, if I change the order of application/rtf it's not listed properly, but if I change text/plain it does, same goes for video/x-matroska. One other thing I noticed is that the parent mimetype needs to have the same desktop files set as it's child, or the order will be screwed up, the child will list its desktop files first (excluding the ones that exist in the parent) followed by the parent's desktop files. Here is an example list of my mkv setup: mimeapps.list: application/x-matroska=vlc.desktop;ghb.desktop;mkv-extractor-gui.desktop; video/x-matroska=ghb.desktop;kde4-dragonplayer.desktop;vlc.desktop;mkv-extractor-gui.desktop; System Settings list for video/x-matroska: kde4-dragonplayer.desktop, vlc.desktop, ghb.desktop, mkv-extractor-gui.desktop As you can see it first goes through video/x-matroska and adds desktop files that are not part of the parent first, then adds the parent desktop files, in order. I hope that makes sense and that you can use this information, I have looked through the KDE code myself but it feels like it'll be like finding a needle in a haystack as I'm not very used to how the KDE code is written etc. 1388167 10 81578 master.homer 2013-08-06 04:59:12 +0000 Created attachment 81578 Should fix mimetypes not being saved properly 1388168 11 master.homer 2013-08-06 04:59:31 +0000 I looked through the code and found out where the problem is, and it is caused by this commit: https://projects.kde.org/projects/kde/kdelibs/repository/revisions/871cccc8a88a600c8f850a020d44bfc5f5858caa I have attached a patch that should fix this problem but I had to disable the fix above of it to work. The patch contains a reworked way of detecting "duplicate" mimetypes though, which should work, it did for me anyway 1388836 12 frank78ac 2013-08-10 08:02:09 +0000 *** Bug 323326 has been marked as a duplicate of this bug. *** 1388838 13 frank78ac 2013-08-10 08:04:45 +0000 *** Bug 323029 has been marked as a duplicate of this bug. *** 1388854 14 81627 master.homer 2013-08-10 09:55:24 +0000 Created attachment 81627 New version that should be slightly faster 1389961 15 dietrichmathias 2013-08-15 12:57:18 +0000 What's the actual status of the patch ? I still have this issue in 4.11. 1389996 16 l12436.tw 2013-08-15 15:15:58 +0000 i have patch this patch, but because i did not know what package need to compile or which program. when i compile all. the kde work not correct 1389999 17 l12436.tw 2013-08-15 15:19:58 +0000 ok i found, build kded. and this resolved the problem. 1390063 18 lnxusr 2013-08-15 19:08:36 +0000 Thank you Mathias. I patched and rebuilt kde4libs and it fixed the problem for me. 1390186 19 master.homer 2013-08-16 09:47:13 +0000 @Mathias Dietrich I posted it to the review board a week or so ago, but it has yet to be submitted, and they haven't replied to review request. @l12436@yahoo.com.tw The patch applies to kbuildsycoca4, which is part of kdelibs. So building that should be fine. @lnxusr@westlot.net That is good to hear, it's a very annoying problem so I hope it gets submitted soon. 1390192 20 l12436.tw 2013-08-16 10:02:56 +0000 @Mathias Tillman yeah, but i found vuild all of the code will crash the kde. only build kded could work normal. my source is using apt-get source libkdecore5, and that version is now i installed, so i did not know how that happened. anyway, now the patch will let the problem solved, i hope it could update to apt ASAP 1390242 21 lnxusr 2013-08-16 14:23:06 +0000 @Mathias Tillman: I spoke a bit too soon there. Although patching, building and installing the complete kde4libs fixed this particular problem, it ended up completely hosing my system. @l12436@yahoo.com.tw: Oh, yes it does. Things seem to work OK at first, but the whole system starts to fall apart rather quickly, and don't even think about rebooting. I'd not recommend to anyone to rebuild the complete kde4libs. I'm going to try to rebuild my second partition this weekend and try again with just kbuildsycoca4. Thankfully, I keep two identical partitions on my system for just such stupidity by me. I synch them up when I know the changes are stable. 1390244 22 master.homer 2013-08-16 14:33:22 +0000 @lnxusr@westlot.net Did you try building kde4libs without this patch before and if so, did that work? I'm pretty sure my patch shouldn't destroy a system, though I haven't tried to build and install the whole of kde4libs. 1390246 23 eugene.shalygin+bugzilla.kde 2013-08-16 14:45:54 +0000 I'm running KDE 4.11 with this patch applied since 4.11 release. So far ther are no problems 1390254 24 lnxusr 2013-08-16 14:58:05 +0000 @Mathias Tillman: I'm pretty sure my problems were due to my building and installing the complete kde4libs package, not your patch. 1390340 25 l12436.tw 2013-08-17 00:48:35 +0000 (In reply to comment #24) > @Mathias Tillman: I'm pretty sure my problems were due to my building and > installing the complete kde4libs package, not your patch. you just need to build kded, this patch just effect the kded. 1391109 26 adaptee 2013-08-20 04:06:48 +0000 *** Bug 323746 has been marked as a duplicate of this bug. *** 1391112 27 adaptee 2013-08-20 04:37:03 +0000 *** Bug 323750 has been marked as a duplicate of this bug. *** 1392687 28 faure 2013-08-26 13:51:40 +0000 Git commit 7f42bf2530090526d0150428fe58b87123317e2e by David Faure. Committed on 26/08/2013 at 13:46. Pushed by dfaure into branch 'KDE/4.11'. Fix reordering of apps for a derived mimetype. This fixes a bug introduced by 871cccc8a88a60 that made it impossible to re-order file type associations both in System settings and in the open with list. Hence it contains a new way of detecting duplicate (inherited) mimetype entries, that the original was supposed to fix. Unittest is in kde-runtime, commit 967979f (if I can commit it fast enough ;) Patch by Mathias Tillman. REVIEW: 111951 FIXED-IN: 4.11.1 M +36 -9 kdecore/services/kservice.cpp M +1 -1 kded/kbuildservicefactory.cpp M +0 -25 kded/kmimeassociations.cpp M +0 -1 kded/kmimeassociations.h http://commits.kde.org/kdelibs/7f42bf2530090526d0150428fe58b87123317e2e 1392881 29 adaptee 2013-08-27 08:37:26 +0000 *** Bug 324098 has been marked as a duplicate of this bug. *** 1404187 30 faure 2013-10-18 07:41:10 +0000 Git commit f723e2e7d36b597c5262bf63dde380d89ec6bfcb by David Faure. Committed on 18/10/2013 at 07:44. Pushed by dfaure into branch 'KDE/4.11'. Fix association-with-derived-mimetype again. 871cccc8a88a made it impossible to re-order file type associations. 7f42bf253009 fixed that, but changed the value of KService::mimeTypes(), which broke okular. This new fix works the same way, but only inside kbuildsycoca when it processes the mimetypes. The value of KService::mimeTypes() is now restored to be exactly what's in the desktop file. FIXED-IN: 4.11.3 M +9 -36 kdecore/services/kservice.cpp M +4 -3 kdecore/tests/kservicetest.cpp M +10 -1 kded/kbuildservicefactory.cpp http://commits.kde.org/kdelibs/f723e2e7d36b597c5262bf63dde380d89ec6bfcb 1404468 31 faure 2013-10-19 08:11:13 +0000 Git commit 8bfcace7efc0feea8899f70dfc15c3050c90ea99 by David Faure. Committed on 19/10/2013 at 08:15. Pushed by dfaure into branch 'KDE/4.11'. Improve fix for association with derived mimetypes (f723e2e7d36) If a desktop file was mentionning two aliases, they would both get removed, due to is() returning true for aliases as well. M +6 -1 kded/kbuildservicefactory.cpp M +10 -4 kded/tests/kmimeassociationstest.cpp http://commits.kde.org/kdelibs/8bfcace7efc0feea8899f70dfc15c3050c90ea99 1430712 32 ciprian.lica 2014-02-14 18:26:48 +0000 I still got this bug under KDE 4.11.5. Re-ordering to vlc works for *.mp4, *.avi, *.flv, but not for *.mkv. My "Application Preference Order" is: kaffeine, vlc, handbrake, mediainfo-gui. When I change it to vlc being first and close the Edit FIletype window, kaffeine remains the default player and, when the filetype window is opened again, the list order appears to have remained unchanged. The weird thing is that if I change the list order to kaffeine, vlc, mediainfo-gui, handbrake, the change will remain effective. The same is valid for mediainfo-gui, kaffeine, vlc, handbrake. But after this last permutation, when I tried to change it to vlc, mediainfo-gui, kaffeine, handbrake, I've got instead kaffeine, vlc, mediainfo-gui, handbrake. In the end, I've removed kaffeine from the list, and vlc remained the first application. 1431444 33 rcburness 2014-02-19 00:30:57 +0000 (In reply to comment #32) > I still got this bug under KDE 4.11.5. Re-ordering to vlc works for *.mp4, > *.avi, *.flv, but not for *.mkv. My "Application Preference Order" is: > kaffeine, vlc, handbrake, mediainfo-gui. When I change it to vlc being first > and close the Edit FIletype window, kaffeine remains the default player and, > when the filetype window is opened again, the list order appears to have > remained unchanged. > > The weird thing is that if I change the list order to kaffeine, vlc, > mediainfo-gui, handbrake, the change will remain effective. The same is > valid for mediainfo-gui, kaffeine, vlc, handbrake. > > But after this last permutation, when I tried to change it to vlc, > mediainfo-gui, kaffeine, handbrake, I've got instead kaffeine, vlc, > mediainfo-gui, handbrake. > > In the end, I've removed kaffeine from the list, and vlc remained the first > application. If I remove Amarok from the list vlc can be moved to the default location. If I add Amarok back in it wants to stay at the top and changes in position (move up/down) are ignored. Running KDE 4.12.2. I will simply keep Amarok off the list for .ogg files until this gets fixed. Seems like it should be a simple fix. 1433305 34 faure 2014-03-01 09:21:04 +0000 Please investigate what happens in your ~/.local/share/applications/mimeapps.list file when making changes in the GUI, to find out if the problem is what gets written there, or the way it's interpreted. It's hard for me to reproduce such bugs because it depends on what the .desktop files for the apps say (that's the initial ordering) and what the user's mimeapps.list file says, so overall quite system-dependent. But we can narrow down the bug if you can look into mimeapps.list and find out if it's right or wrong. 1454876 35 subscriber 2014-06-13 02:50:13 +0000 I'm seeing this problem on 4.13.1. It does seem to record my changes in ~/.local/share/applications/mimeapps.list For example application/xml=kde4-kate.desktop;juffed.desktop;chromium.desktop;kde4-rekonq.desktop;kde4-kfmclient_html.desktop;firefox.desktop;opera-browser.desktop;kde4-author.desktop;kde4-okularApplication_txt.desktop;kde4-calligrawords_ascii.desktop; However rekonq keeps showing as the first mapping in system settings UI, and that is the app that will open if I click and xml file. 1456796 36 subscriber 2014-06-20 20:57:05 +0000 I can now confirm it is still a problem in 4.13.2 Whatever is going on is pecularly specific. For application/xml I have Rekonq Kate Juffed etc. in my list. I encountered the problem because I wanted Kate to be the default app. I kept moving the order to Kate was at the top and Rekonq lower in the list. But it would never seem to "take." Rekonq was always opened when I clicked on an xml file, and going back into the file association ui, it would stil show Rekonq at the top Looking at ~/.local/share/applications/mimeapps.list I would see that the change was indeed saved. The entry looks like: application/xml=kde4-kate.desktop;juffed.desktop;kde4-rekonq.desktop;chromium.desktop;kde4-kfmclient_html.desktop;firefox.desktop;opera-browser.desktop;kde4-author.desktop;kde4-okularApplication_txt.desktop;kde4-calligrawords_ascii.desktop; Deleting Rekonq from the list (using the UI) did however work. It stopped appearing in the UI and Kate was opened when I clcik an xml file. So I thought, well maybe it is reordering changes specifically that don't work. So for kicks I swapped Kate and Juffed in the order. However this DID work. Juffed was opened when I click and xml file, and the order was shown when I went bck into the UI. So then I added Rekong again. And now AGAIN rekong always shows first in the UI and always opened when clicking an xml file. Reordering it the UI does not matter. Can we please reopen this? Something is not right, even if very specific. 1456798 37 subscriber 2014-06-20 21:01:08 +0000 BTW I should add that this does not seems to be a case of Default Applications overriding the file associations. Rekonq is NOT my default web browser or default for anything. I rarely even use it. 1460573 38 cfeck 2014-07-10 22:45:13 +0000 Eric, can you please file a new bug with exact steps to reproduce on a freshly created user account? This one is most likely a different bug. 81578 2013-08-06 04:59:12 +0000 2013-08-10 09:55:24 +0000 Should fix mimetypes not being saved properly patch.patch text/plain 2522 master.homer ZGlmZiAtcnUzIGEva2RlZC9rYnVpbGRzZXJ2aWNlZmFjdG9yeS5jcHAgYi9rZGVkL2tidWlsZHNl cnZpY2VmYWN0b3J5LmNwcAotLS0gYS9rZGVkL2tidWlsZHNlcnZpY2VmYWN0b3J5LmNwcAkyMDEz LTA4LTA2IDA2OjI4OjU5LjAwMDAwMDAwMCArMDIwMAorKysgYi9rZGVkL2tidWlsZHNlcnZpY2Vm YWN0b3J5LmNwcAkyMDEzLTA4LTA2IDA1OjE4OjUxLjAwMDAwMDAwMCArMDIwMApAQCAtMTgzLDcg KzE4Myw3IEBACiAgICAgICAgICAgICAgICAgS1NlcnZpY2VPZmZlciBvZmZlcigqaXRzZXJ2KTsK ICAgICAgICAgICAgICAgICBvZmZlci5zZXRNaW1lVHlwZUluaGVyaXRhbmNlTGV2ZWwobWltZVR5 cGVJbmhlcml0YW5jZUxldmVsKTsKICAgICAgICAgICAgICAgICAvL2tEZWJ1Zyg3MDIxKSA8PCAi SU5IRVJJVEFOQ0U6IEFkZGluZyBzZXJ2aWNlIiA8PCAoKml0c2Vydikuc2VydmljZSgpLT5lbnRy eVBhdGgoKSA8PCAidG8iIDw8IG1pbWVUeXBlTmFtZSA8PCAibWltZVR5cGVJbmhlcml0YW5jZUxl dmVsPSIgPDwgbWltZVR5cGVJbmhlcml0YW5jZUxldmVsOwotICAgICAgICAgICAgICAgIG1fb2Zm ZXJIYXNoLmFkZEluaGVyaXRlZFNlcnZpY2VPZmZlciggbWltZVR5cGVOYW1lLCBvZmZlciApOwor ICAgICAgICAgICAgICAgIG1fb2ZmZXJIYXNoLmFkZFNlcnZpY2VPZmZlciggbWltZVR5cGVOYW1l LCBvZmZlciApOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpkaWZmIC1ydTMgYS9r ZGVjb3JlL3NlcnZpY2VzL2tzZXJ2aWNlLmNwcCBiL2tkZWNvcmUvc2VydmljZXMva3NlcnZpY2Uu Y3BwCi0tLSBhL2tkZWNvcmUvc2VydmljZXMva3NlcnZpY2UuY3BwCTIwMTMtMDgtMDYgMDY6Mjg6 MjIuMDAwMDAwMDAwICswMjAwCisrKyBiL2tkZWNvcmUvc2VydmljZXMva3NlcnZpY2UuY3BwCTIw MTMtMDgtMDYgMDY6MjI6NTkuMDAwMDAwMDAwICswMjAwCkBAIC0yMTYsNiArMjE2LDMzIEBACiAg ICAgbV9pbml0aWFsUHJlZmVyZW5jZSA9IGRlc2t0b3BHcm91cC5yZWFkRW50cnkoICJJbml0aWFs UHJlZmVyZW5jZSIsIDEgKTsKICAgICBlbnRyeU1hcC5yZW1vdmUoUUxhdGluMVN0cmluZygiSW5p dGlhbFByZWZlcmVuY2UiKSk7CiAKKyAgICAvLyBUaGUgZm9sbG93aW5nIHNlYXJjaGVzIHRocm91 Z2ggdGhlIGxpc3QgZm9yIGR1cGxpY2F0ZSBtaW1ldHlwZXMsIGluY2x1ZGluZyBpbmhlcml0ZWQg b25lcy4KKyAgICAvLyBGb3IgZXhhbXBsZSwgaWYgYXBwbGljYXRpb24vcnRmIGFuZCB0ZXh0L3Bs YWluIGFyZSBib3RoIGxpc3RlZCBhcHBsaWNhdGlvbi9ydGYgaXMgcmVtb3ZlZCAKKyAgICAvLyBz aW5jZSBpdCBpcyBpbmhlcml0ZWQgZnJvbSB0ZXh0L3BsYWluCisJIC8vIFRoaXMgaXMgYSByZXdv cmVkIGZpeCBmb3IgaHR0cHM6Ly9wcm9qZWN0cy5rZGUub3JnL3Byb2plY3RzL2tkZS9rZGVsaWJz L3JlcG9zaXRvcnkvcmV2aXNpb25zLzg3MWNjY2M4YTg4YTYwMGM4Zjg1MGEwMjBkNDRiZmM1ZjU4 NThjYWEKKyAgICBpZihtX3N0clR5cGUgPT0gUUxhdGluMVN0cmluZygiQXBwbGljYXRpb24iKSkg eworICAgICAgICBRTXV0YWJsZUxpc3RJdGVyYXRvcjxRU3RyaW5nPiBzdF9pdDEobHN0U2Vydmlj ZVR5cGVzKTsKKyAgICAgICAgd2hpbGUgKCBzdF9pdDEuaGFzTmV4dCgpICkgeworICAgICAgICAg ICAgY29uc3QgUVN0cmluZyBtaW1lMSA9IHN0X2l0MS5uZXh0KCk7CisgICAgICAgICAgICBLTWlt ZVR5cGU6OlB0ciBtaW1lVHlwZTEgPSBLTWltZVR5cGVSZXBvc2l0b3J5OjpzZWxmKCktPmZpbmRN aW1lVHlwZUJ5TmFtZShtaW1lMSk7CisgICAgICAgICAgICBpZighbWltZVR5cGUxKQorICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBRTGlzdEl0ZXJhdG9yPFFTdHJpbmc+ IHN0X2l0Mihsc3RTZXJ2aWNlVHlwZXMpOworICAgICAgICAgICAgd2hpbGUgKCBzdF9pdDIuaGFz TmV4dCgpICkgeworICAgICAgICAgICAgICAgIGNvbnN0IFFTdHJpbmcgbWltZTIgPSBzdF9pdDIu bmV4dCgpOworICAgICAgICAgICAgICAgIGlmKG1pbWUxID09IG1pbWUyKQorICAgICAgICAgICAg ICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgICAgIGlmKG1pbWVUeXBlMS0+aXMobWlt ZTIpKSB7CisgICAgICAgICAgICAgICAgICAgIGtEZWJ1Zyg3MDIxKTw8IlJlbW92aW5nIGR1cGxp Y2F0ZSBtaW1ldHlwZSI8PG1pbWUxPDxtaW1lMjw8ImZvciI8PGVudHJ5UGF0aDsKKyAgICAgICAg ICAgICAgICAgICAgc3RfaXQxLnJlbW92ZSgpOworICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKICAg ICAvLyBBc3NpZ24gdGhlICJpbml0aWFsIHByZWZlcmVuY2UiIHRvIGVhY2ggbWltZXR5cGUvc2Vy dmljZXR5cGUKICAgICAvLyAoYW5kIHRvIHNldCBzdWNoIHByZWZlcmVuY2VzIGluIG1lbW9yeSBm cm9tIGtidWlsZHN5Y29jYSkKICAgICBtX3NlcnZpY2VUeXBlcy5yZXNlcnZlKGxzdFNlcnZpY2VU eXBlcy5zaXplKCkpOwo= 81627 2013-08-10 09:55:24 +0000 2013-08-10 09:55:24 +0000 New version that should be slightly faster your-patch.patch text/plain 3628 master.homer ZGlmZiAtLWdpdCBhL2tkZWNvcmUvc2VydmljZXMva3NlcnZpY2UuY3BwIGIva2RlY29yZS9zZXJ2 aWNlcy9rc2VydmljZS5jcHAKaW5kZXggOGU4MTkyOWI5MTgwM2EzZWVkNTg2ZDlmYzE1Y2RkNzgx NjViNmJjZS4uM2ExZjgxOGQ1ZjcxYjZmNDQxODc1NGE1NDVlMjE1NjA3NjQxMTA2YSAxMDA2NDQK LS0tIGEva2RlY29yZS9zZXJ2aWNlcy9rc2VydmljZS5jcHAKKysrIGIva2RlY29yZS9zZXJ2aWNl cy9rc2VydmljZS5jcHAKQEAgLTIyNywxNyArMjI3LDQ1IEBAIHZvaWQgS1NlcnZpY2VQcml2YXRl Ojppbml0KCBjb25zdCBLRGVza3RvcEZpbGUgKmNvbmZpZywgS1NlcnZpY2UqIHEgKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgPDwgImhhcyBhbiBlbXB0eSBtaW1ldHlwZSEiOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgaW50IGluaXRpYWxQcmVmZXJlbmNl ID0gbV9pbml0aWFsUHJlZmVyZW5jZTsKLSAgICAgICAgaWYgKCBzdF9pdC5oYXNOZXh0KCkgKSB7 Ci0gICAgICAgICAgICAvLyBUT0RPIGJldHRlciBzeW50YXggLSBzZXBhcmF0ZSBncm91cCB3aXRo IG1pbWV0eXBlPW51bWJlciBlbnRyaWVzPwotICAgICAgICAgICAgYm9vbCBpc051bWJlcjsKLSAg ICAgICAgICAgIGNvbnN0IGludCB2YWwgPSBzdF9pdC5wZWVrTmV4dCgpLnRvSW50KCZpc051bWJl cik7Ci0gICAgICAgICAgICBpZiAoaXNOdW1iZXIpIHsKLSAgICAgICAgICAgICAgICBpbml0aWFs UHJlZmVyZW5jZSA9IHZhbDsKLSAgICAgICAgICAgICAgICBzdF9pdC5uZXh0KCk7CisKKyAgICAg ICAgLy8gVGhlIGZvbGxvd2luZyBzZWFyY2hlcyB0aHJvdWdoIHRoZSBsaXN0IGZvciBkdXBsaWNh dGUsIGluaGVyaXRlZCBtaW1ldHlwZXMKKyAgICAgICAgLy8gRm9yIGV4YW1wbGUsIGlmIGFwcGxp Y2F0aW9uL3J0ZiBhbmQgdGV4dC9wbGFpbiBhcmUgYm90aCBsaXN0ZWQgYXBwbGljYXRpb24vcnRm IGlzIHJlbW92ZWQKKyAgICAgICAgLy8gc2luY2UgaXQgaXMgaW5oZXJpdGVkIGZyb20gdGV4dC9w bGFpbgorICAgICAgICAvLyBUaGlzIGlzIGEgcmV3b3JrZWQgZml4IGZvciByZXZpc2lvbiA4NzFj Y2NjOGE4OGE2MDBjOGY4NTBhMDIwZDQ0YmZjNWY1ODU4Y2FhCisgICAgICAgIGJvb2wgc2hvdWxk QWRkID0gdHJ1ZTsKKyAgICAgICAgaWYobV9zdHJUeXBlID09IFFMYXRpbjFTdHJpbmcoIkFwcGxp Y2F0aW9uIikpIHsKKyAgICAgICAgICAgIEtNaW1lVHlwZTo6UHRyIG1pbWVUeXBlMSA9IEtNaW1l VHlwZVJlcG9zaXRvcnk6OnNlbGYoKS0+ZmluZE1pbWVUeXBlQnlOYW1lKHN0KTsKKyAgICAgICAg ICAgIGlmKG1pbWVUeXBlMSkgeworICAgICAgICAgICAgICAgIFFMaXN0SXRlcmF0b3I8UVN0cmlu Zz4gc3RfaXQyKGxzdFNlcnZpY2VUeXBlcyk7CisgICAgICAgICAgICAgICAgd2hpbGUgKCBzdF9p dDIuaGFzTmV4dCgpICkgeworICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nIG1pbWUy ID0gc3RfaXQyLm5leHQoKTsKKyAgICAgICAgICAgICAgICAgICAgLy8gRG9uJ3QgY29tcGFyZSB0 aGUgbWltZXR5cGUgd2l0aCBpdHNlbGYKKyAgICAgICAgICAgICAgICAgICAgaWYoc3QgPT0gbWlt ZTIpCisgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgICAg ICAgICAvLyBpcyBjaGVja3MgZm9yIGluaGVyaXRhbmNlIGFuZCBhbGlhc2VzLCBzbyB0aGlzIHNo b3VsZCBzdWZmaWNlCisgICAgICAgICAgICAgICAgICAgIGlmKG1pbWVUeXBlMS0+aXMobWltZTIp KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBzaG91bGRBZGQgPSBmYWxzZTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgLy8gT25seSBhZGQg dW5pcXVlIG1pbWV0eXBlcworICAgICAgICBpZihzaG91bGRBZGQpIHsKKyAgICAgICAgICAgIGlu dCBpbml0aWFsUHJlZmVyZW5jZSA9IG1faW5pdGlhbFByZWZlcmVuY2U7CisgICAgICAgICAgICBp ZiAoIHN0X2l0Lmhhc05leHQoKSApIHsKKyAgICAgICAgICAgICAgICAvLyBUT0RPIGJldHRlciBz eW50YXggLSBzZXBhcmF0ZSBncm91cCB3aXRoIG1pbWV0eXBlPW51bWJlciBlbnRyaWVzPworICAg ICAgICAgICAgICAgIGJvb2wgaXNOdW1iZXI7CisgICAgICAgICAgICAgICAgY29uc3QgaW50IHZh bCA9IHN0X2l0LnBlZWtOZXh0KCkudG9JbnQoJmlzTnVtYmVyKTsKKyAgICAgICAgICAgICAgICBp ZiAoaXNOdW1iZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgaW5pdGlhbFByZWZlcmVuY2UgPSB2 YWw7CisgICAgICAgICAgICAgICAgICAgIHN0X2l0Lm5leHQoKTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBtX3NlcnZpY2VUeXBlcy5wdXNoX2JhY2soS1Nl cnZpY2U6OlNlcnZpY2VUeXBlQW5kUHJlZmVyZW5jZShpbml0aWFsUHJlZmVyZW5jZSwgc3QpKTsK ICAgICAgICAgfQotICAgICAgICBtX3NlcnZpY2VUeXBlcy5wdXNoX2JhY2soS1NlcnZpY2U6OlNl cnZpY2VUeXBlQW5kUHJlZmVyZW5jZShpbml0aWFsUHJlZmVyZW5jZSwgc3QpKTsKICAgICB9CiAK ICAgICBpZiAoZW50cnlNYXAuY29udGFpbnMoUUxhdGluMVN0cmluZygiQWN0aW9ucyIpKSkgewpk aWZmIC0tZ2l0IGEva2RlZC9rYnVpbGRzZXJ2aWNlZmFjdG9yeS5jcHAgYi9rZGVkL2tidWlsZHNl cnZpY2VmYWN0b3J5LmNwcAppbmRleCA3Zjg5YTk5MWQwODg0NzZkOGVkOTQ3NjNlNmZhNjVkY2Mz ZDA2MDNjLi5lOGM3ZTcyNGM4ODk2NWYyMTIyYjFkMTljN2ZjNzJhMmFjNWI0MTUwIDEwMDY0NAot LS0gYS9rZGVkL2tidWlsZHNlcnZpY2VmYWN0b3J5LmNwcAorKysgYi9rZGVkL2tidWlsZHNlcnZp Y2VmYWN0b3J5LmNwcApAQCAtMTgzLDcgKzE4Myw4IEBAIHZvaWQgS0J1aWxkU2VydmljZUZhY3Rv cnk6OmNvbGxlY3RJbmhlcml0ZWRTZXJ2aWNlcyhjb25zdCBRU3RyaW5nJiBtaW1lVHlwZU5hbWUs CiAgICAgICAgICAgICAgICAgS1NlcnZpY2VPZmZlciBvZmZlcigqaXRzZXJ2KTsKICAgICAgICAg ICAgICAgICBvZmZlci5zZXRNaW1lVHlwZUluaGVyaXRhbmNlTGV2ZWwobWltZVR5cGVJbmhlcml0 YW5jZUxldmVsKTsKICAgICAgICAgICAgICAgICAvL2tEZWJ1Zyg3MDIxKSA8PCAiSU5IRVJJVEFO Q0U6IEFkZGluZyBzZXJ2aWNlIiA8PCAoKml0c2Vydikuc2VydmljZSgpLT5lbnRyeVBhdGgoKSA8 PCAidG8iIDw8IG1pbWVUeXBlTmFtZSA8PCAibWltZVR5cGVJbmhlcml0YW5jZUxldmVsPSIgPDwg bWltZVR5cGVJbmhlcml0YW5jZUxldmVsOwotICAgICAgICAgICAgICAgIG1fb2ZmZXJIYXNoLmFk ZEluaGVyaXRlZFNlcnZpY2VPZmZlciggbWltZVR5cGVOYW1lLCBvZmZlciApOworICAgICAgICAg ICAgICAgIC8vIE5vIG5lZWQgZm9yIGFkZEluaGVyaXRlZFNlcnZpY2VPZmZlciBhbnltb3JlIHNp bmNlIHdlIGFyZSBhbHJlYWR5IGNoZWNraW5nIGR1cGxpY2F0ZXMgZWxzZXdoZXJlCisgICAgICAg ICAgICAgICAgbV9vZmZlckhhc2guYWRkU2VydmljZU9mZmVyKCBtaW1lVHlwZU5hbWUsIG9mZmVy ICk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Cg==