73671 2011-12-02 09:58:08 -0800 [Qt] When turning off PluginsEnabled attribute then a QWebPage will still try to load plugins 2012-12-10 02:13:37 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P3 Normal --- 1 andy.shaw webkit-unassigned abecsi hausmann jturcotte pierre.rossi webkit.review.bot oldest_to_newest 513873 0 andy.shaw 2011-12-02 09:58:08 -0800 When turning off PluginsEnabled attribute then a QWebPage will still try to load plugins. The following patch to the Browser demo reproduces this when going to youtube.com --- a/demos/browser/webview.cpp +++ b/demos/browser/webview.cpp @@ -70,6 +70,7 @@ WebPage::WebPage(QObject *parent) setNetworkAccessManager(BrowserApplication::networkAccessManager()); connect(this, SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(handleUnsupportedContent(QNetworkReply*))); + settings()->setAttribute(QWebSettings::PluginsEnabled, false); } BrowserMainWindow *WebPage::mainWindow() 532050 1 121634 andy.shaw 2012-01-09 02:12:01 -0800 Created attachment 121634 Proposed patch to solve the problem I couldn't see a means to test this with the LayoutTest so if it is possible then apologies :) 782461 2 121634 pierre.rossi 2012-12-04 04:29:13 -0800 Comment on attachment 121634 Proposed patch to solve the problem LGTM, but I'm not a reviewer ;) 782462 3 webkit.review.bot 2012-12-04 04:30:38 -0800 Attachment 121634 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/ChangeLog:3: Line contains tab character. [whitespace/tab] [5] Source/WebKit/qt/ChangeLog:4: Line contains tab character. [whitespace/tab] [5] Source/WebKit/qt/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 3 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 782467 4 121634 abecsi 2012-12-04 04:54:00 -0800 Comment on attachment 121634 Proposed patch to solve the problem View in context: https://bugs.webkit.org/attachment.cgi?id=121634&action=review > Source/WebKit/qt/ChangeLog:5 > +2012-01-09 Shaw Andy <andy.shaw@digia.com> > + > + Check that plugin functionality is enabled before querying the > + database for installed plugins > + Please fix these style errors in the changelog. 782493 5 121634 jturcotte 2012-12-04 05:56:56 -0800 Comment on attachment 121634 Proposed patch to solve the problem View in context: https://bugs.webkit.org/attachment.cgi?id=121634&action=review > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1412 > + if (m_frame && m_frame->settings() && m_frame->settings()->arePluginsEnabled() && PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType)) It might be worth storing this in a local bool variable to slightly improve readability. Looks good to me otherwise too. 783445 6 177683 andy.shaw 2012-12-04 23:56:13 -0800 Created attachment 177683 Updated patch based on feedback 783596 7 177683 pierre.rossi 2012-12-05 03:32:10 -0800 Comment on attachment 177683 Updated patch based on feedback View in context: https://bugs.webkit.org/attachment.cgi?id=177683&action=review > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1360 > + if (m_frame && arePluginsEnabled) Careful, you broke the previous logic there. The mime type check should stay, and m_frame was already tested as part of arePluginsEnabled. 783603 8 177683 jturcotte 2012-12-05 03:36:34 -0800 Comment on attachment 177683 Updated patch based on feedback View in context: https://bugs.webkit.org/attachment.cgi?id=177683&action=review > Source/WebKit/qt/ChangeLog:6 > + database for installed plugins. > + > + https://bugs.webkit.org/show_bug.cgi?id=73671 Normally the summary have to be all on the first line, and the bug number on the second: Check that plugin functionality is enabled before querying the database for installed plugins. https://bugs.webkit.org/show_bug.cgi?id=73671 > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1360 > - if (PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType)) > + if (m_frame && arePluginsEnabled) I think there is a part missing :) And no need to check m_frame. 783604 9 177714 andy.shaw 2012-12-05 03:37:21 -0800 Created attachment 177714 Fixed patch 783608 10 177716 andy.shaw 2012-12-05 03:40:34 -0800 Created attachment 177716 Patch with fixed changelog and corrected code 783612 11 andy.shaw 2012-12-05 03:46:43 -0800 Thanks Pierre, Jocelyn for pointing it out, should be all good now 783691 12 177716 jturcotte 2012-12-05 06:06:39 -0800 Comment on attachment 177716 Patch with fixed changelog and corrected code r+ed. Please the cq flag to "?" by pressing "details" on the attachment if you would like us to submit the patch through the commit queue. 787116 13 177716 webkit.review.bot 2012-12-10 02:13:33 -0800 Comment on attachment 177716 Patch with fixed changelog and corrected code Clearing flags on attachment: 177716 Committed r137122: <http://trac.webkit.org/changeset/137122> 787117 14 webkit.review.bot 2012-12-10 02:13:37 -0800 All reviewed patches have been landed. Closing bug. 121634 2012-01-09 02:12:01 -0800 2012-12-04 23:56:13 -0800 Proposed patch to solve the problem patch.diff text/plain 1833 andy.shaw SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRR dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudFF0LmNwcAkocmV2aXNpb24gMTA0MzkyKQorKysgU291cmNlL1dlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTQwMiwxNCArMTQwMiwxNCBAQAogICAgIGlmICghbWltZVR5cGUubGVuZ3RoKCkpCiAgICAg ICAgIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24o ZXh0ZW5zaW9uKTsKIAotICAgIGlmICghbWltZVR5cGUubGVuZ3RoKCkpCisgICAgaWYgKCFtaW1l VHlwZS5sZW5ndGgoKSAmJiBtX2ZyYW1lICYmIG1fZnJhbWUtPnNldHRpbmdzKCkgJiYgbV9mcmFt ZS0+c2V0dGluZ3MoKS0+YXJlUGx1Z2luc0VuYWJsZWQoKSkKICAgICAgICAgbWltZVR5cGUgPSBQ bHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5NSU1FVHlwZUZvckV4dGVuc2lvbihl eHRlbnNpb24pOwogCiAgICAgaWYgKCFtaW1lVHlwZS5sZW5ndGgoKSkKICAgICAgICAgcmV0dXJu IE9iamVjdENvbnRlbnRGcmFtZTsKIAogICAgIE9iamVjdENvbnRlbnRUeXBlIHBsdWdJblR5cGUg PSBPYmplY3RDb250ZW50Tm9uZTsKLSAgICBpZiAoUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBs dWdpbnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWltZVR5cGUpKQorICAgIGlmIChtX2ZyYW1l ICYmIG1fZnJhbWUtPnNldHRpbmdzKCkgJiYgbV9mcmFtZS0+c2V0dGluZ3MoKS0+YXJlUGx1Z2lu c0VuYWJsZWQoKSAmJiBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5pc01JTUVU eXBlUmVnaXN0ZXJlZChtaW1lVHlwZSkpCiAgICAgICAgIHBsdWdJblR5cGUgPSBPYmplY3RDb250 ZW50TmV0c2NhcGVQbHVnaW47CiAgICAgZWxzZSBpZiAobV9mcmFtZS0+cGFnZSgpICYmIG1fZnJh bWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgpICYmIG1fZnJhbWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgp LT5zdXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlKSkKICAgICAgICAgcGx1Z0luVHlwZSA9IE9iamVj dENvbnRlbnRPdGhlclBsdWdpbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDQ0NDMp CisrKyBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDEzIEBACisyMDEyLTAxLTA5ICBTaGF3IEFuZHkgIDxhbmR5LnNoYXdAZGlnaWEuY29tPgorCisJ Q2hlY2sgdGhhdCBwbHVnaW4gZnVuY3Rpb25hbGl0eSBpcyBlbmFibGVkIGJlZm9yZSBxdWVyeWlu ZyB0aGUKKwlkYXRhYmFzZSBmb3IgaW5zdGFsbGVkIHBsdWdpbnMJCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6 Om9iamVjdENvbnRlbnRUeXBlKToKKwogMjAxMi0wMS0wOCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQu cmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjEwNDQyMS4K 177683 2012-12-04 23:56:13 -0800 2012-12-05 03:40:34 -0800 Updated patch based on feedback patch.diff text/plain 1912 andy.shaw SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzY2NDMpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEyLTA0ICBB bmR5IFNoYXcgIDxhbmR5LnNoYXdAZGlnaWEuY29tPgorICAgICAgICAKKyAgICAgICAgQ2hlY2sg dGhhdCBwbHVnaW4gZnVuY3Rpb25hbGl0eSBpcyBlbmFibGVkIGJlZm9yZSBxdWVyeWluZyB0aGUK KyAgICAgICAgZGF0YWJhc2UgZm9yIGluc3RhbGxlZCBwbHVnaW5zLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzY3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0 OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTItMTItMDQgIFBpZXJyZSBSb3NzaSAgPHBpZXJy ZS5yb3NzaUBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0XSBZZXQgYW5vdGhlciB1bnJldmlld2Vk IHNwZWN1bGF0aXZlIHdpbmRvd3MgYnVpbGQgZml4LiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAkocmV2 aXNpb24gMTM2NTA2KQorKysgU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM0OSwxNCArMTM0OSwxNSBAQCBP YmplY3RDb250ZW50VHlwZSBGcmFtZUxvYWRlckNsaWVudFF0OjpvCiAgICAgaWYgKCFtaW1lVHlw ZS5sZW5ndGgoKSkKICAgICAgICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1F VHlwZUZvckV4dGVuc2lvbihleHRlbnNpb24pOwogCi0gICAgaWYgKCFtaW1lVHlwZS5sZW5ndGgo KSkKKyAgICBib29sIGFyZVBsdWdpbnNFbmFibGVkID0gKG1fZnJhbWUgJiYgbV9mcmFtZS0+c2V0 dGluZ3MoKSAmJiBtX2ZyYW1lLT5zZXR0aW5ncygpLT5hcmVQbHVnaW5zRW5hYmxlZCgpKTsKKyAg ICBpZiAoYXJlUGx1Z2luc0VuYWJsZWQgJiYgIW1pbWVUeXBlLmxlbmd0aCgpKQogICAgICAgICBt aW1lVHlwZSA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPk1JTUVUeXBlRm9y RXh0ZW5zaW9uKGV4dGVuc2lvbik7CiAKICAgICBpZiAoIW1pbWVUeXBlLmxlbmd0aCgpKQogICAg ICAgICByZXR1cm4gT2JqZWN0Q29udGVudEZyYW1lOwogCiAgICAgT2JqZWN0Q29udGVudFR5cGUg cGx1Z0luVHlwZSA9IE9iamVjdENvbnRlbnROb25lOwotICAgIGlmIChQbHVnaW5EYXRhYmFzZTo6 aW5zdGFsbGVkUGx1Z2lucygpLT5pc01JTUVUeXBlUmVnaXN0ZXJlZChtaW1lVHlwZSkpCisgICAg aWYgKG1fZnJhbWUgJiYgYXJlUGx1Z2luc0VuYWJsZWQpCiAgICAgICAgIHBsdWdJblR5cGUgPSBP YmplY3RDb250ZW50TmV0c2NhcGVQbHVnaW47CiAgICAgZWxzZSBpZiAobV9mcmFtZS0+cGFnZSgp ICYmIG1fZnJhbWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgpICYmIG1fZnJhbWUtPnBhZ2UoKS0+cGx1 Z2luRGF0YSgpLT5zdXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlKSkKICAgICAgICAgcGx1Z0luVHlw ZSA9IE9iamVjdENvbnRlbnRPdGhlclBsdWdpbjsKCg== 177714 2012-12-05 03:37:21 -0800 2012-12-05 03:40:34 -0800 Fixed patch patch.diff text/plain 1970 andy.shaw SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzY2NDMpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEyLTA0ICBB bmR5IFNoYXcgIDxhbmR5LnNoYXdAZGlnaWEuY29tPgorICAgICAgICAKKyAgICAgICAgQ2hlY2sg dGhhdCBwbHVnaW4gZnVuY3Rpb25hbGl0eSBpcyBlbmFibGVkIGJlZm9yZSBxdWVyeWluZyB0aGUK KyAgICAgICAgZGF0YWJhc2UgZm9yIGluc3RhbGxlZCBwbHVnaW5zLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzY3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0 OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTItMTItMDQgIFBpZXJyZSBSb3NzaSAgPHBpZXJy ZS5yb3NzaUBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0XSBZZXQgYW5vdGhlciB1bnJldmlld2Vk IHNwZWN1bGF0aXZlIHdpbmRvd3MgYnVpbGQgZml4LiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAkocmV2 aXNpb24gMTM2NTA2KQorKysgU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM0OSwxNCArMTM0OSwxNSBAQCBP YmplY3RDb250ZW50VHlwZSBGcmFtZUxvYWRlckNsaWVudFF0OjpvCiAgICAgaWYgKCFtaW1lVHlw ZS5sZW5ndGgoKSkKICAgICAgICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1F VHlwZUZvckV4dGVuc2lvbihleHRlbnNpb24pOwogCi0gICAgaWYgKCFtaW1lVHlwZS5sZW5ndGgo KSkKKyAgICBib29sIGFyZVBsdWdpbnNFbmFibGVkID0gKG1fZnJhbWUgJiYgbV9mcmFtZS0+c2V0 dGluZ3MoKSAmJiBtX2ZyYW1lLT5zZXR0aW5ncygpLT5hcmVQbHVnaW5zRW5hYmxlZCgpKTsKKyAg ICBpZiAoYXJlUGx1Z2luc0VuYWJsZWQgJiYgIW1pbWVUeXBlLmxlbmd0aCgpKQogICAgICAgICBt aW1lVHlwZSA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPk1JTUVUeXBlRm9y RXh0ZW5zaW9uKGV4dGVuc2lvbik7CiAKICAgICBpZiAoIW1pbWVUeXBlLmxlbmd0aCgpKQogICAg ICAgICByZXR1cm4gT2JqZWN0Q29udGVudEZyYW1lOwogCiAgICAgT2JqZWN0Q29udGVudFR5cGUg cGx1Z0luVHlwZSA9IE9iamVjdENvbnRlbnROb25lOwotICAgIGlmIChQbHVnaW5EYXRhYmFzZTo6 aW5zdGFsbGVkUGx1Z2lucygpLT5pc01JTUVUeXBlUmVnaXN0ZXJlZChtaW1lVHlwZSkpCisgICAg aWYgKGFyZVBsdWdpbnNFbmFibGVkICYmIFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5z KCktPmlzTUlNRVR5cGVSZWdpc3RlcmVkKG1pbWVUeXBlKSkKICAgICAgICAgcGx1Z0luVHlwZSA9 IE9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbjsKICAgICBlbHNlIGlmIChtX2ZyYW1lLT5wYWdl KCkgJiYgbV9mcmFtZS0+cGFnZSgpLT5wbHVnaW5EYXRhKCkgJiYgbV9mcmFtZS0+cGFnZSgpLT5w bHVnaW5EYXRhKCktPnN1cHBvcnRzTWltZVR5cGUobWltZVR5cGUpKQogICAgICAgICBwbHVnSW5U eXBlID0gT2JqZWN0Q29udGVudE90aGVyUGx1Z2luOwo= 177716 2012-12-05 03:40:34 -0800 2012-12-10 02:13:33 -0800 Patch with fixed changelog and corrected code patch.diff text/plain 1959 andy.shaw SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzY2NDMpCisrKyBTb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTEyLTA0ICBB bmR5IFNoYXcgIDxhbmR5LnNoYXdAZGlnaWEuY29tPgorICAgICAgICAKKyAgICAgICAgQ2hlY2sg dGhhdCBwbHVnaW4gZnVuY3Rpb25hbGl0eSBpcyBlbmFibGVkIGJlZm9yZSBxdWVyeWluZyB0aGUg ZGF0YWJhc2UgZm9yIGluc3RhbGxlZCBwbHVnaW5zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM2NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6b2JqZWN0Q29u dGVudFR5cGUpOgorCiAyMDEyLTEyLTA0ICBQaWVycmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZGln aWEuY29tPgogCiAgICAgICAgIFtRdF0gWWV0IGFub3RoZXIgdW5yZXZpZXdlZCBzcGVjdWxhdGl2 ZSB3aW5kb3dzIGJ1aWxkIGZpeC4gCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAJKHJldmlzaW9uIDEzNjUw NikKKysrIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRR dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNDksMTQgKzEzNDksMTUgQEAgT2JqZWN0Q29udGVu dFR5cGUgRnJhbWVMb2FkZXJDbGllbnRRdDo6bwogICAgIGlmICghbWltZVR5cGUubGVuZ3RoKCkp CiAgICAgICAgIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRl bnNpb24oZXh0ZW5zaW9uKTsKIAotICAgIGlmICghbWltZVR5cGUubGVuZ3RoKCkpCisgICAgYm9v bCBhcmVQbHVnaW5zRW5hYmxlZCA9IChtX2ZyYW1lICYmIG1fZnJhbWUtPnNldHRpbmdzKCkgJiYg bV9mcmFtZS0+c2V0dGluZ3MoKS0+YXJlUGx1Z2luc0VuYWJsZWQoKSk7CisgICAgaWYgKGFyZVBs dWdpbnNFbmFibGVkICYmICFtaW1lVHlwZS5sZW5ndGgoKSkKICAgICAgICAgbWltZVR5cGUgPSBQ bHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5NSU1FVHlwZUZvckV4dGVuc2lvbihl eHRlbnNpb24pOwogCiAgICAgaWYgKCFtaW1lVHlwZS5sZW5ndGgoKSkKICAgICAgICAgcmV0dXJu IE9iamVjdENvbnRlbnRGcmFtZTsKIAogICAgIE9iamVjdENvbnRlbnRUeXBlIHBsdWdJblR5cGUg PSBPYmplY3RDb250ZW50Tm9uZTsKLSAgICBpZiAoUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBs dWdpbnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWltZVR5cGUpKQorICAgIGlmIChhcmVQbHVn aW5zRW5hYmxlZCAmJiBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5pc01JTUVU eXBlUmVnaXN0ZXJlZChtaW1lVHlwZSkpCiAgICAgICAgIHBsdWdJblR5cGUgPSBPYmplY3RDb250 ZW50TmV0c2NhcGVQbHVnaW47CiAgICAgZWxzZSBpZiAobV9mcmFtZS0+cGFnZSgpICYmIG1fZnJh bWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgpICYmIG1fZnJhbWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgp LT5zdXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlKSkKICAgICAgICAgcGx1Z0luVHlwZSA9IE9iamVj dENvbnRlbnRPdGhlclBsdWdpbjsK