124454 2013-11-16 08:31:06 -0800 [Win] WebKit version in user agent string is incorrect. 2013-11-25 15:06:19 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Unspecified RESOLVED FIXED P2 Normal --- 124548 1 peavo webkit-unassigned bfulgham commit-queue mrowe thorton oldest_to_newest 951360 0 peavo 2013-11-16 08:31:06 -0800 The WebKit version in the user agent string is outdated, it says "534+". 951361 1 217125 peavo 2013-11-16 08:35:46 -0800 Created attachment 217125 Patch 951654 2 217125 bfulgham 2013-11-18 10:20:02 -0800 Comment on attachment 217125 Patch Nice! r=me. 951660 3 217125 commit-queue 2013-11-18 10:23:15 -0800 Comment on attachment 217125 Patch Clearing flags on attachment: 217125 Committed r159430: <http://trac.webkit.org/changeset/159430> 951661 4 commit-queue 2013-11-18 10:23:16 -0800 All reviewed patches have been landed. Closing bug. 951699 5 peavo 2013-11-18 11:00:53 -0800 (In reply to comment #2) > (From update of attachment 217125 [details]) > Nice! r=me. Thanks for reviewing :) 951880 6 commit-queue 2013-11-18 16:51:38 -0800 Re-opened since this is blocked by bug 124548 951884 7 thorton 2013-11-18 16:56:45 -0800 If you want to do this, you'll have to do it in a way that doesn't involve reaching across the project boundary for random files. 952728 8 217466 peavo 2013-11-20 12:39:24 -0800 Created attachment 217466 Patch 952729 9 peavo 2013-11-20 12:41:29 -0800 (In reply to comment #7) > If you want to do this, you'll have to do it in a way that doesn't involve reaching across the project boundary for random files. Trying again :) I moved everything into the WebKit folder, and did not alter the user agent for WinApple, only WinCairo, to be on the safe side. 953167 10 217466 bfulgham 2013-11-21 10:48:33 -0800 Comment on attachment 217466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217466&action=review A really great idea. I think it needs a little bit of refinement to be right. I'd also like the Apple version to use your logic. > Source/WebKit/ChangeLog:8 > + * WebKit.vcxproj/WebKit/WebKitPreBuild.cmd: Generate WebKitVersion.h ... from OS X Version.xcconfig input file. > Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:11 > bash "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.sh" "%INTDIR%" auto-version.sh is supposed to do something clever about version, but I see that its input file is set to 534, rather than 538 (which is what we have in Version.xcconfig). I much prefer your approach, which allows us to control version in one place and keep them in sync. > Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:17 > +if not exist "%WEBKITVERSIONFILE%" bash -c 'perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%" --outputDir "%WEBKITVERSIONDIR%"' You need to make sure that %WEBKITVERSIONFILE% is deleted when you clean the project, or else it will never update when the value in Version.xcconfig changes. We should ideally drive generation of the version file based on changes to Version.xcconfig, but I'm not sure how we would do so in Visual Studio. We could add Version.xcconfig to the WebKit solution with a custom build step that would do this work, rather than having it done as part of WebKitPreBuild.cmd. Either way, this is wrong because you will get one version number from Version.xcconfig, and then it will never change again unless you delete the file. > Source/WebKit/win/WebView.cpp:2500 > +#endif Please revise as follows: #if !USE(CAIRO) LPWSTR buildNumberStringPtr; if (::LoadStringW(gInstance....) return buildNumberStringPtr; #endif return String::format("%d.%d", WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION); } 954080 11 217826 peavo 2013-11-25 13:33:58 -0800 Created attachment 217826 Patch 954083 12 peavo 2013-11-25 13:36:06 -0800 (In reply to comment #10) > (From update of attachment 217466 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217466&action=review > Thanks for looking into this, I added a custom build step to build WebKitVersion.h as you suggested :) 954100 13 217826 buildbot 2013-11-25 14:15:00 -0800 Comment on attachment 217826 Patch Attachment 217826 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/35368558 954106 14 217834 peavo 2013-11-25 14:41:39 -0800 Created attachment 217834 Patch 954116 15 217834 bfulgham 2013-11-25 15:02:32 -0800 Comment on attachment 217834 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217834&action=review Looks great! You might want to omit the macro as I describe below. But it's fine as-is. R=me. > Source/WebKit/win/WebView.cpp:2492 > +#if !USE(CAIRO) I'm not sure that we need this macro at all. If WinCairo doesn't define BUILD_NUMBER it should just do the right thing. That way, you can define it yourself for future builds. 954119 16 217834 commit-queue 2013-11-25 15:06:16 -0800 Comment on attachment 217834 Patch Clearing flags on attachment: 217834 Committed r159768: <http://trac.webkit.org/changeset/159768> 954120 17 commit-queue 2013-11-25 15:06:19 -0800 All reviewed patches have been landed. Closing bug. 217125 2013-11-16 08:35:46 -0800 2013-11-20 12:39:17 -0800 Patch bug-124454-20131116173359.patch text/plain 3287 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTM3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEzLTExLTE2ICBwZWF2b0Bv dXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5dIFdlYktpdCB2 ZXJzaW9uIGluIHVzZXIgYWdlbnQgc3RyaW5nIGlzIGluY29ycmVjdC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQ1NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRGVyaXZlZFNvdXJjZXMubWFrZTog R2VuZXJhdGUgV2ViS2l0VmVyc2lvbi5oCisKIDIwMTMtMTEtMTYgIFpvbHRhbiBIb3J2YXRoICA8 em9sdGFuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHRoZSBpbmNsdWRlIG9mIExpbmVX aWR0aC5oIGZyb20gU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv RGVyaXZlZFNvdXJjZXMubWFrZQkocmV2aXNpb24gMTU5Mzc4KQorKysgU291cmNlL1dlYkNvcmUv RGVyaXZlZFNvdXJjZXMubWFrZQkod29ya2luZyBjb3B5KQpAQCAtNzIzLDYgKzcyMyw3IEBAIGFs bCA6IFwKICAgICBNYXRoTUxFbGVtZW50RmFjdG9yeS5jcHAgXAogICAgIE1hdGhNTE5hbWVzLmNw cCBcCiAgICAgWFBhdGhHcmFtbWFyLmNwcCBcCisgICAgV2ViS2l0VmVyc2lvbi5oIFwKICMKIAog IyAtLS0tLS0tLQpAQCAtODQ1LDYgKzg0NiwxMiBAQCBYUGF0aEdyYW1tYXIuY3BwIDogeG1sL1hQ YXRoR3JhbW1hci55ICQoCiAKICMgLS0tLS0tLS0KIAorIyBXZWJLaXRWZXJzaW9uCitXZWJLaXRW ZXJzaW9uLmggOiAkKFdlYkNvcmUpLy4uL1dlYktpdC9tYWMvQ29uZmlndXJhdGlvbnMvVmVyc2lv bi54Y2NvbmZpZworCXBlcmwgJChXZWJDb3JlKS8uLi9XZWJLaXQvc2NyaXB0cy9nZW5lcmF0ZS13 ZWJraXR2ZXJzaW9uLnBsIC0tY29uZmlnICQoV2ViQ29yZSkvLi4vV2ViS2l0L21hYy9Db25maWd1 cmF0aW9ucy9WZXJzaW9uLnhjY29uZmlnIC0tb3V0cHV0RGlyIC4KKworIyAtLS0tLS0tLQorCiAj IHVzZXIgYWdlbnQgc3R5bGUgc2hlZXRzCiAKIFVTRVJfQUdFTlRfU1RZTEVfU0hFRVRTID0gJChX ZWJDb3JlKS9jc3MvaHRtbC5jc3MgJChXZWJDb3JlKS9jc3MvcXVpcmtzLmNzcyAkKFdlYkNvcmUp L2Nzcy92aWV3LXNvdXJjZS5jc3MgJChXZWJDb3JlKS9jc3MvdGhlbWVXaW4uY3NzICQoV2ViQ29y ZSkvY3NzL3RoZW1lV2luUXVpcmtzLmNzcyAkKFdlYkNvcmUpL2Nzcy9wbHVnSW5zLmNzcwpJbmRl eDogU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5Mzc4KQorKysgU291cmNlL1dlYktpdC93aW4v Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTEtMTYgIHBl YXZvQG91dGxvb2suY29tICA8cGVhdm9Ab3V0bG9vay5jb20+CisKKyAgICAgICAgW1dpbl0gV2Vi S2l0IHZlcnNpb24gaW4gdXNlciBhZ2VudCBzdHJpbmcgaXMgaW5jb3JyZWN0LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NDU0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAg ICAgICAgKHdlYktpdFZlcnNpb25TdHJpbmcpOiBDcmVhdGUgV2ViS2l0IHZlcnNpb24gc3RyaW5n IGZyb20gV2ViS2l0VmVyc2lvbi5oLgorCiAyMDEzLTExLTE1ICBKZXIgTm9ibGUgIDxqZXIubm9i bGVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgV2luIGJ1aWxkIGZpeDsgc2V0Q3Vy cmVudFRpbWUoKSBubyBsb25nZXIgdGFrZXMgYW4gZXhjZXB0aW9uIHBhcmFtZXRlci4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiAxNTkzNzgpCisrKyBTb3VyY2UvV2ViS2l0L3dp bi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDYgKzE0NCw3IEBACiAjaW5jbHVk ZSA8V2ViQ29yZS9TZXR0aW5ncy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2ltcGxlRm9udERhdGEu aD4KICNpbmNsdWRlIDxXZWJDb3JlL1N5c3RlbUluZm8uaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1dl YktpdFZlcnNpb24uaD4KICNpbmNsdWRlIDxXZWJDb3JlL1dpbmRvd01lc3NhZ2VCcm9hZGNhc3Rl ci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvV2luZG93c1RvdWNoLmg+CiAjaW5jbHVkZSA8d3RmL01h aW5UaHJlYWQuaD4KQEAgLTI0OTEsOCArMjQ5MiwxMCBAQCBib29sIFdlYlZpZXc6OmRldmVsb3Bl ckV4dHJhc0VuYWJsZWQoKSBjCiBzdGF0aWMgU3RyaW5nIHdlYktpdFZlcnNpb25TdHJpbmcoKQog ewogICAgIExQV1NUUiBidWlsZE51bWJlclN0cmluZ1B0cjsKLSAgICBpZiAoITo6TG9hZFN0cmlu Z1coZ0luc3RhbmNlLCBCVUlMRF9OVU1CRVIsIHJlaW50ZXJwcmV0X2Nhc3Q8TFBXU1RSPigmYnVp bGROdW1iZXJTdHJpbmdQdHIpLCAwKSB8fCAhYnVpbGROdW1iZXJTdHJpbmdQdHIpCi0gICAgICAg IHJldHVybiAiNTM0KyI7CisgICAgaWYgKCE6OkxvYWRTdHJpbmdXKGdJbnN0YW5jZSwgQlVJTERf TlVNQkVSLCByZWludGVycHJldF9jYXN0PExQV1NUUj4oJmJ1aWxkTnVtYmVyU3RyaW5nUHRyKSwg MCkgfHwgIWJ1aWxkTnVtYmVyU3RyaW5nUHRyKSB7CisgICAgICAgIFN0cmluZyB3ZWJLaXRWZXJz aW9uID0gU3RyaW5nOjpmb3JtYXQoIiVkLiVkIiwgV0VCS0lUX01BSk9SX1ZFUlNJT04sIFdFQktJ VF9NSU5PUl9WRVJTSU9OKTsKKyAgICAgICAgcmV0dXJuIHdlYktpdFZlcnNpb247CisgICAgfQog CiAgICAgcmV0dXJuIGJ1aWxkTnVtYmVyU3RyaW5nUHRyOwogfQo= 217466 2013-11-20 12:39:24 -0800 2013-11-25 13:33:49 -0800 Patch bug-124454-20131120213911.patch text/plain 3127 peavo SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTk1NzUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEzLTExLTIwICBwZWF2b0BvdXRs b29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5dIFdlYktpdCB2ZXJz aW9uIGluIHVzZXIgYWdlbnQgc3RyaW5nIGlzIGluY29ycmVjdC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQ1NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dl YktpdFByZUJ1aWxkLmNtZDogR2VuZXJhdGUgV2ViS2l0VmVyc2lvbi5oCisKIDIwMTMtMTEtMTkg IE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCB0cmFja2luZyBv ZiBlbmRDb2x1bW4gZm9yIEV4ZWN1dGFibGVzLgpJbmRleDogU291cmNlL1dlYktpdC9XZWJLaXQu dmN4cHJvai9XZWJLaXQvV2ViS2l0UHJlQnVpbGQuY21kCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdFByZUJ1aWxkLmNtZAkocmV2aXNpb24g MTU5NTYwKQorKysgU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXQvV2ViS2l0UHJl QnVpbGQuY21kCSh3b3JraW5nIGNvcHkpCkBAIC05LDMgKzksOSBAQCBta2RpciAyPk5VTCAiJUNP TkZJR1VSQVRJT05CVUlMRERJUiVcaW5jCiB4Y29weSAveSAvZCAiJVdFQktJVF9MSUJSQVJJRVMl XGluY2x1ZGVcSmF2YVNjcmlwdENvcmVcKiIgIiVDT05GSUdVUkFUSU9OQlVJTERESVIlXGluY2x1 ZGVcSmF2YVNjcmlwdENvcmUiCiAKIGJhc2ggIiVXRUJLSVRfTElCUkFSSUVTJVx0b29sc1xzY3Jp cHRzXGF1dG8tdmVyc2lvbi5zaCIgIiVJTlRESVIlIgorCitzZXQgV0VCS0lUVkVSU0lPTlNDUklQ VD0lUFJPSkVDVERJUiUuLlwuLlxzY3JpcHRzXGdlbmVyYXRlLXdlYmtpdHZlcnNpb24ucGwKK3Nl dCBXRUJLSVRWRVJTSU9OQ09ORklHPSVQUk9KRUNURElSJS4uXC4uXG1hY1xDb25maWd1cmF0aW9u c1xWZXJzaW9uLnhjY29uZmlnCitzZXQgV0VCS0lUVkVSU0lPTkRJUj0lQ09ORklHVVJBVElPTkJV SUxERElSJVxpbmNsdWRlXFdlYktpdAorc2V0IFdFQktJVFZFUlNJT05GSUxFPSVXRUJLSVRWRVJT SU9ORElSJVxXZWJLaXRWZXJzaW9uLmgKK2lmIG5vdCBleGlzdCAiJVdFQktJVFZFUlNJT05GSUxF JSIgYmFzaCAtYyAncGVybCAiJVdFQktJVFZFUlNJT05TQ1JJUFQlIiAtLWNvbmZpZyAiJVdFQktJ VFZFUlNJT05DT05GSUclIiAgLS1vdXRwdXREaXIgIiVXRUJLSVRWRVJTSU9ORElSJSInCkluZGV4 OiBTb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTk1NzUpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0xMS0yMCAgcGVh dm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luXSBXZWJL aXQgdmVyc2lvbiBpbiB1c2VyIGFnZW50IHN0cmluZyBpcyBpbmNvcnJlY3QuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ0NTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAg ICAgICAod2ViS2l0VmVyc2lvblN0cmluZyk6IENyZWF0ZSBXZWJLaXQgdmVyc2lvbiBzdHJpbmcg ZnJvbSBXZWJLaXRWZXJzaW9uLmguCisKIDIwMTMtMTEtMTggIENvbW1pdCBRdWV1ZSAgPGNvbW1p dC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx NTk0NTUuCkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gMTU5NTYwKQorKysgU291 cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDcg QEAKICNpbmNsdWRlICJXZWJLaXRMb2dnaW5nLmgiCiAjaW5jbHVkZSAiV2ViS2l0U3RhdGlzdGlj c1ByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRTeXN0ZW1CaXRzLmgiCisjaW5jbHVkZSAiV2Vi S2l0VmVyc2lvbi5oIgogI2luY2x1ZGUgIldlYk11dGFibGVVUkxSZXF1ZXN0LmgiCiAjaW5jbHVk ZSAiV2ViTm90aWZpY2F0aW9uQ2VudGVyLmgiCiAjaW5jbHVkZSAiV2ViUGxhdGZvcm1TdHJhdGVn aWVzLmgiCkBAIC0yNDg4LDExICsyNDg5LDE1IEBAIGJvb2wgV2ViVmlldzo6ZGV2ZWxvcGVyRXh0 cmFzRW5hYmxlZCgpIGMKIAogc3RhdGljIFN0cmluZyB3ZWJLaXRWZXJzaW9uU3RyaW5nKCkKIHsK KyNpZiBVU0UoQ0FJUk8pCisgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlZC4lZCIsIFdFQktJ VF9NQUpPUl9WRVJTSU9OLCBXRUJLSVRfTUlOT1JfVkVSU0lPTik7CisjZWxzZQogICAgIExQV1NU UiBidWlsZE51bWJlclN0cmluZ1B0cjsKICAgICBpZiAoITo6TG9hZFN0cmluZ1coZ0luc3RhbmNl LCBCVUlMRF9OVU1CRVIsIHJlaW50ZXJwcmV0X2Nhc3Q8TFBXU1RSPigmYnVpbGROdW1iZXJTdHJp bmdQdHIpLCAwKSB8fCAhYnVpbGROdW1iZXJTdHJpbmdQdHIpCiAgICAgICAgIHJldHVybiAiNTM0 KyI7CiAKICAgICByZXR1cm4gYnVpbGROdW1iZXJTdHJpbmdQdHI7CisjZW5kaWYKIH0KIAogY29u c3QgU3RyaW5nJiBXZWJWaWV3Ojp1c2VyQWdlbnRGb3JLVVJMKGNvbnN0IFVSTCYpCg== 217826 2013-11-25 13:33:58 -0800 2013-11-25 14:41:31 -0800 Patch bug-124454-20131125223352.patch text/plain 5337 peavo SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTk3NjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTExLTI1ICBwZWF2b0BvdXRs b29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5dIFdlYktpdCB2ZXJz aW9uIGluIHVzZXIgYWdlbnQgc3RyaW5nIGlzIGluY29ycmVjdC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQ1NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdlbmVyYXRlIFdlYktpdFZlcnNpb24uaCBm aWxlIGZyb20gbWFjJ3MgVmVyc2lvbi54Y2NvbmZpZyBmaWxlLgorCisgICAgICAgICogV2ViS2l0 LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hwcm9qOgorICAgICAgICAqIFdlYktpdC52Y3hwcm9q L1dlYktpdC9XZWJLaXQudmN4cHJvai5maWx0ZXJzOgorICAgICAgICAqIFdlYktpdC52Y3hwcm9q L1dlYktpdC9XZWJLaXRWZXJzaW9uLmNtZDogQWRkZWQuCisKIDIwMTMtMTEtMjMgIFhhYmllciBS b2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVh bWVyXSBSZW1vdmUgMC4xMCBjb2RlcGF0aApJbmRleDogU291cmNlL1dlYktpdC9XZWJLaXQudmN4 cHJvai9XZWJLaXQvV2ViS2l0LnZjeHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9X ZWJLaXQudmN4cHJvai9XZWJLaXQvV2ViS2l0LnZjeHByb2oJKHJldmlzaW9uIDE1OTc1OSkKKysr IFNvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hwcm9qCSh3b3Jr aW5nIGNvcHkpCkBAIC01MDUsNiArNTA1LDExIEBACiAgIDwvSXRlbUdyb3VwPgogICA8SXRlbUdy b3VwPgogICAgIDxOb25lIEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxvYmokKFBs YXRmb3JtQXJjaGl0ZWN0dXJlKVxXZWJLaXRFeHBvcnRHZW5lcmF0b3JcV2ViS2l0RXhwb3J0cy5k ZWYiIC8+CisgICAgPEN1c3RvbUJ1aWxkIEluY2x1ZGU9Ii4uXC4uXG1hY1xDb25maWd1cmF0aW9u c1xWZXJzaW9uLnhjY29uZmlnIj4KKyAgICAgIDxGaWxlVHlwZT5Eb2N1bWVudDwvRmlsZVR5cGU+ CisgICAgICA8Q29tbWFuZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0p Jz09J1JlbGVhc2VfV2luQ2Fpcm98V2luMzInIj5XZWJLaXRWZXJzaW9uLmNtZDwvQ29tbWFuZD4K KyAgICAgIDxPdXRwdXRzIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSkn PT0nUmVsZWFzZV9XaW5DYWlyb3xXaW4zMiciPldlYktpdFZlcnNpb24uaDwvT3V0cHV0cz4KKyAg ICA8L0N1c3RvbUJ1aWxkPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXC4uXHdpblxXZWJLaXQucmVz b3VyY2VzXGRlbGV0ZUJ1dHRvbi5wbmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cLi5cd2lu XFdlYktpdC5yZXNvdXJjZXNcZGVsZXRlQnV0dG9uUHJlc3NlZC5wbmciIC8+CiAgICAgPE5vbmUg SW5jbHVkZT0iLi5cLi5cd2luXFdlYktpdC5yZXNvdXJjZXNcZnNWaWRlb0F1ZGlvVm9sdW1lSGln aC5wbmciIC8+CkBAIC01MzQsNiArNTM5LDcgQEAKICAgICA8Tm9uZSBJbmNsdWRlPSJXZWJLaXRQ b3N0QnVpbGQuY21kIiAvPgogICAgIDxOb25lIEluY2x1ZGU9IldlYktpdFByZUJ1aWxkLmNtZCIg Lz4KICAgICA8Tm9uZSBJbmNsdWRlPSJXZWJLaXRQcmVMaW5rLmNtZCIgLz4KKyAgICA8Tm9uZSBJ bmNsdWRlPSJXZWJLaXRWZXJzaW9uLmNtZCIgLz4KICAgPC9JdGVtR3JvdXA+CiAgIDxJdGVtR3Jv dXA+CiAgICAgPFJlc291cmNlQ29tcGlsZSBJbmNsdWRlPSIuLlwuLlx3aW5cV2ViS2l0LnJlc291 cmNlc1xXZWJLaXQucmMiIC8+CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dl YktpdC9XZWJLaXQudmN4cHJvai5maWx0ZXJzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv V2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hwcm9qLmZpbHRlcnMJKHJldmlzaW9uIDE1 OTc1OSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hw cm9qLmZpbHRlcnMJKHdvcmtpbmcgY29weSkKQEAgLTYyMiwxMCArNjIyLDE0IEBACiAgICAgPE5v bmUgSW5jbHVkZT0iJChDb25maWd1cmF0aW9uQnVpbGREaXIpXG9iaiQoUGxhdGZvcm1BcmNoaXRl Y3R1cmUpXFdlYktpdEV4cG9ydEdlbmVyYXRvclxXZWJLaXRFeHBvcnRzLmRlZiI+CiAgICAgICA8 RmlsdGVyPkdlbmVyYXRlZDwvRmlsdGVyPgogICAgIDwvTm9uZT4KKyAgICA8Tm9uZSBJbmNsdWRl PSJXZWJLaXRWZXJzaW9uLmNtZCIgLz4KICAgPC9JdGVtR3JvdXA+CiAgIDxJdGVtR3JvdXA+CiAg ICAgPFJlc291cmNlQ29tcGlsZSBJbmNsdWRlPSIuLlwuLlx3aW5cV2ViS2l0LnJlc291cmNlc1xX ZWJLaXQucmMiPgogICAgICAgPEZpbHRlcj5SZXNvdXJjZXM8L0ZpbHRlcj4KICAgICA8L1Jlc291 cmNlQ29tcGlsZT4KICAgPC9JdGVtR3JvdXA+CisgIDxJdGVtR3JvdXA+CisgICAgPEN1c3RvbUJ1 aWxkIEluY2x1ZGU9Ii4uXC4uXG1hY1xDb25maWd1cmF0aW9uc1xWZXJzaW9uLnhjY29uZmlnIiAv PgorICA8L0l0ZW1Hcm91cD4KIDwvUHJvamVjdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdC9XZWJLaXRWZXJzaW9u LmNtZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdC9X ZWJLaXRWZXJzaW9uLmNtZAkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViS2l0LnZj eHByb2ovV2ViS2l0L1dlYktpdFZlcnNpb24uY21kCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEs NiBAQAorc2V0IFdFQktJVFZFUlNJT05TQ1JJUFQ9JVBST0pFQ1RESVIlLi5cLi5cc2NyaXB0c1xn ZW5lcmF0ZS13ZWJraXR2ZXJzaW9uLnBsCitzZXQgV0VCS0lUVkVSU0lPTkNPTkZJRz0lUFJPSkVD VERJUiUuLlwuLlxtYWNcQ29uZmlndXJhdGlvbnNcVmVyc2lvbi54Y2NvbmZpZworc2V0IFdFQktJ VFZFUlNJT05ESVI9JUNPTkZJR1VSQVRJT05CVUlMRERJUiVcaW5jbHVkZVxXZWJLaXQKK3NldCBX RUJLSVRWRVJTSU9ORklMRT0lV0VCS0lUVkVSU0lPTkRJUiVcV2ViS2l0VmVyc2lvbi5oCisKK2Jh c2ggLWMgJ3BlcmwgIiVXRUJLSVRWRVJTSU9OU0NSSVBUJSIgLS1jb25maWcgIiVXRUJLSVRWRVJT SU9OQ09ORklHJSIgIC0tb3V0cHV0RGlyICIlV0VCS0lUVkVSU0lPTkRJUiUiJwpJbmRleDogU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZwkocmV2aXNpb24gMTU5NzYyKQorKysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTEtMjUgIHBlYXZvQG91 dGxvb2suY29tICA8cGVhdm9Ab3V0bG9vay5jb20+CisKKyAgICAgICAgW1dpbl0gV2ViS2l0IHZl cnNpb24gaW4gdXNlciBhZ2VudCBzdHJpbmcgaXMgaW5jb3JyZWN0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NDU0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDogVXNlIFdlYktp dCB2ZXJzaW9uIGZyb20gV2ViS2l0VmVyc2lvbi5oIGluIHVzZXIgYWdlbnQuCisgICAgICAgICh3 ZWJLaXRWZXJzaW9uU3RyaW5nKToKKwogMjAxMy0xMS0yMSAgUGV0ZXIgTW9sbmFyICA8cG1vbG5h ci51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29tPgogCiAgICAgICAgIFJlbW92ZSBFTkFCTEVf V09SS0VSUwpJbmRleDogU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDE1OTc1OSkKKysrIFNv dXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw2ICs1OCw3 IEBACiAjaW5jbHVkZSAiV2ViS2l0TG9nZ2luZy5oIgogI2luY2x1ZGUgIldlYktpdFN0YXRpc3Rp Y3NQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0U3lzdGVtQml0cy5oIgorI2luY2x1ZGUgIldl YktpdFZlcnNpb24uaCIKICNpbmNsdWRlICJXZWJNdXRhYmxlVVJMUmVxdWVzdC5oIgogI2luY2x1 ZGUgIldlYk5vdGlmaWNhdGlvbkNlbnRlci5oIgogI2luY2x1ZGUgIldlYlBsYXRmb3JtU3RyYXRl Z2llcy5oIgpAQCAtMjQ4OCwxMSArMjQ4OSwxMiBAQCBib29sIFdlYlZpZXc6OmRldmVsb3BlckV4 dHJhc0VuYWJsZWQoKSBjCiAKIHN0YXRpYyBTdHJpbmcgd2ViS2l0VmVyc2lvblN0cmluZygpCiB7 CisjaWYgIVVTRShDQUlSTykKICAgICBMUFdTVFIgYnVpbGROdW1iZXJTdHJpbmdQdHI7Ci0gICAg aWYgKCE6OkxvYWRTdHJpbmdXKGdJbnN0YW5jZSwgQlVJTERfTlVNQkVSLCByZWludGVycHJldF9j YXN0PExQV1NUUj4oJmJ1aWxkTnVtYmVyU3RyaW5nUHRyKSwgMCkgfHwgIWJ1aWxkTnVtYmVyU3Ry aW5nUHRyKQotICAgICAgICByZXR1cm4gIjUzNCsiOwotCi0gICAgcmV0dXJuIGJ1aWxkTnVtYmVy U3RyaW5nUHRyOworICAgIGlmICg6OkxvYWRTdHJpbmdXKGdJbnN0YW5jZSwgQlVJTERfTlVNQkVS LCByZWludGVycHJldF9jYXN0PExQV1NUUj4oJmJ1aWxkTnVtYmVyU3RyaW5nUHRyKSwgMCkgJiYg YnVpbGROdW1iZXJTdHJpbmdQdHIpCisgICAgICAgIHJldHVybiBidWlsZE51bWJlclN0cmluZ1B0 cjsKKyNlbmRpZgorICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJWQuJWQiLCBXRUJLSVRfTUFK T1JfVkVSU0lPTiwgV0VCS0lUX01JTk9SX1ZFUlNJT04pOwogfQogCiBjb25zdCBTdHJpbmcmIFdl YlZpZXc6OnVzZXJBZ2VudEZvcktVUkwoY29uc3QgVVJMJikK 217834 2013-11-25 14:41:39 -0800 2013-11-25 15:06:16 -0800 Patch bug-124454-20131125234133.patch text/plain 7645 peavo SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTk3NjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTExLTI1ICBwZWF2b0BvdXRs b29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5dIFdlYktpdCB2ZXJz aW9uIGluIHVzZXIgYWdlbnQgc3RyaW5nIGlzIGluY29ycmVjdC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDQ1NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdlbmVyYXRlIFdlYktpdFZlcnNpb24uaCBm aWxlIGZyb20gbWFjJ3MgVmVyc2lvbi54Y2NvbmZpZyBmaWxlLgorCisgICAgICAgICogV2ViS2l0 LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hwcm9qOgorICAgICAgICAqIFdlYktpdC52Y3hwcm9q L1dlYktpdC9XZWJLaXQudmN4cHJvai5maWx0ZXJzOgorICAgICAgICAqIFdlYktpdC52Y3hwcm9q L1dlYktpdC9XZWJLaXRWZXJzaW9uLmNtZDogQWRkZWQuCisKIDIwMTMtMTEtMjMgIFhhYmllciBS b2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVh bWVyXSBSZW1vdmUgMC4xMCBjb2RlcGF0aApJbmRleDogU291cmNlL1dlYktpdC9XZWJLaXQudmN4 cHJvai9XZWJLaXQvV2ViS2l0LnZjeHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9X ZWJLaXQudmN4cHJvai9XZWJLaXQvV2ViS2l0LnZjeHByb2oJKHJldmlzaW9uIDE1OTc1OSkKKysr IFNvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hwcm9qCSh3b3Jr aW5nIGNvcHkpCkBAIC01MDUsNiArNTA1LDMzIEBACiAgIDwvSXRlbUdyb3VwPgogICA8SXRlbUdy b3VwPgogICAgIDxOb25lIEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxvYmokKFBs YXRmb3JtQXJjaGl0ZWN0dXJlKVxXZWJLaXRFeHBvcnRHZW5lcmF0b3JcV2ViS2l0RXhwb3J0cy5k ZWYiIC8+CisgICAgPEN1c3RvbUJ1aWxkIEluY2x1ZGU9Ii4uXC4uXG1hY1xDb25maWd1cmF0aW9u c1xWZXJzaW9uLnhjY29uZmlnIj4KKyAgICAgIDxGaWxlVHlwZT5Eb2N1bWVudDwvRmlsZVR5cGU+ CisgICAgICA8Q29tbWFuZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0p Jz09J1JlbGVhc2VfV2luQ2Fpcm98V2luMzInIj5XZWJLaXRWZXJzaW9uLmNtZDwvQ29tbWFuZD4K KyAgICAgIDxPdXRwdXRzIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSkn PT0nUmVsZWFzZV9XaW5DYWlyb3xXaW4zMiciPldlYktpdFZlcnNpb24uaDwvT3V0cHV0cz4KKyAg ICAgIDxDb21tYW5kIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0n RGVidWdfV2luQ2Fpcm98V2luMzInIj5XZWJLaXRWZXJzaW9uLmNtZDwvQ29tbWFuZD4KKyAgICAg IDxDb21tYW5kIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVi dWd8V2luMzInIj5XZWJLaXRWZXJzaW9uLmNtZDwvQ29tbWFuZD4KKyAgICAgIDxDb21tYW5kIENv bmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXxXaW4zMici PldlYktpdFZlcnNpb24uY21kPC9Db21tYW5kPgorICAgICAgPE91dHB1dHMgQ29uZGl0aW9uPSIn JChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z19XaW5DYWlyb3xXaW4zMiciPldl YktpdFZlcnNpb24uaDwvT3V0cHV0cz4KKyAgICAgIDxPdXRwdXRzIENvbmRpdGlvbj0iJyQoQ29u ZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8V2luMzInIj5XZWJLaXRWZXJzaW9uLmg8 L091dHB1dHM+CisgICAgICA8T3V0cHV0cyBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQo UGxhdGZvcm0pJz09J1JlbGVhc2V8V2luMzInIj5XZWJLaXRWZXJzaW9uLmg8L091dHB1dHM+Cisg ICAgICA8Q29tbWFuZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09 J1JlbGVhc2VfV2luQ2Fpcm98eDY0JyI+V2ViS2l0VmVyc2lvbi5jbWQ8L0NvbW1hbmQ+CisgICAg ICA8Q29tbWFuZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0Rl YnVnX1dpbkNhaXJvfHg2NCciPldlYktpdFZlcnNpb24uY21kPC9Db21tYW5kPgorICAgICAgPENv bW1hbmQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z3x4 NjQnIj5XZWJLaXRWZXJzaW9uLmNtZDwvQ29tbWFuZD4KKyAgICAgIDxDb21tYW5kIENvbmRpdGlv bj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj5XZWJLaXRW ZXJzaW9uLmNtZDwvQ29tbWFuZD4KKyAgICAgIDxPdXRwdXRzIENvbmRpdGlvbj0iJyQoQ29uZmln dXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj5XZWJLaXRWZXJzaW9uLmg8L091 dHB1dHM+CisgICAgICA8T3V0cHV0cyBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxh dGZvcm0pJz09J1JlbGVhc2VfV2luQ2Fpcm98eDY0JyI+V2ViS2l0VmVyc2lvbi5oPC9PdXRwdXRz PgorICAgICAgPE91dHB1dHMgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3Jt KSc9PSdEZWJ1Z3x4NjQnIj5XZWJLaXRWZXJzaW9uLmg8L091dHB1dHM+CisgICAgICA8T3V0cHV0 cyBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnX1dpbkNh aXJvfHg2NCciPldlYktpdFZlcnNpb24uaDwvT3V0cHV0cz4KKyAgICAgIDxPdXRwdXRzIENvbmRp dGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8V2luMzIn Ij5XZWJLaXRWZXJzaW9uLmg8L091dHB1dHM+CisgICAgICA8T3V0cHV0cyBDb25kaXRpb249Iick KENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J1Byb2R1Y3Rpb258V2luMzInIj5XZWJLaXRW ZXJzaW9uLmg8L091dHB1dHM+CisgICAgICA8T3V0cHV0cyBDb25kaXRpb249IickKENvbmZpZ3Vy YXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnU3VmZml4fHg2NCciPldlYktpdFZlcnNpb24uaDwv T3V0cHV0cz4KKyAgICAgIDxPdXRwdXRzIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQ bGF0Zm9ybSknPT0nUHJvZHVjdGlvbnx4NjQnIj5XZWJLaXRWZXJzaW9uLmg8L091dHB1dHM+Cisg ICAgICA8Q29tbWFuZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09 J0RlYnVnU3VmZml4fFdpbjMyJyI+V2ViS2l0VmVyc2lvbi5jbWQ8L0NvbW1hbmQ+CisgICAgICA8 Q29tbWFuZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J1Byb2R1 Y3Rpb258V2luMzInIj5XZWJLaXRWZXJzaW9uLmNtZDwvQ29tbWFuZD4KKyAgICAgIDxDb21tYW5k IENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8 eDY0JyI+V2ViS2l0VmVyc2lvbi5jbWQ8L0NvbW1hbmQ+CisgICAgICA8Q29tbWFuZCBDb25kaXRp b249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J1Byb2R1Y3Rpb258eDY0JyI+V2Vi S2l0VmVyc2lvbi5jbWQ8L0NvbW1hbmQ+CisgICAgPC9DdXN0b21CdWlsZD4KICAgICA8Tm9uZSBJ bmNsdWRlPSIuLlwuLlx3aW5cV2ViS2l0LnJlc291cmNlc1xkZWxldGVCdXR0b24ucG5nIiAvPgog ICAgIDxOb25lIEluY2x1ZGU9Ii4uXC4uXHdpblxXZWJLaXQucmVzb3VyY2VzXGRlbGV0ZUJ1dHRv blByZXNzZWQucG5nIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXC4uXHdpblxXZWJLaXQucmVz b3VyY2VzXGZzVmlkZW9BdWRpb1ZvbHVtZUhpZ2gucG5nIiAvPgpAQCAtNTM0LDYgKzU2MSw3IEBA CiAgICAgPE5vbmUgSW5jbHVkZT0iV2ViS2l0UG9zdEJ1aWxkLmNtZCIgLz4KICAgICA8Tm9uZSBJ bmNsdWRlPSJXZWJLaXRQcmVCdWlsZC5jbWQiIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iV2ViS2l0 UHJlTGluay5jbWQiIC8+CisgICAgPE5vbmUgSW5jbHVkZT0iV2ViS2l0VmVyc2lvbi5jbWQiIC8+ CiAgIDwvSXRlbUdyb3VwPgogICA8SXRlbUdyb3VwPgogICAgIDxSZXNvdXJjZUNvbXBpbGUgSW5j bHVkZT0iLi5cLi5cd2luXFdlYktpdC5yZXNvdXJjZXNcV2ViS2l0LnJjIiAvPgpJbmRleDogU291 cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXQvV2ViS2l0LnZjeHByb2ouZmlsdGVycwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdC9XZWJLaXQu dmN4cHJvai5maWx0ZXJzCShyZXZpc2lvbiAxNTk3NTkpCisrKyBTb3VyY2UvV2ViS2l0L1dlYktp dC52Y3hwcm9qL1dlYktpdC9XZWJLaXQudmN4cHJvai5maWx0ZXJzCSh3b3JraW5nIGNvcHkpCkBA IC02MjIsMTAgKzYyMiwxNCBAQAogICAgIDxOb25lIEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1 aWxkRGlyKVxvYmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVxXZWJLaXRFeHBvcnRHZW5lcmF0b3Jc V2ViS2l0RXhwb3J0cy5kZWYiPgogICAgICAgPEZpbHRlcj5HZW5lcmF0ZWQ8L0ZpbHRlcj4KICAg ICA8L05vbmU+CisgICAgPE5vbmUgSW5jbHVkZT0iV2ViS2l0VmVyc2lvbi5jbWQiIC8+CiAgIDwv SXRlbUdyb3VwPgogICA8SXRlbUdyb3VwPgogICAgIDxSZXNvdXJjZUNvbXBpbGUgSW5jbHVkZT0i Li5cLi5cd2luXFdlYktpdC5yZXNvdXJjZXNcV2ViS2l0LnJjIj4KICAgICAgIDxGaWx0ZXI+UmVz b3VyY2VzPC9GaWx0ZXI+CiAgICAgPC9SZXNvdXJjZUNvbXBpbGU+CiAgIDwvSXRlbUdyb3VwPgor ICA8SXRlbUdyb3VwPgorICAgIDxDdXN0b21CdWlsZCBJbmNsdWRlPSIuLlwuLlxtYWNcQ29uZmln dXJhdGlvbnNcVmVyc2lvbi54Y2NvbmZpZyIgLz4KKyAgPC9JdGVtR3JvdXA+CiA8L1Byb2plY3Q+ ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogU291cmNlL1dlYktpdC9XZWJLaXQu dmN4cHJvai9XZWJLaXQvV2ViS2l0VmVyc2lvbi5jbWQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXQvV2ViS2l0VmVyc2lvbi5jbWQJKHJldmlzaW9uIDAp CisrKyBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdC9XZWJLaXRWZXJzaW9uLmNt ZAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDYgQEAKK3NldCBXRUJLSVRWRVJTSU9OU0NSSVBU PSVQUk9KRUNURElSJS4uXC4uXHNjcmlwdHNcZ2VuZXJhdGUtd2Via2l0dmVyc2lvbi5wbAorc2V0 IFdFQktJVFZFUlNJT05DT05GSUc9JVBST0pFQ1RESVIlLi5cLi5cbWFjXENvbmZpZ3VyYXRpb25z XFZlcnNpb24ueGNjb25maWcKK3NldCBXRUJLSVRWRVJTSU9ORElSPSVDT05GSUdVUkFUSU9OQlVJ TERESVIlXGluY2x1ZGVcV2ViS2l0CitzZXQgV0VCS0lUVkVSU0lPTkZJTEU9JVdFQktJVFZFUlNJ T05ESVIlXFdlYktpdFZlcnNpb24uaAorCitiYXNoIC1jICdwZXJsICIlV0VCS0lUVkVSU0lPTlND UklQVCUiIC0tY29uZmlnICIlV0VCS0lUVkVSU0lPTkNPTkZJRyUiICAtLW91dHB1dERpciAiJVdF QktJVFZFUlNJT05ESVIlIicKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTc2MikK KysrIFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDEzIEBACisyMDEzLTExLTI1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29t PgorCisgICAgICAgIFtXaW5dIFdlYktpdCB2ZXJzaW9uIGluIHVzZXIgYWdlbnQgc3RyaW5nIGlz IGluY29ycmVjdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyNDQ1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogV2ViVmlldy5jcHA6IFVzZSBXZWJLaXQgdmVyc2lvbiBmcm9tIFdlYktpdFZlcnNpb24u aCBpbiB1c2VyIGFnZW50LgorICAgICAgICAod2ViS2l0VmVyc2lvblN0cmluZyk6CisKIDIwMTMt MTEtMjEgIFBldGVyIE1vbG5hciAgPHBtb2xuYXIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNv bT4KIAogICAgICAgICBSZW1vdmUgRU5BQkxFX1dPUktFUlMKSW5kZXg6IFNvdXJjZS9XZWJLaXQv d2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcu Y3BwCShyZXZpc2lvbiAxNTk3NTkpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTgsNiArNTgsNyBAQAogI2luY2x1ZGUgIldlYktpdExvZ2dpbmcu aCIKICNpbmNsdWRlICJXZWJLaXRTdGF0aXN0aWNzUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktp dFN5c3RlbUJpdHMuaCIKKyNpbmNsdWRlICJXZWJLaXRWZXJzaW9uLmgiCiAjaW5jbHVkZSAiV2Vi TXV0YWJsZVVSTFJlcXVlc3QuaCIKICNpbmNsdWRlICJXZWJOb3RpZmljYXRpb25DZW50ZXIuaCIK ICNpbmNsdWRlICJXZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuaCIKQEAgLTI0ODgsMTEgKzI0ODksMTIg QEAgYm9vbCBXZWJWaWV3OjpkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkgYwogCiBzdGF0aWMgU3Ry aW5nIHdlYktpdFZlcnNpb25TdHJpbmcoKQogeworI2lmICFVU0UoQ0FJUk8pCiAgICAgTFBXU1RS IGJ1aWxkTnVtYmVyU3RyaW5nUHRyOwotICAgIGlmICghOjpMb2FkU3RyaW5nVyhnSW5zdGFuY2Us IEJVSUxEX05VTUJFUiwgcmVpbnRlcnByZXRfY2FzdDxMUFdTVFI+KCZidWlsZE51bWJlclN0cmlu Z1B0ciksIDApIHx8ICFidWlsZE51bWJlclN0cmluZ1B0cikKLSAgICAgICAgcmV0dXJuICI1MzQr IjsKLQotICAgIHJldHVybiBidWlsZE51bWJlclN0cmluZ1B0cjsKKyAgICBpZiAoOjpMb2FkU3Ry aW5nVyhnSW5zdGFuY2UsIEJVSUxEX05VTUJFUiwgcmVpbnRlcnByZXRfY2FzdDxMUFdTVFI+KCZi dWlsZE51bWJlclN0cmluZ1B0ciksIDApICYmIGJ1aWxkTnVtYmVyU3RyaW5nUHRyKQorICAgICAg ICByZXR1cm4gYnVpbGROdW1iZXJTdHJpbmdQdHI7CisjZW5kaWYKKyAgICByZXR1cm4gU3RyaW5n Ojpmb3JtYXQoIiVkLiVkIiwgV0VCS0lUX01BSk9SX1ZFUlNJT04sIFdFQktJVF9NSU5PUl9WRVJT SU9OKTsKIH0KIAogY29uc3QgU3RyaW5nJiBXZWJWaWV3Ojp1c2VyQWdlbnRGb3JLVVJMKGNvbnN0 IFVSTCYpCg==