112999 2013-03-21 21:17:59 -0700 Added a setting for whether JavaScript markup is enabled 2013-04-01 11:57:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 113122 1 ggaren ggaren abarth enrica mjs rniwa sam oldest_to_newest 861065 0 ggaren 2013-03-21 21:17:59 -0700 Added a setting for whether JavaScript markup is enabled 861073 1 194437 ggaren 2013-03-21 21:25:56 -0700 Created attachment 194437 Patch 861079 2 194437 rniwa 2013-03-21 21:30:08 -0700 Comment on attachment 194437 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194437&action=review > Source/WebCore/ChangeLog:9 > + This setting is useful for clients that want protection from script > + injection attacks. Is this setting used anywhere now? It seems valuable to merge the patch that uses this setting. 861114 3 ggaren 2013-03-21 22:50:44 -0700 > Is this setting used anywhere now? It seems valuable to merge the patch that uses this setting. Not yet -- just trying to split up the patch into pieces. 861116 4 194437 abarth 2013-03-21 22:52:59 -0700 Comment on attachment 194437 Patch I don't think we should have divergent ways of disabling JavaScript in WebCore. 861118 5 abarth 2013-03-21 22:54:01 -0700 I'm about to leave on vacation. I would like a chance to discuss this feature before you land it. 861121 6 abarth 2013-03-21 22:58:40 -0700 I hope you weren't trying to sneak this into the codebase while I wasn't paying attention. We've discussed this topic on webkit-dev, and I made it clear that I objected to this feature. 861125 7 rniwa 2013-03-21 23:01:32 -0700 (In reply to comment #4) > (From update of attachment 194437 [details]) > I don't think we should have divergent ways of disabling JavaScript in WebCore. I talked with Geoff about this in person, and I don't think the intent of this feature is to disable JavaScript. It's about stripping scripting contents as they're parsed. In fact, we're not even interested in exposing anywhere on the Web. 861127 8 abarth 2013-03-21 23:09:53 -0700 I would like to discuss this feature before it lands. Please wait until I return from vacation. Please don't make me police bugs.webkit.org during my vacation. 861132 9 mjs 2013-03-21 23:16:43 -0700 Is this feature meant to be used by the browser or by non-browser clients of WebKit? 861583 10 ggaren 2013-03-22 09:47:39 -0700 > Is this feature meant to be used by the browser or by non-browser clients of WebKit? The setting is for Mail. The feature -- stripping script markup in editing contexts -- has existed in WebKit since 2010. The setting is a way to expose the feature to a client app. 861586 11 ggaren 2013-03-22 09:51:12 -0700 > I'm about to leave on vacation. I would like a chance to discuss this feature before you land it. > I hope you weren't trying to sneak this into the codebase while I wasn't paying attention. We've discussed this topic on webkit-dev, and I made it clear that I objected to this feature. > I would like to discuss this feature before it lands. Please wait until I return from vacation. > Please don't make me police bugs.webkit.org during my vacation. Frankly, that's ridiculous. We're not going to halt all development at Apple just because you're going on vacation. I'm not "sneaking" anything. I'm posting a patch to a public review forum. I've duly noted your objection to using this feature as the default way to disable JavaScript in WebKit -- and I'm not doing that. Your objection to having this feature at all is ridiculous: We've had it since 2010. 861823 12 mjs 2013-03-22 13:57:24 -0700 (In reply to comment #10) > > Is this feature meant to be used by the browser or by non-browser clients of WebKit? > > The setting is for Mail. > > The feature -- stripping script markup in editing contexts -- has existed in WebKit since 2010. The setting is a way to expose the feature to a client app. Adam, do you actually object to offering the markup stripping functionality for third-party WebKit clients? I would hope the applicability to Mail seems obvious, since for example webmail products like GMail do similar processing of mail message markup on the server side. I understand that you don't want to be bypassed, but since the purpose of the patch is not what you apparently thought it was, it's not really reasonable to ask us to sit on it for two weeks. 861860 13 mjs 2013-03-22 14:46:22 -0700 Adam, I've consulted with some of your Google colleagues. Because your objection to the patch seems to be based on a misunderstanding, they thought it was ok to go ahead and review, with a clear explanation of what we think the difference in understanding was, and an offer to reopen the discussion once you are back. Specifically: - It seems you were concerned about this patch because you thought it was a way for browsers to change how they disable JavaScript, even though there was not webkit-dev consensus to do that. - However, that's not actually the purpose. - The purpose is to offer the separate feature of JavaScript markup stripping to third-party clients, such as Mac OS X Mail. For a mail client this is clearly appropriate behavior - webmail clients do this sort of thing, for instance, though typically on the server side. - We have no plans to bypass the webkit-dev discussion or divide the way WebKit-based browsers disable JavaScript. - The feature of script-related markup stripping actually already exists in WebKit, for use in paste operations. So this isn't even new fundamental functionality, just a way for other clients to do the same thing. I expect if you'd been aware of the above, you would not be objecting. Therefore I'm going to go ahead and review. If my assumption is wrong, we'd be happy to reopen the discussion. 861861 14 194437 mjs 2013-03-22 14:48:15 -0700 Comment on attachment 194437 Patch I agree with Ryosuke's feedback that it would be slightly better to combine this patch with the one that actually uses the setting to do something. But I also think this would be ok to land as-is. r=me Adam, if you want to object to this r+, please read the previous comment first. 861901 15 ggaren 2013-03-22 15:22:08 -0700 Committed r146664: <http://trac.webkit.org/changeset/146664> 861933 16 194437 mjs 2013-03-22 15:59:57 -0700 Comment on attachment 194437 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194437&action=review > Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp:214 > + macro(WebKitJavaScriptMarkupEnabled, ScriptEnabled, javaScriptEnabled) \ Dan Bates pointed out that this seems wrong - should probably be javaScriptMarkupEnabled, not javaScriptEnabled. 861999 17 ggaren 2013-03-22 17:10:57 -0700 Reopening to attach new patch. 862000 18 194660 ggaren 2013-03-22 17:10:59 -0700 Created attachment 194660 Patch 862031 19 194660 mjs 2013-03-22 17:44:12 -0700 Comment on attachment 194660 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194660&action=review > Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp:213 > - macro(WebKitJavaScriptEnabled, ScriptEnabled, javaScriptEnabled) \ > macro(WebKitJavaScriptMarkupEnabled, ScriptEnabled, javaScriptEnabled) \ Did you really mean to delete line 213 rather than 214? 862036 20 194669 ggaren 2013-03-22 17:52:03 -0700 Created attachment 194669 Patch 862037 21 ggaren 2013-03-22 17:52:42 -0700 > Did you really mean to delete line 213 rather than 214? No. Man, that line of code is my nemesis. :( 862050 22 ggaren 2013-03-22 18:06:14 -0700 > Is this setting used anywhere now? Here's the use code: https://bugs.webkit.org/show_bug.cgi?id=113122. 862252 23 ggaren 2013-03-23 13:20:57 -0700 Committed r146722: <http://trac.webkit.org/changeset/146722> 866652 24 abarth 2013-03-30 11:40:28 -0700 This patch was landed over my explicit object and without the consensus of the WebKit project. I don't think the way this patch was handled is consistent with the way the WebKit project should operate. It is, unfortunately, consistent with the growing trend of unilateral action by Apple in this project. Given that there were 37 comments on bug 113122 (even without my participating), it's clear that this feature was not nearly as uncontroversial as you claim. 867259 25 ggaren 2013-04-01 11:57:16 -0700 > It is, unfortunately, consistent with the growing trend of unilateral action by Apple in this project. I guess you didn't read Maciej's comment, which stated, "Adam, I've consulted with some of your Google colleagues." 194437 2013-03-21 21:25:56 -0700 2013-03-22 17:10:53 -0700 Patch bug-112999-20130321212144.patch text/plain 9223 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjU2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTIxICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkZWQgYSBzZXR0aW5nIGZv ciB3aGV0aGVyIEphdmFTY3JpcHQgbWFya3VwIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjk5OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgc2V0dGluZyBpcyB1c2VmdWwgZm9y IGNsaWVudHMgdGhhdCB3YW50IHByb3RlY3Rpb24gZnJvbSBzY3JpcHQKKyAgICAgICAgaW5qZWN0 aW9uIGF0dGFja3MuCisKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAgIChTZXR0 aW5ncyk6IENsYXJpZmllZCB3aGljaCBjbGllbnRzIHNob3VsZCBjYWxsIGNhbkV4ZWN1dGVTY3Jp cHRzKCkuCisKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmluOiBBZGRlZCB0aGUgbmV3IHNldHRp bmcuCisKIDIwMTMtMDMtMjEgIERhdmlkIEdyb2dhbiAgPGRncm9nYW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEluZGV4ZWREQjogSGlzdG9ncmFtIGF2YWlsYWJsZSBkaXNrIHNwYWNlIG9uIGF0 dGVtcHQgdG8gb3BlbiBkYXRhYmFzZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkocmV2aXNp b24gMTQ2NTIwKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMTksMTEgKzExOSwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZv aWQgc2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KGJvb2wpOwogICAgICAgICBib29sIGxvYWRz SW1hZ2VzQXV0b21hdGljYWxseSgpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZHNJbWFnZXNBdXRvbWF0 aWNhbGx5OyB9CiAKLSAgICAgICAgdm9pZCBzZXRTY3JpcHRFbmFibGVkKGJvb2wpOwotICAgICAg ICAvLyBJbnN0ZWFkIG9mIGNhbGxpbmcgaXNTY3JpcHRFbmFibGVkIGRpcmVjdGx5LCBwbGVhc2Ug Y29uc2lkZXIgY2FsbGluZwotICAgICAgICAvLyBTY3JpcHRDb250cm9sbGVyOjpjYW5FeGVjdXRl U2NyaXB0cywgd2hpY2ggdGFrZXMgdGhpbmdzIGxpa2UgdGhlCi0gICAgICAgIC8vIEhUTUwgc2Fu ZGJveCBhdHRyaWJ1dGUgaW50byBhY2NvdW50LgorICAgICAgICAvLyBDbGllbnRzIHRoYXQgZXhl Y3V0ZSBzY3JpcHQgc2hvdWxkIGNhbGwgU2NyaXB0Q29udHJvbGxlcjo6Y2FuRXhlY3V0ZVNjcmlw dHMoKQorICAgICAgICAvLyBpbnN0ZWFkIG9mIHRoaXMgZnVuY3Rpb24uIFNjcmlwdENvbnRyb2xs ZXI6OmNhbkV4ZWN1dGVTY3JpcHRzKCkgY2hlY2tzIHRoZQorICAgICAgICAvLyBIVE1MIHNhbmRi b3gsIHBsdWctaW4gc2FuZGJveGluZywgYW5kIG90aGVyIGltcG9ydGFudCBkZXRhaWxzLgogICAg ICAgICBib29sIGlzU2NyaXB0RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNTY3JpcHRFbmFi bGVkOyB9CisgICAgICAgIHZvaWQgc2V0U2NyaXB0RW5hYmxlZChib29sKTsKIAogICAgICAgICBT RVRUSU5HU19HRVRURVJTX0FORF9TRVRURVJTCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5p bgkocmV2aXNpb24gMTQ2NTIwKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgko d29ya2luZyBjb3B5KQpAQCAtNzYsNiArNzYsNyBAQCBzaG93c1Rvb2xUaXBPdmVyVHJ1bmNhdGVk VGV4dCBpbml0aWFsPWZhCiBmb3JjZUZUUERpcmVjdG9yeUxpc3RpbmdzIGluaXRpYWw9ZmFsc2UK IGRldmVsb3BlckV4dHJhc0VuYWJsZWQgaW5pdGlhbD1mYWxzZQogamF2YVNjcmlwdEV4cGVyaW1l bnRzRW5hYmxlZCBpbml0aWFsPWZhbHNlCitzY3JpcHRNYXJrdXBFbmFibGVkIGluaXRpYWw9dHJ1 ZQogbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MgaW5pdGlhbD1mYWxzZQogd2ViQXJjaGl2ZURlYnVn TW9kZUVuYWJsZWQgaW5pdGlhbD1mYWxzZSwgY29uZGl0aW9uYWw9V0VCX0FSQ0hJVkUKIGxvY2Fs RmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWQgaW5pdGlhbD1mYWxzZQpJbmRleDogU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwko cmV2aXNpb24gMTQ2NTYwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTMtMDMtMjEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVu QGFwcGxlLmNvbT4KKworICAgICAgICBBZGRlZCBhIHNldHRpbmcgZm9yIHdoZXRoZXIgSmF2YVNj cmlwdCBtYXJrdXAgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTEyOTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBzZXR0aW5nIGlzIHVzZWZ1bCBmb3IgY2xpZW50cyB0aGF0IHdh bnQgcHJvdGVjdGlvbiBmcm9tIHNjcmlwdAorICAgICAgICBpbmplY3Rpb24gYXR0YWNrcy4KKwor ICAgICAgICAqIFNoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmg6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldEph dmFTY3JpcHRNYXJrdXBFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRKYXZhU2Ny aXB0TWFya3VwRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0SmF2YVNjcmlwdEVu YWJsZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRHcm91cC5tbToKKyAgICAg ICAgKC1bV0tCcm93c2luZ0NvbnRleHRHcm91cCBhbGxvd3NKYXZhU2NyaXB0TWFya3VwXSk6Cisg ICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0R3JvdXAgc2V0QWxsb3dzSmF2YVNjcmlwdE1hcmt1 cDpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6Om92ZXJyaWRlQm9vbFByZWZl cmVuY2VGb3JUZXN0UnVubmVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKTogUGx1 bWJlZCB0aHJvdWdoIHRvIEFQSS4KKwogMjAxMy0wMy0yMSAgVGltIEhvcnRvbiAgPHRpbW90aHlf aG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2syXSBQYWdlIE92ZXJsYXlzOiBEb24ndCBj cmVhdGUgYmFja2luZyBzdG9yZSB1bnRpbCB0aGUgY2xpZW50IGFza3MgdXMgdG8gcGFpbnQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAkocmV2aXNp b24gMTQ2NTIwKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUu aAkod29ya2luZyBjb3B5KQpAQCAtNTYsNiArNTYsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAog I2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfQk9PTF9QUkVGRVJFTkNFKG1hY3JvKSBcCiAgICAgbWFj cm8oSmF2YVNjcmlwdEVuYWJsZWQsIGphdmFTY3JpcHRFbmFibGVkLCBCb29sLCBib29sLCB0cnVl KSBcCisgICAgbWFjcm8oSmF2YVNjcmlwdE1hcmt1cEVuYWJsZWQsIGphdmFTY3JpcHRNYXJrdXBF bmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oTG9hZHNJbWFnZXNBdXRvbWF0 aWNhbGx5LCBsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHksIEJvb2wsIGJvb2wsIHRydWUpIFwKICAg ICBtYWNybyhMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVyZW5jZSwgbG9h ZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVuY2UsIEJvb2wsIGJvb2wsIGZh bHNlKSBcCiAgICAgbWFjcm8oUGx1Z2luc0VuYWJsZWQsIHBsdWdpbnNFbmFibGVkLCBCb29sLCBi b29sLCB0cnVlKSBcCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAxNDY1MjApCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY5LDYg KzY5LDE2IEBAIGJvb2wgV0tQcmVmZXJlbmNlc0dldEphdmFTY3JpcHRFbmFibGVkKFcKICAgICBy ZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+amF2YVNjcmlwdEVuYWJsZWQoKTsKIH0KIAor dm9pZCBXS1ByZWZlcmVuY2VzU2V0SmF2YVNjcmlwdE1hcmt1cEVuYWJsZWQoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBqYXZhU2NyaXB0TWFya3VwRW5hYmxlZCkKK3sKKyAg ICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRKYXZhU2NyaXB0TWFya3VwRW5hYmxlZChqYXZh U2NyaXB0TWFya3VwRW5hYmxlZCk7Cit9CisKK2Jvb2wgV0tQcmVmZXJlbmNlc0dldEphdmFTY3Jp cHRNYXJrdXBFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAg cmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPmphdmFTY3JpcHRNYXJrdXBFbmFibGVkKCk7 Cit9CisKIHZvaWQgV0tQcmVmZXJlbmNlc1NldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShXS1By ZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGxvYWRzSW1hZ2VzQXV0b21hdGljYWxs eSkKIHsKICAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRp Y2FsbHkobG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuaAkocmV2aXNpb24gMTQ2NTIwKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuaAkod29ya2luZyBj b3B5KQpAQCAtNTMsNiArNTMsMTAgQEAgV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEph dmFTY3JpcAogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEphdmFTY3JpcHRFbmFibGVk KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCiAvLyBEZWZhdWx0cyB0byB0cnVlLgor V0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEphdmFTY3JpcHRNYXJrdXBFbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMsIGJvb2wgamF2YVNjcmlwdEVuYWJsZWQpOworV0tf RVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEphdmFTY3JpcHRNYXJrdXBFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOworCisvLyBEZWZhdWx0cyB0byB0cnVlLgogV0tfRVhQ T1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShXS1ByZWZl cmVuY2VzUmVmIHByZWZlcmVuY2VzLCBib29sIGxvYWRzSW1hZ2VzQXV0b21hdGljYWxseSk7CiBX S19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAubW0J KHJldmlzaW9uIDE0NjUyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dL QnJvd3NpbmdDb250ZXh0R3JvdXAubW0JKHdvcmtpbmcgY29weSkKQEAgLTc1LDYgKzc1LDE2IEBA IC0gKHZvaWQpc2V0QWxsb3dzSmF2YVNjcmlwdDooQk9PTClhbGxvd3MKICAgICBXS1ByZWZlcmVu Y2VzU2V0SmF2YVNjcmlwdEVuYWJsZWQoV0tQYWdlR3JvdXBHZXRQcmVmZXJlbmNlcyhzZWxmLl9w YWdlR3JvdXBSZWYpLCBhbGxvd3NKYXZhU2NyaXB0KTsKIH0KIAorLSAoQk9PTClhbGxvd3NKYXZh U2NyaXB0TWFya3VwCit7CisgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRKYXZhU2NyaXB0TWFy a3VwRW5hYmxlZChXS1BhZ2VHcm91cEdldFByZWZlcmVuY2VzKHNlbGYuX3BhZ2VHcm91cFJlZikp OworfQorCistICh2b2lkKXNldEFsbG93c0phdmFTY3JpcHRNYXJrdXA6KEJPT0wpYWxsb3dzSmF2 YVNjcmlwdE1hcmt1cAoreworICAgIFdLUHJlZmVyZW5jZXNTZXRKYXZhU2NyaXB0TWFya3VwRW5h YmxlZChXS1BhZ2VHcm91cEdldFByZWZlcmVuY2VzKHNlbGYuX3BhZ2VHcm91cFJlZiksIGFsbG93 c0phdmFTY3JpcHRNYXJrdXApOworfQorCiAtIChCT09MKWFsbG93c1BsdWdJbnMKIHsKICAgICBy ZXR1cm4gV0tQcmVmZXJlbmNlc0dldFBsdWdpbnNFbmFibGVkKFdLUGFnZUdyb3VwR2V0UHJlZmVy ZW5jZXMoc2VsZi5fcGFnZUdyb3VwUmVmKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAko cmV2aXNpb24gMTQ2NTIwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1 bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw2ICsyMTEsNyBA QCB2b2lkIEluamVjdGVkQnVuZGxlOjpvdmVycmlkZUJvb2xQcmVmZXJlCiAgICAgbWFjcm8oV2Vi S2l0RnJhbWVGbGF0dGVuaW5nRW5hYmxlZCwgRnJhbWVGbGF0dGVuaW5nRW5hYmxlZCwgZnJhbWVG bGF0dGVuaW5nRW5hYmxlZCkgXAogICAgIG1hY3JvKFdlYktpdEphdmFFbmFibGVkLCBKYXZhRW5h YmxlZCwgamF2YUVuYWJsZWQpIFwKICAgICBtYWNybyhXZWJLaXRKYXZhU2NyaXB0RW5hYmxlZCwg U2NyaXB0RW5hYmxlZCwgamF2YVNjcmlwdEVuYWJsZWQpIFwKKyAgICBtYWNybyhXZWJLaXRKYXZh U2NyaXB0TWFya3VwRW5hYmxlZCwgU2NyaXB0RW5hYmxlZCwgamF2YVNjcmlwdEVuYWJsZWQpIFwK ICAgICBtYWNybyhXZWJLaXRMb2FkU2l0ZUljb25zS2V5LCBMb2Fkc1NpdGVJY29uc0lnbm9yaW5n SW1hZ2VMb2FkaW5nU2V0dGluZywgbG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1By ZWZlcmVuY2UpIFwKICAgICBtYWNybyhXZWJLaXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVu YWJsZWQsIE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgb2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGVFbmFibGVkKSBcCiAgICAgbWFjcm8oV2ViS2l0UGFnZUNhY2hlU3VwcG9ydHNQ bHVnaW5zUHJlZmVyZW5jZUtleSwgUGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zLCBwYWdlQ2FjaGVT dXBwb3J0c1BsdWdpbnMpIFwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE0NjUyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI2OSw2ICsy MjY5LDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZQogI3VuZGVm IElOSVRJQUxJWkVfU0VUVElOR1MKIAogICAgIHNldHRpbmdzLT5zZXRTY3JpcHRFbmFibGVkKHN0 b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6amF2YVNjcmlwdEVuYWJs ZWRLZXkoKSkpOworICAgIHNldHRpbmdzLT5zZXRTY3JpcHRNYXJrdXBFbmFibGVkKHN0b3JlLmdl dEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6amF2YVNjcmlwdE1hcmt1cEVuYWJs ZWRLZXkoKSkpOwogICAgIHNldHRpbmdzLT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoc3Rv cmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojpsb2Fkc0ltYWdlc0F1dG9t YXRpY2FsbHlLZXkoKSkpOwogICAgIHNldHRpbmdzLT5zZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5n SW1hZ2VMb2FkaW5nU2V0dGluZyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5j ZXNLZXk6OmxvYWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlS2V5KCkp KTsKICAgICBzZXR0aW5ncy0+c2V0UGx1Z2luc0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjpwbHVnaW5zRW5hYmxlZEtleSgpKSk7Cg== 194660 2013-03-22 17:10:59 -0700 2013-03-22 17:52:01 -0700 Patch bug-112999-20130322170646.patch text/plain 1968 ggaren SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjY4NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTIyICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkZWQgYSBzZXR0aW5nIGZv ciB3aGV0aGVyIEphdmFTY3JpcHQgbWFya3VwIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjk5OQorCisgICAgICAgIFJvbGxlZCBv dXQgYSBsaW5lIGZyb20gcjE0NjY2NCB0aGF0IHdhcyBsZWZ0IG92ZXIgZnJvbSBiZWZvcmUgSSBh ZG9wdGVkCisgICAgICAgIHRoZSBTZXR0aW5ncy5pbiB3YXkgb2YgYWRkaW5nIGEgbmV3IHNldHRp bmcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6SW5qZWN0ZWRCdW5kbGU6Om92ZXJyaWRlQm9vbFByZWZlcmVuY2VGb3JUZXN0UnVubmVy KTogTm8gbmVlZAorICAgICAgICB0byBpbml0aWFsaXplIC8gb3ZlcnJpZGUgLS0gU2V0dGluZ3Mu aW4gc2V0dGluZ3MgZG8gdGhpcyBhdXRvbWF0aWNhbGx5LgorCisgICAgICAgIEFsc28sIGR5ZHgg bm90aWNlZCB0aGF0IHRoaXMgbGluZSBvZiBjb2RlIGhhZCBhIHR5cG8sIGFuZCB3YXMgdG90YWx5 IHdyb25nLgorCiAyMDEzLTAzLTIyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIFBsdWdpbiBTbmFwc2hvdHRpbmc6IEF1dG8tc3RhcnQgZG9taW5hbnQg cGx1Z2lucwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJKHJldmlzaW9uIDE0NjY2NCkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTAsNyArMjEwLDYgQEAgdm9pZCBJbmplY3RlZEJ1bmRs ZTo6b3ZlcnJpZGVCb29sUHJlZmVyZQogICAgIG1hY3JvKFdlYktpdENTU0dyaWRMYXlvdXRFbmFi bGVkLCBDU1NHcmlkTGF5b3V0RW5hYmxlZCwgY3NzR3JpZExheW91dEVuYWJsZWQpIFwKICAgICBt YWNybyhXZWJLaXRGcmFtZUZsYXR0ZW5pbmdFbmFibGVkLCBGcmFtZUZsYXR0ZW5pbmdFbmFibGVk LCBmcmFtZUZsYXR0ZW5pbmdFbmFibGVkKSBcCiAgICAgbWFjcm8oV2ViS2l0SmF2YUVuYWJsZWQs IEphdmFFbmFibGVkLCBqYXZhRW5hYmxlZCkgXAotICAgIG1hY3JvKFdlYktpdEphdmFTY3JpcHRF bmFibGVkLCBTY3JpcHRFbmFibGVkLCBqYXZhU2NyaXB0RW5hYmxlZCkgXAogICAgIG1hY3JvKFdl YktpdEphdmFTY3JpcHRNYXJrdXBFbmFibGVkLCBTY3JpcHRFbmFibGVkLCBqYXZhU2NyaXB0RW5h YmxlZCkgXAogICAgIG1hY3JvKFdlYktpdExvYWRTaXRlSWNvbnNLZXksIExvYWRzU2l0ZUljb25z SWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nLCBsb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VM b2FkaW5nUHJlZmVyZW5jZSkgXAogICAgIG1hY3JvKFdlYktpdE9mZmxpbmVXZWJBcHBsaWNhdGlv bkNhY2hlRW5hYmxlZCwgT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkLCBvZmZsaW5l V2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQpIFwK 194669 2013-03-22 17:52:03 -0700 2013-03-23 13:09:46 -0700 Patch bug-112999-20130322174750.patch text/plain 1993 ggaren SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjY5NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTIyICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkZWQgYSBzZXR0aW5nIGZv ciB3aGV0aGVyIEphdmFTY3JpcHQgbWFya3VwIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjk5OQorCisgICAgICAgIFJvbGxlZCBv dXQgYSBsaW5lIGZyb20gcjE0NjY2NCB0aGF0IHdhcyBsZWZ0IG92ZXIgZnJvbSBiZWZvcmUgSSBh ZG9wdGVkCisgICAgICAgIHRoZSBTZXR0aW5ncy5pbiB3YXkgb2YgYWRkaW5nIGEgbmV3IHNldHRp bmcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6SW5qZWN0ZWRCdW5kbGU6Om92ZXJyaWRlQm9vbFByZWZlcmVuY2VGb3JUZXN0UnVubmVy KTogTm8gbmVlZAorICAgICAgICB0byBpbml0aWFsaXplIC8gb3ZlcnJpZGUgLS0gU2V0dGluZ3Mu aW4gc2V0dGluZ3MgZG8gdGhpcyBhdXRvbWF0aWNhbGx5LgorCisgICAgICAgIEFsc28sIGR5ZHgg bm90aWNlZCB0aGF0IHRoaXMgbGluZSBvZiBjb2RlIGhhZCBhIHR5cG8sIGFuZCB3YXMgdG90YWx5 IHdyb25nLgorCiAyMDEzLTAzLTIyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIFBsdWdpbiBTbmFwc2hvdHRpbmc6IEF1dG8tc3RhcnQgZG9taW5hbnQg cGx1Z2lucwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJKHJldmlzaW9uIDE0NjY5NCkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTEsNyArMjExLDYgQEAgdm9pZCBJbmplY3RlZEJ1bmRs ZTo6b3ZlcnJpZGVCb29sUHJlZmVyZQogICAgIG1hY3JvKFdlYktpdEZyYW1lRmxhdHRlbmluZ0Vu YWJsZWQsIEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQsIGZyYW1lRmxhdHRlbmluZ0VuYWJsZWQpIFwK ICAgICBtYWNybyhXZWJLaXRKYXZhRW5hYmxlZCwgSmF2YUVuYWJsZWQsIGphdmFFbmFibGVkKSBc CiAgICAgbWFjcm8oV2ViS2l0SmF2YVNjcmlwdEVuYWJsZWQsIFNjcmlwdEVuYWJsZWQsIGphdmFT Y3JpcHRFbmFibGVkKSBcCi0gICAgbWFjcm8oV2ViS2l0SmF2YVNjcmlwdE1hcmt1cEVuYWJsZWQs IFNjcmlwdEVuYWJsZWQsIGphdmFTY3JpcHRFbmFibGVkKSBcCiAgICAgbWFjcm8oV2ViS2l0TG9h ZFNpdGVJY29uc0tleSwgTG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcs IGxvYWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlKSBcCiAgICAgbWFj cm8oV2ViS2l0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkLCBPZmZsaW5lV2ViQXBw bGljYXRpb25DYWNoZUVuYWJsZWQsIG9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCkg XAogICAgIG1hY3JvKFdlYktpdFBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2luc1ByZWZlcmVuY2VLZXks IFBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2lucywgcGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zKSBcCg==