39532 2010-05-22 09:06:01 -0700 REGRESSION: Enter does not trigger submit of forms when focus is on select. 2010-11-24 11:09:54 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED InRadar P1 Normal --- 9756 39021 1 spamfaenger dglazkov abarth adele ap arosenzweig darin ddkilzer dglazkov eric fishd mjs mrobinson ojan patrick spamfilter tfr webkit.review.bot oldest_to_newest 229269 0 56780 spamfaenger 2010-05-22 09:06:01 -0700 Created attachment 56780 reduction See the included reduction, to trigger it choose an option from the popup and hit enter with the focus still on the form element. It should now submit (that is reload the page as no submit url is specified in the form) which you should see because the default choice is again chosen instead of what you chose in the popup. It doesn't however - the form is not submitted. 229284 1 ap 2010-05-22 10:45:42 -0700 The new behavior matches Firefox. Why it it wrong? Does the change affect any existing Web sites? 229377 2 dglazkov 2010-05-22 18:04:18 -0700 For what it's worth the new behavior matches IE, too. 229439 3 spamfaenger 2010-05-23 02:37:22 -0700 This is strange - I haven't seen this behaviour in Firefox or IE when I found this bug in our application, so probably my reduction reduces the problem too much. I'll try to give a more complete reduction that shows the problem (but that will involve javascript). 229445 4 56817 spamfaenger 2010-05-23 02:56:01 -0700 Created attachment 56817 Second try with js this time This is the initial breakage that I detected - this time it only happens on webkit nightlies 229446 5 spamfaenger 2010-05-23 02:59:18 -0700 I've added a second reduction - this time with more js (sorry about that). To see the problem: 1. click 'Yeehaw' 2. Choose a value from the popup 3. while the focus is still on the popup, press enter and 4. see that the form does not trigger the js submit handler that is attached. This is the breakage that got introduced into my app - luckily my testsuite captured it early. My workaround for now is to attach a js key-handler to the select field that listens to the enter key. (Not nice, but good enough for our users for now). 229690 6 spamfaenger 2010-05-24 04:04:25 -0700 I just wanted to add that in the second reduction you can see how WebKit Nightlies behave different to Firefox and IE which both trigger the submit handler that is attached. 229789 7 dglazkov 2010-05-24 10:01:59 -0700 (In reply to comment #6) > I just wanted to add that in the second reduction you can see how WebKit Nightlies behave different to Firefox and IE which both trigger the submit handler that is attached. Are you sure about IE? I can't make it trigger using your test. Can we reduce it a bit better -- preferably without the libraries? 229841 8 ap 2010-05-24 12:04:05 -0700 Further reducing the test is of course our job as WebKit developers, as long as we have a test case that truthfully reproduces the problem. But your help with reducing problems is greatly appreciated! 229843 9 dglazkov 2010-05-24 12:05:43 -0700 (In reply to comment #8) > Further reducing the test is of course our job as WebKit developers, as long as we have a test case that truthfully reproduces the problem. But your help with reducing problems is greatly appreciated! Shhh.. Don't tell him that it's our job! :) 240432 10 tfr 2010-06-20 01:49:27 -0700 Actually, this has regressed half-way - using the enter key still works while the focus is on an <input type="text"> element, doesn't on <select>. I personally strongly vote for reverting to old behaviour - using web-based apps a lot it's quite annoying to lift your hand from keyboard to the mouse to click the submit button. 240433 11 tfr 2010-06-20 01:52:14 -0700 And yes, on Firefox enter doesn't work on <select> either, but on the other hand you cannot "tab" onto a select field using a keyboard on Firefox at all - something that can be done on Safari. 240445 12 dglazkov 2010-06-20 08:16:21 -0700 (In reply to comment #10) > Actually, this has regressed half-way - using the enter key still works while the focus is on an <input type="text"> element, doesn't on <select>. > > I personally strongly vote for reverting to old behaviour - using web-based apps a lot it's quite annoying to lift your hand from keyboard to the mouse to click the submit button. Heh. I made this change intentionally to match the behavior of other browsers -- by request from web developers! See the long and passionate debate on bug 9757. It seems that I can't please everyone :) Seems like we need to find a compromise -- a new behavior that fixes old compat problems and minimizes the user. 240446 13 dglazkov 2010-06-20 08:18:34 -0700 (In reply to comment #12) > (In reply to comment #10) > > Actually, this has regressed half-way - using the enter key still works while the focus is on an <input type="text"> element, doesn't on <select>. > > > > I personally strongly vote for reverting to old behaviour - using web-based apps a lot it's quite annoying to lift your hand from keyboard to the mouse to click the submit button. > > Heh. I made this change intentionally to match the behavior of other browsers -- by request from web developers! See the long and passionate debate on bug 9757. It seems that I can't please everyone :) > > Seems like we need to find a compromise -- a new behavior that fixes old compat problems and minimizes the user. I meant bug 9756 :) 241291 14 dglazkov 2010-06-22 09:31:35 -0700 (In reply to comment #11) > And yes, on Firefox enter doesn't work on <select> either, but on the other hand you cannot "tab" onto a select field using a keyboard on Firefox at all - something that can be done on Safari. You can by default on non-OS X platforms. On OS X, see here: http://support.mozilla.com/en-US/kb/Pressing+Tab+key+does+not+select+menus+or+buttons 241292 15 dglazkov 2010-06-22 09:38:29 -0700 I am torn on this. On one hand, only Opera triggers form submission when hitting enter on select box. All other browsers ignore the keystroke. Being consistent across browsers helps compatibility, especially in the corner cases like this. On the other hand, we've changed the expectations of the users. The patch to change this is trivial, but I would like some input from WebKit engineers. 241294 16 tfr 2010-06-22 09:43:27 -0700 My $0.02 worth of pros for reverting to old behaviour: * Safari users like me are used to the behaviour in 4.0. * I think it makes more sense to be consistent with the concept, rather than other browsers - if you can use keyboard to focus on a form element, you should be able to hit enter to submit the form. Should work the same way for both input fields and selects. And, for all other elements (such as radio-/checkboxes) if I have "tab to all controls" set from my System Prefs. 242102 17 dglazkov 2010-06-23 14:49:04 -0700 I think I'll go ahead and change this back, per IRC discussion. 242566 18 spamfaenger 2010-06-24 10:14:54 -0700 To add another data point: if a select field has a submit js handler (applied vie jquery), the web application probably expects the user to submit that form field somehow and that should be supported. Regards, Martin 242644 19 59690 dglazkov 2010-06-24 13:40:10 -0700 Created attachment 59690 Patch 243106 20 59690 ap 2010-06-25 11:45:23 -0700 Comment on attachment 59690 Patch + [ "Select with a submit", "!select,submit", "y" ], // match neither FF nor IE, instead follow logic. + [ "Select with a disabled submit", "!select,-submit", "n" ], Can we have tests for both select variants (popup and box)? 244106 21 adele 2010-06-28 22:40:57 -0700 <rdar://problem/8076104> 244305 22 dglazkov 2010-06-29 08:19:18 -0700 (In reply to comment #20) > (From update of attachment 59690 [details]) > + [ "Select with a submit", "!select,submit", "y" ], // match neither FF nor IE, instead follow logic. > + [ "Select with a disabled submit", "!select,-submit", "n" ], > > Can we have tests for both select variants (popup and box)? Sure thing! I'll upload a new patch. 244622 23 ap 2010-06-29 21:53:16 -0700 *** Bug 41379 has been marked as a duplicate of this bug. *** 244958 24 patrick 2010-06-30 14:58:33 -0700 (In reply to comment #16) > My $0.02 worth of pros for reverting to old behaviour: > > * Safari users like me are used to the behaviour in 4.0. > > * I think it makes more sense to be consistent with the concept, rather than other browsers - if you can use keyboard to focus on a form element, you should be able to hit enter to submit the form. Should work the same way for both input fields and selects. And, for all other elements (such as radio-/checkboxes) if I have "tab to all controls" set from my System Prefs. I agree with Indrek's explanation. The primary reason we use Safari as the primary browser within our work Intranet is this consistent behavior where the enter key always submits a form. Most of our staff at work have multi-button mice with one of the buttons programmed as the enter key. When making a drop down selection and wanting to submit the form, all they had to do was make a selection, and then hit their secondary mouse button to submit the form. Now they have to either switch to a text box and then hit enter, or use the mouse to find the submit button, which usually requires scrolling down the page. This new behavior dramatically slows down productivity. 245953 25 60377 dglazkov 2010-07-02 10:26:54 -0700 Created attachment 60377 Patch 245954 26 dglazkov 2010-07-02 10:27:42 -0700 (In reply to comment #20) > (From update of attachment 59690 [details]) > + [ "Select with a submit", "!select,submit", "y" ], // match neither FF nor IE, instead follow logic. > + [ "Select with a disabled submit", "!select,-submit", "n" ], > > Can we have tests for both select variants (popup and box)? New patch up. Thanks for pointing that out! 245968 27 60377 ap 2010-07-02 10:49:07 -0700 Comment on attachment 60377 Patch > + } else if (type == "selectBox") { > + control = document.createElement("select"); > + control.size = 5; > + control.options.add(new Option("a")); Not that I have anything against tabs in patches... > + } else if (event->type() == eventNames().keypressEvent) { So, is it indeed keypress that triggers submission, not keydown? r=me 245972 28 dglazkov 2010-07-02 10:58:06 -0700 (In reply to comment #27) > (From update of attachment 60377 [details]) > > + } else if (type == "selectBox") { > > + control = document.createElement("select"); > > + control.size = 5; > > + control.options.add(new Option("a")); > > Not that I have anything against tabs in patches... Argh -- I've forgotten to update my TextMate settings -- thanks for catching that. > > + } else if (event->type() == eventNames().keypressEvent) { > > So, is it indeed keypress that triggers submission, not keydown? Yep -- btw, here I am just restoring the code I removed. > r=me 245980 29 dglazkov 2010-07-02 11:07:39 -0700 Landed with fixups as http://trac.webkit.org/changeset/62391. 245989 30 webkit.review.bot 2010-07-02 11:23:05 -0700 http://trac.webkit.org/changeset/62391 might have broken Qt Linux Release 246075 31 mrobinson 2010-07-02 13:55:35 -0700 This fails on GTK+ for select boxes still. I believe it would work if the logic added to SelectElement::listBoxDefaultEventHandler was added to SelectElement::menuListDefaultEventHandler, as GTK+ seems to follow that path at the conditional at line 797 in SelectElement.cpp. I'm not sure if this is appropriate, but I'm pretty sure this is why it's failing. 246123 32 dglazkov 2010-07-02 15:20:22 -0700 (In reply to comment #31) > This fails on GTK+ for select boxes still. I believe it would work if the logic added to SelectElement::listBoxDefaultEventHandler was added to SelectElement::menuListDefaultEventHandler, as GTK+ seems to follow that path at the conditional at line 797 in SelectElement.cpp. I'm not sure if this is appropriate, but I'm pretty sure this is why it's failing. I ended up just updating the expectations here: http://trac.webkit.org/changeset/62409 Turns out this behavior just is different across ports -- the ifdefs are specifically there to delineate the differences, 313396 33 ap 2010-11-24 11:09:54 -0800 *** Bug 43064 has been marked as a duplicate of this bug. *** 56780 2010-05-22 09:06:01 -0700 2010-05-22 09:06:01 -0700 reduction reduction.html text/html 768 spamfaenger PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIj4KPGh0bWw+ Cgk8aGVhZD4KCQk8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LXR5cGUiIGNvbnRlbnQ9InRleHQv aHRtbDsgY2hhcnNldD11dGYtOCI+CgkJPHRpdGxlPjwvdGl0bGU+Cgk8L2hlYWQ+Cgk8Ym9keT4K CQk8ZGl2IGlkPSJjb250YWluZXIiPgoJCQk8aDI+CgkJCQlFeGFtcGxlIDMgLSBTZWxlY3QgRHJv cGRvd24KCQkJPC9oMj4KCQkJPHAgaWQ9ImVkaXRtZTMiPgoJCQkJPGZvcm0gY2xhc3M9ImlucGxh Y2VfZm9ybSIgc3R5bGU9ImRpc3BsYXk6IGlubGluZTsgbWFyZ2luOiAwOyBwYWRkaW5nOiAwOyI+ CgkJCQkJPHNlbGVjdCBuYW1lPSJpbnBsYWNlX3ZhbHVlIiBjbGFzcz0iaW5wbGFjZV9maWVsZCI+ CgkJCQkJCTxvcHRpb24gZGlzYWJsZWQ9InRydWUiIHZhbHVlPSIiPgoJCQkJCQkJQ2hvb3NlIG5l dyB2YWx1ZQoJCQkJCQk8L29wdGlvbj4KCQkJCQkJPG9wdGlvbiB2YWx1ZT0iQ2hhbmdlIG1lIHRv IHRoaXMiPgoJCQkJCQkJQ2hhbmdlIG1lIHRvIHRoaXMKCQkJCQkJPC9vcHRpb24+CgkJCQkJCTxv cHRpb24gdmFsdWU9Im5vIj4KCQkJCQkJCU5vIHdheQoJCQkJCQk8L29wdGlvbj4KCQkJCQk8L3Nl bGVjdD48YnV0dG9uIGNsYXNzPSJpbnBsYWNlX3NhdmUiPlNhdmU8L2J1dHRvbj4gPGJ1dHRvbiBj bGFzcz0iaW5wbGFjZV9jYW5jZWwiPkNhbmNlbDwvYnV0dG9uPgoJCQkJPC9mb3JtPgoJCQk8L3A+ CgkJPC9kaXY+Cgk8L2JvZHk+CjwvaHRtbD4K 56817 2010-05-23 02:56:01 -0700 2010-05-23 02:56:01 -0700 Second try with js this time reduction-with-js.html text/html 901 spamfaenger PCFET0NUWVBFIGh0bWw+CjxodG1sPgoJPGhlYWQ+CgkJPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVu dC10eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiPgoJCTxzY3JpcHQgc3Jj PSJodHRwOi8vYWpheC5nb29nbGVhcGlzLmNvbS9hamF4L2xpYnMvanF1ZXJ5LzEuNC4yL2pxdWVy eS5qcyI+PC9zY3JpcHQ+CgkJPHNjcmlwdCBzcmM9Imh0dHA6Ly9qcXVlcnktaW4tcGxhY2UtZWRp dG9yLmdvb2dsZWNvZGUuY29tL3N2bi90YWdzLzIuMC4wL2xpYi9qcXVlcnkuZWRpdGlucGxhY2Uu anMiPjwvc2NyaXB0PgoJCTwhLS0gaHR0cDovL2pxdWVyeS1pbi1wbGFjZS1lZGl0b3IuZ29vZ2xl Y29kZS5jb20vc3ZuL3RydW5rL2xpYi9qcXVlcnkuZWRpdGlucGxhY2UuanMgY29udGFpbnMgYSB3 b3JrYXJvdW5kIGZvciB0aGlzIHByb2JsZW0gaW4gdGhlIG1ldGhvZCBjb25uZWN0T3BlbmluZ0V2 ZW50c1RvRWRpdG9yIGxpbmUgfjMxMyAtLT4KCQk8c2NyaXB0PgoJCQkkKGZ1bmN0aW9uKCl7CgkJ CQkkKCIjZWRpdG1lMyIpLmVkaXRJblBsYWNlKHsKCQkJCQljYWxsYmFjazogZnVuY3Rpb24odW51 c2VkLCBlbnRlcmVkVGV4dCkgeyByZXR1cm4gZW50ZXJlZFRleHQ7IH0sCgkJCQkJLy8gdXJsOiAi Li9zZXJ2ZXIucGhwIiwKCQkJCQlmaWVsZF90eXBlOiAic2VsZWN0IiwKCQkJCQlzZWxlY3Rfb3B0 aW9uczogIkNoYW5nZSBtZSB0byB0aGlzLCBObyB3YXk6bm8iCgkJCQl9KTsKCQkJfSk7CgkJPC9z Y3JpcHQ+Cgk8L2hlYWQ+Cgk8Ym9keT4KCQk8ZGl2IGlkPSJjb250YWluZXIiPgoJCQk8aDI+CgkJ CQlFeGFtcGxlIDMgLSBTZWxlY3QgRHJvcGRvd24KCQkJPC9oMj4KCQkJPHAgaWQ9ImVkaXRtZTMi PgoJCQkJWWVoYXcKCQkJPC9wPgoJCTwvZGl2PgoJPC9ib2R5Pgo8L2h0bWw+Cg== 59690 2010-06-24 13:40:10 -0700 2010-06-29 08:19:00 -0700 Patch bug-39532-20100624134009.patch text/plain 6901 dglazkov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlNWE0YjdiMmIzZGI3ODIzM2Q0MGJjY2ViOGFkMzZhMTQ4ZWY1MTU3Li43Mjk5NmE4 MDY2MGNkMGMzODYxYTYxOTU0MjRlMzhlMGZmYjA0YmE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDYtMjQgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9O OiBFbnRlciBkb2VzIG5vdCB0cmlnZ2VyIHN1Ym1pdCBvZiBmb3JtcyB3aGVuIGZvY3VzIGlzIG9u IHNlbGVjdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM5NTMyCisKKyAgICAgICAgKiBmYXN0L2Zvcm1zL2ltcGxpY2l0LXN1Ym1pc3Npb24tZXhwZWN0 ZWQudHh0OgorICAgICAgICAqIGZhc3QvZm9ybXMvaW1wbGljaXQtc3VibWlzc2lvbi5odG1sOgor CiAyMDEwLTA2LTI0ICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCB0ZXN0IGV4cGVjdGF0aW9ucyB1cGRhdGUuCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2ltcGxpY2l0LXN1Ym1pc3Npb24tZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pbXBsaWNpdC1zdWJtaXNzaW9uLWV4cGVjdGVkLnR4 dAppbmRleCA5M2JjMTA1YjU2ZjA4OTdmMGI0Njk2YTUyYzEyZDk2NzcyYTRjY2Y1Li40YTViOGQ2 NjVkZWQ4Nzg2ZGM2NmE5MGRiY2ZmZTM2N2YzODk0ZGU1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9mYXN0L2Zvcm1zL2ltcGxpY2l0LXN1Ym1pc3Npb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvZm9ybXMvaW1wbGljaXQtc3VibWlzc2lvbi1leHBlY3RlZC50eHQKQEAgLTE5 LDYgKzE5LDggQEAgU2luZ2xlIGNoZWNrYm94IHNob3VsZCBub3Qgc3VibWl0OiBQQVNTCiBTaW5n bGUgY2hlY2tib3ggd2l0aCBhIHN1Ym1pdCBzaG91bGQgc3VibWl0OiBQQVNTCiBTaW5nbGUgY2hl Y2tib3ggd2l0aCBhIHN1Ym1pdCBkaXNhYmxlZCBzaG91bGQgbm90IHN1Ym1pdDogUEFTUwogU2lu Z2xlIHNlbGVjdCBzaG91bGQgbm90IHN1Ym1pdDogUEFTUworU2VsZWN0IHdpdGggYSBzdWJtaXQg c2hvdWxkIHN1Ym1pdDogUEFTUworU2VsZWN0IHdpdGggYSBkaXNhYmxlZCBzdWJtaXQgc2hvdWxk IG5vdCBzdWJtaXQ6IFBBU1MKIFRleHQgZmllbGQgYW5kIHNpbmdsZSBzZWxlY3QsIHRleHQgZm9j dXNlZCBzaG91bGQgc3VibWl0OiBQQVNTCiBUZXh0IGZpZWxkIGFuZCBzaW5nbGUgc2VsZWN0LCBz ZWxlY3QgZm9jdXNlZCBzaG91bGQgbm90IHN1Ym1pdDogUEFTUwogSXNpbmRleCBzaG91bGQgc3Vi bWl0OiBQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2ltcGxpY2l0LXN1 Ym1pc3Npb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW1wbGljaXQtc3VibWlzc2lv bi5odG1sCmluZGV4IDE0MzMzYmMwN2RiMGY1YzhjNjQ3MTk4NzljYzczMTk0ZmFhMjA5NDMuLjll ZDhlYjE2NDU3ZDRlODZiNzY2ZTRiMzliNzNhMjNiMWNhZjQyNTkgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2Zhc3QvZm9ybXMvaW1wbGljaXQtc3VibWlzc2lvbi5odG1sCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZm9ybXMvaW1wbGljaXQtc3VibWlzc2lvbi5odG1sCkBAIC0yNyw2ICsyNyw4IEBA IHZhciBhbGxUZXN0cyA9IFsKICAgICBbICJTaW5nbGUgY2hlY2tib3ggd2l0aCBhIHN1Ym1pdCIs ICIhY2hlY2tib3gsc3VibWl0IiwgInkiIF0sCiAgICAgWyAiU2luZ2xlIGNoZWNrYm94IHdpdGgg YSBzdWJtaXQgZGlzYWJsZWQiLCAiIWNoZWNrYm94LC1zdWJtaXQiLCAibiIgXSwKICAgICBbICJT aW5nbGUgc2VsZWN0IiwgIiFzZWxlY3QiLCAibiIgXSwKKyAgICBbICJTZWxlY3Qgd2l0aCBhIHN1 Ym1pdCIsICIhc2VsZWN0LHN1Ym1pdCIsICJ5IiBdLCAvLyBtYXRjaCBuZWl0aGVyIEZGIG5vciBJ RSwgaW5zdGVhZCBmb2xsb3cgbG9naWMuCisgICAgWyAiU2VsZWN0IHdpdGggYSBkaXNhYmxlZCBz dWJtaXQiLCAiIXNlbGVjdCwtc3VibWl0IiwgIm4iIF0sCiAgICAgWyAiVGV4dCBmaWVsZCBhbmQg c2luZ2xlIHNlbGVjdCwgdGV4dCBmb2N1c2VkIiwgIiF0ZXh0LHNlbGVjdCIsICJ5IiBdLAogICAg IFsgIlRleHQgZmllbGQgYW5kIHNpbmdsZSBzZWxlY3QsIHNlbGVjdCBmb2N1c2VkIiwgInRleHQs IXNlbGVjdCIsICJuIiBdLAogICAgIFsgIklzaW5kZXgiLCAiIWlzaW5kZXgiLCAieSJdLApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYjA5 YzVjNGQzNDU4YjIzNDYzN2EwYjk5OTY1YTE1ZmY5YmE0OGIwLi4wNjRjNTJhYzI2NjBhNzBiMjg1 YjUxMzM4NjgwOWJhOTg1YjAzZTFlIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEwLTA2LTI0ICBEaW1pdHJp IEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTjogRW50ZXIgZG9lcyBub3QgdHJp Z2dlciBzdWJtaXQgb2YgZm9ybXMgd2hlbiBmb2N1cyBpcyBvbiBzZWxlY3QuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTUzMgorCisgICAgICAgICog ZG9tL1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0RWxlbWVudDo6 bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdEVs ZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAqIGRvbS9TZWxlY3RFbGVtZW50 Lmg6CisgICAgICAgICogaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6CisKIDIwMTAtMDYt MjMgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50 LmNwcCBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCmluZGV4IDQzZTZlMjhiZWRiMTI4 ODY3ZmYyYjMzMTA2YjI0ZWJkNGY5OWUxYjEuLmE2NDJhNjg2M2Y3MTNhMmEyYmY0YjExZGUyNzhl MWEwYzYwNTI2NzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCisr KyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCkBAIC01MzQsNyArNTM0LDcgQEAgc3Rh dGljIGludCBuZXh0VmFsaWRJbmRleChjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBsaXN0SXRlbXMs IGludCBsaXN0SW5kZXgsIFNraXAKIH0KICNlbmRpZgogCi12b2lkIFNlbGVjdEVsZW1lbnQ6Om1l bnVMaXN0RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVu dCogZWxlbWVudCwgRXZlbnQqIGV2ZW50KQordm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERl ZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQqIGVsZW1l bnQsIEV2ZW50KiBldmVudCwgSFRNTEZvcm1FbGVtZW50KiBodG1sRm9ybSkKIHsKICAgICBpZiAo ZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50KSB7CiAgICAgICAgIGlm ICghZWxlbWVudC0+cmVuZGVyZXIoKSB8fCAhZXZlbnQtPmlzS2V5Ym9hcmRFdmVudCgpKQpAQCAt NjEzLDYgKzYxMyw4IEBAIHZvaWQgU2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RXZlbnRI YW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50CiAgICAgICAgICAgICAgICAg bWVudUxpc3QtPnNob3dQb3B1cCgpOwogICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAg ICAgIH0gZWxzZSBpZiAoa2V5Q29kZSA9PSAnXHInKSB7CisgICAgICAgICAgICBpZiAoaHRtbEZv cm0pCisgICAgICAgICAgICAgICAgaHRtbEZvcm0tPnN1Ym1pdEltcGxpY2l0bHkoZXZlbnQsIGZh bHNlKTsKICAgICAgICAgICAgIG1lbnVMaXN0T25DaGFuZ2UoZGF0YSwgZWxlbWVudCk7CiAgICAg ICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKICAgICAgICAgfQpAQCAtNzYxLDEzICs3NjMsMTMgQEAg dm9pZCBTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVt ZW50RGF0YSYgZGF0YSwgRWxlbWVudCoKICAgICB9CiB9CiAKLXZvaWQgU2VsZWN0RWxlbWVudDo6 ZGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxl bWVudCwgRXZlbnQqIGV2ZW50KQordm9pZCBTZWxlY3RFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5k bGVyKFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50KiBlbGVtZW50LCBFdmVudCogZXZl bnQsIEhUTUxGb3JtRWxlbWVudCogaHRtbEZvcm0pCiB7CiAgICAgaWYgKCFlbGVtZW50LT5yZW5k ZXJlcigpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoZGF0YS51c2VzTWVudUxpc3QoKSkK LSAgICAgICAgbWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKGRhdGEsIGVsZW1lbnQsIGV2ZW50 KTsKKyAgICAgICAgbWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKGRhdGEsIGVsZW1lbnQsIGV2 ZW50LCBodG1sRm9ybSk7CiAgICAgZWxzZSAKICAgICAgICAgbGlzdEJveERlZmF1bHRFdmVudEhh bmRsZXIoZGF0YSwgZWxlbWVudCwgZXZlbnQpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9T ZWxlY3RFbGVtZW50LmggYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmgKaW5kZXggNDkzYmVl NTJjZjg2OGU4OWRmMjFlYTZjM2NlZDAyNzBiMDEzZWQzYy4uNWFiN2QxYTE5ZWNkOWUxOTQxZTYx ZDhkYzFjZDA5YWQzNDdhNDFmNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVu dC5oCisrKyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuaApAQCAtOTIsNyArOTIsNyBAQCBw cm90ZWN0ZWQ6CiAgICAgc3RhdGljIHZvaWQgcGFyc2VNdWx0aXBsZUF0dHJpYnV0ZShTZWxlY3RF bGVtZW50RGF0YSYsIEVsZW1lbnQqLCBBdHRyaWJ1dGUqKTsKICAgICBzdGF0aWMgYm9vbCBhcHBl bmRGb3JtRGF0YShTZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQqLCBGb3JtRGF0YUxpc3QmKTsK ICAgICBzdGF0aWMgdm9pZCByZXNldChTZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQqKTsKLSAg ICBzdGF0aWMgdm9pZCBkZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiwgRWxl bWVudCosIEV2ZW50Kik7CisgICAgc3RhdGljIHZvaWQgZGVmYXVsdEV2ZW50SGFuZGxlcihTZWxl Y3RFbGVtZW50RGF0YSYsIEVsZW1lbnQqLCBFdmVudCosIEhUTUxGb3JtRWxlbWVudCopOwogICAg IHN0YXRpYyBpbnQgbGFzdFNlbGVjdGVkTGlzdEluZGV4KGNvbnN0IFNlbGVjdEVsZW1lbnREYXRh JiwgY29uc3QgRWxlbWVudCopOwogICAgIHN0YXRpYyB2b2lkIHR5cGVBaGVhZEZpbmQoU2VsZWN0 RWxlbWVudERhdGEmLCBFbGVtZW50KiwgS2V5Ym9hcmRFdmVudCopOwogICAgIHN0YXRpYyB2b2lk IGluc2VydGVkSW50b1RyZWUoU2VsZWN0RWxlbWVudERhdGEmLCBFbGVtZW50Kik7CkBAIC0xMDMs NyArMTAzLDcgQEAgcHJvdGVjdGVkOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYm9vbCBtdWx0aSwgYm9vbCBzaGlmdCk7CiAgCiBwcml2YXRlOgotICAgIHN0YXRpYyB2b2lk IG1lbnVMaXN0RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQq LCBFdmVudCopOworICAgIHN0YXRpYyB2b2lkIG1lbnVMaXN0RGVmYXVsdEV2ZW50SGFuZGxlcihT ZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQqLCBFdmVudCosIEhUTUxGb3JtRWxlbWVudCopOwog ICAgIHN0YXRpYyB2b2lkIGxpc3RCb3hEZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnRE YXRhJiwgRWxlbWVudCosIEV2ZW50Kik7CiAgICAgc3RhdGljIHZvaWQgc2V0T3B0aW9uc0NoYW5n ZWRPblJlbmRlcmVyKFNlbGVjdEVsZW1lbnREYXRhJiwgRWxlbWVudCopOwogfTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRN TFNlbGVjdEVsZW1lbnQuY3BwCmluZGV4IDJkY2FjNTkxYjMxNmMyMWNiYmQyZTMzM2IwYTcxMTBh YzgzNmUyMTguLjZkZGNjMmRmN2FlYjg3YmE2N2E0NWI1ZjJkOWViNzI2YTcxYWJjYmMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9o dG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcApAQCAtMzI5LDcgKzMyOSw3IEBAIHZvaWQgSFRNTFNl bGVjdEVsZW1lbnQ6OmRpc3BhdGNoQmx1ckV2ZW50KCkKIAogdm9pZCBIVE1MU2VsZWN0RWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiB7Ci0gICAgU2VsZWN0RWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihtX2RhdGEsIHRoaXMsIGV2ZW50KTsKKyAgICBTZWxlY3RF bGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKG1fZGF0YSwgdGhpcywgZXZlbnQsIGZvcm0oKSk7 CiAgICAgaWYgKGV2ZW50LT5kZWZhdWx0SGFuZGxlZCgpKQogICAgICAgICByZXR1cm47CiAgICAg SFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0ZTo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVu dCk7Cg== 60377 2010-07-02 10:26:54 -0700 2010-07-02 10:49:07 -0700 Patch bug-39532-20100702102653.patch text/plain 9302 dglazkov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjNjc2NWQ3NzhjODQ5ZTZmZmVhZjRkYzk2ZDU1ZmNjODgzM2IzODk1Li4zYmVjMmVm YzExMmFkNjFjOWZjMDRmNDU1ZTM0Y2NlOGQwNjBjODZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDYtMjQgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9O OiBFbnRlciBkb2VzIG5vdCB0cmlnZ2VyIHN1Ym1pdCBvZiBmb3JtcyB3aGVuIGZvY3VzIGlzIG9u IHNlbGVjdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM5NTMyCisKKyAgICAgICAgKiBmYXN0L2Zvcm1zL2ltcGxpY2l0LXN1Ym1pc3Npb24tZXhwZWN0 ZWQudHh0OiBVcGRhdGVkLgorICAgICAgICAqIGZhc3QvZm9ybXMvaW1wbGljaXQtc3VibWlzc2lv bi5odG1sOiBBZGRlZCBtb3JlIHRlc3QgY292ZXJhZ2UgZm9yIHNlbGVjdHMuCisKIDIwMTAtMDct MDIgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBE aW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2ltcGxp Y2l0LXN1Ym1pc3Npb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pbXBs aWNpdC1zdWJtaXNzaW9uLWV4cGVjdGVkLnR4dAppbmRleCA5M2JjMTA1YjU2ZjA4OTdmMGI0Njk2 YTUyYzEyZDk2NzcyYTRjY2Y1Li42NzhmNzM3MzBjZmUzOWFlMDY2YWMxNjg4OWM5MmU1MjUwZTk1 MzVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2ltcGxpY2l0LXN1Ym1pc3Np b24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW1wbGljaXQtc3Vi bWlzc2lvbi1leHBlY3RlZC50eHQKQEAgLTE5LDYgKzE5LDEwIEBAIFNpbmdsZSBjaGVja2JveCBz aG91bGQgbm90IHN1Ym1pdDogUEFTUwogU2luZ2xlIGNoZWNrYm94IHdpdGggYSBzdWJtaXQgc2hv dWxkIHN1Ym1pdDogUEFTUwogU2luZ2xlIGNoZWNrYm94IHdpdGggYSBzdWJtaXQgZGlzYWJsZWQg c2hvdWxkIG5vdCBzdWJtaXQ6IFBBU1MKIFNpbmdsZSBzZWxlY3Qgc2hvdWxkIG5vdCBzdWJtaXQ6 IFBBU1MKK1NlbGVjdCB3aXRoIGEgc3VibWl0IHNob3VsZCBzdWJtaXQ6IFBBU1MKK1NlbGVjdCB3 aXRoIGEgZGlzYWJsZWQgc3VibWl0IHNob3VsZCBub3Qgc3VibWl0OiBQQVNTCitNdWx0aS1saW5l IHNlbGVjdCB3aXRoIGEgc3VibWl0IHNob3VsZCBzdWJtaXQ6IFBBU1MKK011bHRpLWxpbmUgc2Vs ZWN0IHdpdGggYSBkaXNhYmxlZCBzdWJtaXQgc2hvdWxkIG5vdCBzdWJtaXQ6IFBBU1MKIFRleHQg ZmllbGQgYW5kIHNpbmdsZSBzZWxlY3QsIHRleHQgZm9jdXNlZCBzaG91bGQgc3VibWl0OiBQQVNT CiBUZXh0IGZpZWxkIGFuZCBzaW5nbGUgc2VsZWN0LCBzZWxlY3QgZm9jdXNlZCBzaG91bGQgbm90 IHN1Ym1pdDogUEFTUwogSXNpbmRleCBzaG91bGQgc3VibWl0OiBQQVNTCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2ltcGxpY2l0LXN1Ym1pc3Npb24uaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvZm9ybXMvaW1wbGljaXQtc3VibWlzc2lvbi5odG1sCmluZGV4IDE0MzMzYmMwN2Ri MGY1YzhjNjQ3MTk4NzljYzczMTk0ZmFhMjA5NDMuLmNiZmE4NmZkNGEyMmIzOTQ2NDA1YzA2MzA5 NzBhYzhlMTY1ZDFjZDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW1wbGlj aXQtc3VibWlzc2lvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW1wbGljaXQt c3VibWlzc2lvbi5odG1sCkBAIC0yNyw2ICsyNywxMCBAQCB2YXIgYWxsVGVzdHMgPSBbCiAgICAg WyAiU2luZ2xlIGNoZWNrYm94IHdpdGggYSBzdWJtaXQiLCAiIWNoZWNrYm94LHN1Ym1pdCIsICJ5 IiBdLAogICAgIFsgIlNpbmdsZSBjaGVja2JveCB3aXRoIGEgc3VibWl0IGRpc2FibGVkIiwgIiFj aGVja2JveCwtc3VibWl0IiwgIm4iIF0sCiAgICAgWyAiU2luZ2xlIHNlbGVjdCIsICIhc2VsZWN0 IiwgIm4iIF0sCisgICAgWyAiU2VsZWN0IHdpdGggYSBzdWJtaXQiLCAiIXNlbGVjdCxzdWJtaXQi LCAieSIgXSwgLy8gbWF0Y2ggbmVpdGhlciBGRiBub3IgSUUsIGluc3RlYWQgZm9sbG93IGxvZ2lj LgorICAgIFsgIlNlbGVjdCB3aXRoIGEgZGlzYWJsZWQgc3VibWl0IiwgIiFzZWxlY3QsLXN1Ym1p dCIsICJuIiBdLAorICAgIFsgIk11bHRpLWxpbmUgc2VsZWN0IHdpdGggYSBzdWJtaXQiLCAiIXNl bGVjdEJveCxzdWJtaXQiLCAieSIgXSwgLy8gbWF0Y2ggbmVpdGhlciBGRiBub3IgSUUsIGluc3Rl YWQgZm9sbG93IGxvZ2ljLgorICAgIFsgIk11bHRpLWxpbmUgc2VsZWN0IHdpdGggYSBkaXNhYmxl ZCBzdWJtaXQiLCAiIXNlbGVjdEJveCwtc3VibWl0IiwgIm4iIF0sCiAgICAgWyAiVGV4dCBmaWVs ZCBhbmQgc2luZ2xlIHNlbGVjdCwgdGV4dCBmb2N1c2VkIiwgIiF0ZXh0LHNlbGVjdCIsICJ5IiBd LAogICAgIFsgIlRleHQgZmllbGQgYW5kIHNpbmdsZSBzZWxlY3QsIHNlbGVjdCBmb2N1c2VkIiwg InRleHQsIXNlbGVjdCIsICJuIiBdLAogICAgIFsgIklzaW5kZXgiLCAiIWlzaW5kZXgiLCAieSJd LApAQCAtODksNiArOTMsMTAgQEAgZnVuY3Rpb24gcnVuVGVzdEluSWZyYW1lKCkKICAgICAgICAg fSBlbHNlIGlmICh0eXBlID09ICJzZWxlY3QiKSB7CiAgICAgICAgICAgICBjb250cm9sID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCh0eXBlKTsKICAgICAgICAgICAgIGNvbnRyb2wub3B0aW9ucy5h ZGQobmV3IE9wdGlvbigiYSIpKTsKKwkJfSBlbHNlIGlmICh0eXBlID09ICJzZWxlY3RCb3giKSB7 CisJCQljb250cm9sID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic2VsZWN0Iik7CisJCQljb250 cm9sLnNpemUgPSA1OworCQkJY29udHJvbC5vcHRpb25zLmFkZChuZXcgT3B0aW9uKCJhIikpOwog ICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gImJ1dHRvbiIpIHsKICAgICAgICAgICAgIGNvbnRy b2wgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KHR5cGUpOwogICAgICAgICAgICAgY29udHJvbC50 eXBlID0gInN1Ym1pdCI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDI4YjRjNGU1YzhmMWJmZGY4MzBhMjYzODYzMWJhZGMxMDczY2U1Yjgu LjgzMTY3YWUwOTRhOTU2ZjRmZGFiYjllYmM1OTUxNjdlMWUyZWY3M2EgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTAtMDYtMjQgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9O OiBFbnRlciBkb2VzIG5vdCB0cmlnZ2VyIHN1Ym1pdCBvZiBmb3JtcyB3aGVuIGZvY3VzIGlzIG9u IHNlbGVjdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM5NTMyCisKKyAgICAgICAgUmVzdG9yZSBiZWhhdmlvciB3aGVyZSBoaXR0aW5nICJFbnRlciIg b24gYSBzZWxlY3QgZWxlbWVudCBhdHRlbXB0cyB0byBzdWJtaXQKKyAgICAgICAgZm9ybSBpbXBs aWNpdGx5LgorCisgICAgICAgICogZG9tL1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKTogQWRkZWQg aHRtbEZvcm0gYXJndW1lbnQsCisgICAgICAgICAgICBhbmQgYXR0ZW1wdGluZyB0byBzdWJtaXQg aW1wbGljaXRseS4KKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6Omxpc3RCb3hEZWZh dWx0RXZlbnRIYW5kbGVyKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RFbGVtZW50 OjpkZWZhdWx0RXZlbnRIYW5kbGVyKTogUGx1bWJlZCB0aHJvdWdoIGh0bWxGb3JtIGFyZ3VtZW50 LgorICAgICAgICAqIGRvbS9TZWxlY3RFbGVtZW50Lmg6IEFkZGVkIGh0bWxGb3JtIGFyZ3VtZW50 IHRvIG1ldGhvZCBkZWNsYXJhdGlvbi4KKyAgICAgICAgKiBodG1sL0hUTUxTZWxlY3RFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVtZW50OjpkZWZhdWx0RXZlbnRI YW5kbGVyKTogQ2hhbmdlZCB0byBwcm92aWRlIHN1Ym1pdHRpbmcgZm9ybQorICAgICAgICAgICAg YXMgdGhlIGFyZ3VtZW50LgorCiAyMDEwLTA3LTAyICBaaGVueWFvIE1vICA8em1vQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAgYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50 LmNwcAppbmRleCA0M2U2ZTI4YmVkYjEyODg2N2ZmMmIzMzEwNmIyNGViZDRmOTllMWIxLi5lOTk1 OGEyNDZlZDJlNTIxZTkxYzM4YTg2Zjg1NjRiZGI1M2YxMWQxIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2RvbS9TZWxlY3RFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmNw cApAQCAtNTM0LDcgKzUzNCw3IEBAIHN0YXRpYyBpbnQgbmV4dFZhbGlkSW5kZXgoY29uc3QgVmVj dG9yPEVsZW1lbnQqPiYgbGlzdEl0ZW1zLCBpbnQgbGlzdEluZGV4LCBTa2lwCiB9CiAjZW5kaWYK IAotdm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0 RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQqIGVsZW1lbnQsIEV2ZW50KiBldmVudCkKK3ZvaWQg U2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnRE YXRhJiBkYXRhLCBFbGVtZW50KiBlbGVtZW50LCBFdmVudCogZXZlbnQsIEhUTUxGb3JtRWxlbWVu dCogaHRtbEZvcm0pCiB7CiAgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLmtl eWRvd25FdmVudCkgewogICAgICAgICBpZiAoIWVsZW1lbnQtPnJlbmRlcmVyKCkgfHwgIWV2ZW50 LT5pc0tleWJvYXJkRXZlbnQoKSkKQEAgLTYxMyw2ICs2MTMsOCBAQCB2b2lkIFNlbGVjdEVsZW1l bnQ6Om1lbnVMaXN0RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwg RWxlbWVudAogICAgICAgICAgICAgICAgIG1lbnVMaXN0LT5zaG93UG9wdXAoKTsKICAgICAgICAg ICAgIGhhbmRsZWQgPSB0cnVlOwogICAgICAgICB9IGVsc2UgaWYgKGtleUNvZGUgPT0gJ1xyJykg eworICAgICAgICAgICAgaWYgKGh0bWxGb3JtKQorICAgICAgICAgICAgICAgIGh0bWxGb3JtLT5z dWJtaXRJbXBsaWNpdGx5KGV2ZW50LCBmYWxzZSk7CiAgICAgICAgICAgICBtZW51TGlzdE9uQ2hh bmdlKGRhdGEsIGVsZW1lbnQpOwogICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAgICAg IH0KQEAgLTY5Miw3ICs2OTQsNyBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnVwZGF0ZVNlbGVjdGVk U3RhdGUoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQqIGVsZW1lbgogICAgIHVwZGF0 ZUxpc3RCb3hTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCwgIW11bHRpU2VsZWN0KTsKIH0KIAotdm9p ZCBTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50 RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVudCwgRXZlbnQqIGV2ZW50KQordm9pZCBTZWxlY3RF bGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0 YSwgRWxlbWVudCogZWxlbWVudCwgRXZlbnQqIGV2ZW50LCBIVE1MRm9ybUVsZW1lbnQqIGh0bWxG b3JtKQogewogICAgIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGxpc3RJdGVtcyA9IGRhdGEubGlz dEl0ZW1zKGVsZW1lbnQpOwogCkBAIC03NTgsMTggKzc2MCwyOSBAQCB2b2lkIFNlbGVjdEVsZW1l bnQ6Omxpc3RCb3hEZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBF bGVtZW50KgogICAgICAgICAgICAgbGlzdEJveE9uQ2hhbmdlKGRhdGEsIGVsZW1lbnQpOwogICAg ICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiAgICAgICAgIH0KKyAgICB9IGVs c2UgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQpIHsKKyAg ICAgICAgaWYgKCFldmVudC0+aXNLZXlib2FyZEV2ZW50KCkpCisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIGludCBrZXlDb2RlID0gc3RhdGljX2Nhc3Q8S2V5Ym9hcmRFdmVudCo+KGV2ZW50 KS0+a2V5Q29kZSgpOworCisgICAgICAgIGlmIChrZXlDb2RlID09ICdccicpIHsKKyAgICAgICAg ICAgIGlmIChodG1sRm9ybSkKKyAgICAgICAgICAgICAgICBodG1sRm9ybS0+c3VibWl0SW1wbGlj aXRseShldmVudCwgZmFsc2UpOworICAgICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVk KCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICB9CiB9CiAKLXZvaWQgU2Vs ZWN0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwg RWxlbWVudCogZWxlbWVudCwgRXZlbnQqIGV2ZW50KQordm9pZCBTZWxlY3RFbGVtZW50OjpkZWZh dWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50KiBlbGVtZW50 LCBFdmVudCogZXZlbnQsIEhUTUxGb3JtRWxlbWVudCogaHRtbEZvcm0pCiB7CiAgICAgaWYgKCFl bGVtZW50LT5yZW5kZXJlcigpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoZGF0YS51c2Vz TWVudUxpc3QoKSkKLSAgICAgICAgbWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKGRhdGEsIGVs ZW1lbnQsIGV2ZW50KTsKKyAgICAgICAgbWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKGRhdGEs IGVsZW1lbnQsIGV2ZW50LCBodG1sRm9ybSk7CiAgICAgZWxzZSAKLSAgICAgICAgbGlzdEJveERl ZmF1bHRFdmVudEhhbmRsZXIoZGF0YSwgZWxlbWVudCwgZXZlbnQpOworICAgICAgICBsaXN0Qm94 RGVmYXVsdEV2ZW50SGFuZGxlcihkYXRhLCBlbGVtZW50LCBldmVudCwgaHRtbEZvcm0pOwogCiAg ICAgaWYgKGV2ZW50LT5kZWZhdWx0SGFuZGxlZCgpKQogICAgICAgICByZXR1cm47CmRpZmYgLS1n aXQgYS9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmggYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVt ZW50LmgKaW5kZXggNDkzYmVlNTJjZjg2OGU4OWRmMjFlYTZjM2NlZDAyNzBiMDEzZWQzYy4uMzgz MWFjNDgwZGQ0MDk3N2QzZWQ1NzVlNDgxOWY5NTkzYWIzODk3YyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9kb20vU2VsZWN0RWxlbWVudC5oCisrKyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuaApA QCAtOTIsNyArOTIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RhdGljIHZvaWQgcGFyc2VNdWx0aXBs ZUF0dHJpYnV0ZShTZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQqLCBBdHRyaWJ1dGUqKTsKICAg ICBzdGF0aWMgYm9vbCBhcHBlbmRGb3JtRGF0YShTZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQq LCBGb3JtRGF0YUxpc3QmKTsKICAgICBzdGF0aWMgdm9pZCByZXNldChTZWxlY3RFbGVtZW50RGF0 YSYsIEVsZW1lbnQqKTsKLSAgICBzdGF0aWMgdm9pZCBkZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVj dEVsZW1lbnREYXRhJiwgRWxlbWVudCosIEV2ZW50Kik7CisgICAgc3RhdGljIHZvaWQgZGVmYXVs dEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYsIEVsZW1lbnQqLCBFdmVudCosIEhUTUxG b3JtRWxlbWVudCopOwogICAgIHN0YXRpYyBpbnQgbGFzdFNlbGVjdGVkTGlzdEluZGV4KGNvbnN0 IFNlbGVjdEVsZW1lbnREYXRhJiwgY29uc3QgRWxlbWVudCopOwogICAgIHN0YXRpYyB2b2lkIHR5 cGVBaGVhZEZpbmQoU2VsZWN0RWxlbWVudERhdGEmLCBFbGVtZW50KiwgS2V5Ym9hcmRFdmVudCop OwogICAgIHN0YXRpYyB2b2lkIGluc2VydGVkSW50b1RyZWUoU2VsZWN0RWxlbWVudERhdGEmLCBF bGVtZW50Kik7CkBAIC0xMDMsOCArMTAzLDggQEAgcHJvdGVjdGVkOgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYm9vbCBtdWx0aSwgYm9vbCBzaGlmdCk7CiAgCiBwcml2YXRl OgotICAgIHN0YXRpYyB2b2lkIG1lbnVMaXN0RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVt ZW50RGF0YSYsIEVsZW1lbnQqLCBFdmVudCopOwotICAgIHN0YXRpYyB2b2lkIGxpc3RCb3hEZWZh dWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiwgRWxlbWVudCosIEV2ZW50Kik7Cisg ICAgc3RhdGljIHZvaWQgbWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnRE YXRhJiwgRWxlbWVudCosIEV2ZW50KiwgSFRNTEZvcm1FbGVtZW50Kik7CisgICAgc3RhdGljIHZv aWQgbGlzdEJveERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0RWxlbWVudERhdGEmLCBFbGVtZW50 KiwgRXZlbnQqLCBIVE1MRm9ybUVsZW1lbnQqKTsKICAgICBzdGF0aWMgdm9pZCBzZXRPcHRpb25z Q2hhbmdlZE9uUmVuZGVyZXIoU2VsZWN0RWxlbWVudERhdGEmLCBFbGVtZW50Kik7CiB9OwogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwIGIvV2ViQ29yZS9o dG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAppbmRleCAyZGNhYzU5MWIzMTZjMjFjYmJkMmUzMzNi MGE3MTEwYWM4MzZlMjE4Li42ZGRjYzJkZjdhZWI4N2JhNjdhNDViNWYyZDllYjcyNmE3MWFiY2Jj IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwCisrKyBiL1dl YkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAKQEAgLTMyOSw3ICszMjksNyBAQCB2b2lk IEhUTUxTZWxlY3RFbGVtZW50OjpkaXNwYXRjaEJsdXJFdmVudCgpCiAKIHZvaWQgSFRNTFNlbGVj dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogewotICAgIFNlbGVj dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIobV9kYXRhLCB0aGlzLCBldmVudCk7CisgICAg U2VsZWN0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihtX2RhdGEsIHRoaXMsIGV2ZW50LCBm b3JtKCkpOwogICAgIGlmIChldmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKICAgICAgICAgcmV0dXJu OwogICAgIEhUTUxGb3JtQ29udHJvbEVsZW1lbnRXaXRoU3RhdGU6OmRlZmF1bHRFdmVudEhhbmRs ZXIoZXZlbnQpOwo=