67377 2011-09-01 01:37:40 -0700 REGRESSION(r94274): selection-change-closes-typing.html fails 2011-09-06 13:36:11 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67569 1 rniwa rniwa ap cshu darin dglazkov hausmann kenneth morrita tkent tonikitoo oldest_to_newest 460324 0 rniwa 2011-09-01 01:37:40 -0700 After http://trac.webkit.org/changeset/94274, platform/mac/editing/input/selection-change-closes-typing.html started failing: --- /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/platform/mac/editing/input/selection-change-closes-typing-expected.txt +++ /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/platform/mac/editing/input/selection-change-closes-typing-actual.txt @@ -1,5 +1,5 @@ Test for bug 32905: With Pinyin Simplified IM, a wrong character is deleted from google.com suggestion. -Should say PASS: PASS +Should say PASS: PSAS There's some really bizarre thing going on where changing selection caused by setInnerTextValue is causing a composition to confirm and then overriding m_valueIfDirty with an incorrect value. 460331 1 rniwa 2011-09-01 02:02:31 -0700 Temporarily skipped the test in http://trac.webkit.org/changeset/94280. 460337 2 rniwa 2011-09-01 02:23:04 -0700 Please the following comments backwards in the natural order of stack growth: #0 0x1018f2b14 in WebCore::HTMLInputElement::setValueFromRenderer at HTMLInputElement.cpp:1192 < we're doomed at this point as we've reached subtreeHasChanged; we think the user has edited text > #1 0x1018f3760 in WebCore::HTMLInputElement::subtreeHasChanged at HTMLInputElement.cpp:659 #2 0x10192d9bc in WebCore::HTMLTextFormControlElement::defaultEventHandler at HTMLTextFormControlElement.cpp:95 #3 0x1018f6c99 in WebCore::HTMLInputElement::defaultEventHandler at HTMLInputElement.cpp:1315 #4 0x10226284b in WebCore::TextControlInnerTextElement::defaultEventHandler at TextControlInnerElements.cpp:90 #5 0x101786e00 in WebCore::EventDispatcher::dispatchEvent at EventDispatcher.cpp:349 #6 0x1017855f7 in WebCore::EventDispatchMediator::dispatchEvent at EventDispatchMediator.cpp:51 #7 0x101785edf in WebCore::EventDispatcher::dispatchEvent at EventDispatcher.cpp:55 #8 0x101e458ca in WebCore::Node::dispatchEvent at Node.cpp:2702 #9 0x1017a18f3 in WebCore::EventTarget::dispatchEvent at EventTarget.cpp:326 #10 0x10176daf7 in WebCore::dispatchEditableContentChangedEvents at Editor.cpp:961 #11 0x10176dd78 in WebCore::Editor::appliedEditing at Editor.cpp:970 #12 0x102290241 in WebCore::TypingCommand::typingAddedToOpenCommand at TypingCommand.cpp:357 #13 0x102291853 in WebCore::TypingCommand::insertTextRunWithoutNewlines at TypingCommand.cpp:399 #14 0x102291af6 in WebCore::TypingCommand::insertText at TypingCommand.cpp:384 #15 0x1022929a8 in WebCore::TypingCommand::insertText at TypingCommand.cpp:199 #16 0x10176ca55 in WebCore::Editor::insertTextWithoutSendingTextEvent at Editor.cpp:1099 #17 0x10176cc28 in WebCore::Editor::handleTextEvent at Editor.cpp:176 #18 0x101789698 in WebCore::EventHandler::defaultTextInputEventHandler at EventHandler.cpp:2964 #19 0x101e4ba49 in WebCore::Node::defaultEventHandler at Node.cpp:2818 #20 0x10192d9cb in WebCore::HTMLTextFormControlElement::defaultEventHandler at HTMLTextFormControlElement.cpp:99 #21 0x1018f6c99 in WebCore::HTMLInputElement::defaultEventHandler at HTMLInputElement.cpp:1315 #22 0x101786e00 in WebCore::EventDispatcher::dispatchEvent at EventDispatcher.cpp:349 #23 0x1017855f7 in WebCore::EventDispatchMediator::dispatchEvent at EventDispatchMediator.cpp:51 #24 0x101785edf in WebCore::EventDispatcher::dispatchEvent at EventDispatcher.cpp:55 #25 0x101e458ca in WebCore::Node::dispatchEvent at Node.cpp:2702 #26 0x1017a18f3 in WebCore::EventTarget::dispatchEvent at EventTarget.cpp:326 #27 0x10178ec66 in WebCore::EventHandler::handleTextInputEvent at EventHandler.cpp:2929 #28 0x101768d3c in WebCore::Editor::insertTextForConfirmedComposition at Editor.cpp:1057 #29 0x10176d8c3 in WebCore::Editor::confirmComposition at Editor.cpp:1520 < oops, we've somehow decided to confirm the composition > #30 0x10176d9ed in WebCore::Editor::confirmCompositionWithoutDisturbingSelection at Editor.cpp:1479 #31 0x100bbdf81 in -[WebHTMLView(WebNSTextInputSupport) _updateSelectionForInputManager] at WebHTMLView.mm:5943 #32 0x100bb7975 in -[WebHTMLView(WebInternal) _selectionChanged] at WebHTMLView.mm:4949 #33 0x100c23a4c in -[WebView(WebViewInternal) _selectionChanged] at WebView.mm:6086 #34 0x100b7a81f in WebEditorClient::respondToChangedSelection at WebEditorClient.mm:295 #35 0x10176ad39 in WebCore::Editor::respondToChangedSelection at Editor.cpp:492 #36 0x10176b424 in WebCore::Editor::respondToChangedSelection at Editor.cpp:3160 #37 0x10181f398 in WebCore::FrameSelection::setSelection at FrameSelection.cpp:233 #38 0x101820a1c in WebCore::FrameSelection::textWillBeReplaced at FrameSelection.cpp:380 < here, we're about to replace text > #39 0x10148451a in WebCore::CharacterData::setDataAndUpdate at CharacterData.cpp:176 #40 0x1014849f4 in WebCore::CharacterData::setData at CharacterData.cpp:46 #41 0x1018cde86 in WebCore::replaceChildrenWithText at HTMLElement.cpp:343 #42 0x1018cebfd in WebCore::HTMLElement::setInnerText at HTMLElement.cpp:479 #43 0x10192ba59 in WebCore::HTMLTextFormControlElement::setInnerTextValue at HTMLTextFormControlElement.cpp:465 #44 0x1018f3962 in WebCore::HTMLInputElement::updateInnerTextValue at HTMLInputElement.cpp:639 < this is where we start > #45 0x1018f3b29 in WebCore::HTMLInputElement::setValue at HTMLInputElement.cpp:1109 #46 0x101b8e05f in WebCore::setJSHTMLInputElementValue at JSHTMLInputElement.cpp:1009 460338 3 105929 rniwa 2011-09-01 02:24:59 -0700 Created attachment 105929 work in progress I'll attach a work-in-progress patch here but this approach is likely to be wrong. I don't think it makes much sense to ignore changes that happened in setValue. 460339 4 rniwa 2011-09-01 02:25:30 -0700 I'll think about this bug tomorrow morning when my brain is functioning. 460875 5 106053 rniwa 2011-09-01 16:05:55 -0700 Created attachment 106053 fixes the bug 460885 6 106056 rniwa 2011-09-01 16:09:51 -0700 Created attachment 106056 properly svn copy tests 461098 7 106056 tkent 2011-09-02 02:22:56 -0700 Comment on attachment 106056 properly svn copy tests platform/mac/editing/input/selection-change-closes-typing.html should be unskipped. 461448 8 ap 2011-09-02 12:57:02 -0700 This change seems risky, but let's see how it goes. Please check that this test passes in manual testing in both single process and multiple process modes in Safari. Also, please check that this patch doesn't regress editing/input (and platform/mac/editing/input) regression tests in WebKit2 mode. +// FIXME: This function is poorly named. Callers of this function uses this function to cancel composition, +// and don't expect it to insert the current composition as the name suggests. Can this be addressed soon? 461460 9 rniwa 2011-09-02 13:10:00 -0700 (In reply to comment #8) > This change seems risky, but let's see how it goes. I agree. > +// FIXME: This function is poorly named. Callers of this function uses this function to cancel composition, > +// and don't expect it to insert the current composition as the name suggests. > > Can this be addressed soon? Yes, I'm hoping to get it done once we know this patch is safe :) I just didn't want to mix this risky patch with a big refactoring. 461534 10 rniwa 2011-09-02 14:37:37 -0700 Okay I've done the test ap suggested (run all layout tests + manually test some cases) on both WebKit 1 and WebKit 2 of mac port. I also submitted the patch to Chromium try server and got green runs: http://build.chromium.org/p/tryserver.chromium/builders/linux/builds/47099 http://build.chromium.org/p/tryserver.chromium/builders/win/builds/52984 http://build.chromium.org/p/tryserver.chromium/builders/mac/builds/47087 461770 11 rniwa 2011-09-03 00:27:01 -0700 (In reply to comment #10) > Okay I've done the test ap suggested (run all layout tests + manually test some cases) on both WebKit 1 and WebKit 2 of mac port. I also submitted the patch to Chromium try server and got green runs: > > http://build.chromium.org/p/tryserver.chromium/builders/linux/builds/47099 > http://build.chromium.org/p/tryserver.chromium/builders/win/builds/52984 > http://build.chromium.org/p/tryserver.chromium/builders/mac/builds/47087 Apparently these try runs didn't apply patch properly :( Here are new runs: http://build.chromium.org/p/tryserver.chromium/builders/linux/builds/47291 http://build.chromium.org/p/tryserver.chromium/builders/mac/builds/47271 http://build.chromium.org/p/tryserver.chromium/builders/win/builds/53196 461866 12 106056 rniwa 2011-09-03 16:29:03 -0700 Comment on attachment 106056 properly svn copy tests Clearing flags on attachment: 106056 Committed r94497: <http://trac.webkit.org/changeset/94497> 461867 13 rniwa 2011-09-03 16:29:08 -0700 All reviewed patches have been landed. Closing bug. 461872 14 106056 darin 2011-09-03 18:33:36 -0700 Comment on attachment 106056 properly svn copy tests View in context: https://bugs.webkit.org/attachment.cgi?id=106056&action=review > Source/WebCore/editing/Editor.cpp:1496 > + ASSERT(text == emptyString()); The normal way to write this is: ASSERT(text.isEmpty()); 462812 15 kenneth 2011-09-06 13:35:23 -0700 This patch modified confrmSelectionWithoutDisturbingSelection which we are using in the Qt port, though that part is unfortunately not upstreamed yet. Example: "a dog jumpedˆ over a bag" with jumped being the composition. When I touch bag with my finger it should become "a dog jumped over the bagˆ" and not "a dog over the bagˆ", thus I need to confirm in that case and not modify the selection. 105929 2011-09-01 02:24:59 -0700 2011-09-01 16:05:48 -0700 work in progress wip67377 text/plain 4607 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAkocmV2aXNpb24g OTQyNzYpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02MzIsNyArNjMyLDEyIEBACiAgICAgZWxzZSBpZiAoIWZvcm1Db250cm9s VmFsdWVNYXRjaGVzUmVuZGVyZXIoKSkgewogICAgICAgICAvLyBVcGRhdGUgdGhlIHJlbmRlcmVy IHZhbHVlIGlmIHRoZSBmb3JtQ29udHJvbFZhbHVlTWF0Y2hlc1JlbmRlcmVyKCkgZmxhZyBpcyBm YWxzZS4KICAgICAgICAgLy8gSXQgcHJvdGVjdHMgYW4gdW5hY2NlcHRhYmxlIHJlbmRlcmVyIHZh bHVlIGZyb20gYmVpbmcgb3ZlcndyaXR0ZW4gd2l0aCB0aGUgRE9NIHZhbHVlLgorCisgICAgICAg IC8vIElmIHRoZXJlIHdhcyBvdXQtc3RhbmRpbmcgSU1FIGNvbXBvc2l0aW9uLCB0aGVuIHNldHRp bmcgaW5uZXIgdGV4dCB2YWx1ZSBtYXkgdHJpZ2dlcgorICAgICAgICAvLyBpdCB0byBjb25maXJt IGFuZCBjYWxsIHNldFZhbHVlRnJvbVJlbmRlcmVyIHZpYSBzdWJ0cmVlSGFzQ2hhbmdlZCBiZWZv cmUgdGhlIHRleHQgaXMgcmVwbGFjZWQuCisgICAgICAgIFN0cmluZyB2YWx1ZUlmRGlydHkgPSBt X3ZhbHVlSWZEaXJ0eTsKICAgICAgICAgc2V0SW5uZXJUZXh0VmFsdWUodmlzaWJsZVZhbHVlKCkp OworICAgICAgICBtX3ZhbHVlSWZEaXJ0eSA9IHZhbHVlSWZEaXJ0eTsKICAgICB9CiB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5oCShyZXZpc2lvbiA5 NDI3NikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC03MCw2ICs3MCw3IEBACiAgICAgdm9pZCB1cGRhdGVWYWx1ZSgpIGNvbnN0 OwogICAgIHZvaWQgc2V0Tm9uRGlydHlWYWx1ZShjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHNl dFZhbHVlQ29tbW9uKGNvbnN0IFN0cmluZyYpOworICAgIHZvaWQgdXBkYXRlSW5uZXJUZXh0VmFs dWUoKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c1BsYWNlaG9sZGVyKCkgY29uc3QgeyBy ZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgSFRNTEVsZW1lbnQqIHBsYWNlaG9sZGVyRWxlbWVu dCgpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0QXJlYUVsZW1l bnQuY3BwCShyZXZpc2lvbiA5NDI3NikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRB cmVhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk4LDkgKzk4LDEwIEBACiB2b2lkIEhU TUxUZXh0QXJlYUVsZW1lbnQ6OmNoaWxkcmVuQ2hhbmdlZChib29sIGNoYW5nZWRCeVBhcnNlciwg Tm9kZSogYmVmb3JlQ2hhbmdlLCBOb2RlKiBhZnRlckNoYW5nZSwgaW50IGNoaWxkQ291bnREZWx0 YSkKIHsKICAgICBzZXRMYXN0Q2hhbmdlV2FzTm90VXNlckVkaXQoKTsKLSAgICBpZiAoIW1faXNE aXJ0eSkKKyAgICBpZiAoIW1faXNEaXJ0eSkgewogICAgICAgICBzZXROb25EaXJ0eVZhbHVlKGRl ZmF1bHRWYWx1ZSgpKTsKLSAgICBzZXRJbm5lclRleHRWYWx1ZSh2YWx1ZSgpKTsKKyAgICAgICAg dXBkYXRlSW5uZXJUZXh0VmFsdWUoKTsKKyAgICB9CiAgICAgSFRNTEVsZW1lbnQ6OmNoaWxkcmVu Q2hhbmdlZChjaGFuZ2VkQnlQYXJzZXIsIGJlZm9yZUNoYW5nZSwgYWZ0ZXJDaGFuZ2UsIGNoaWxk Q291bnREZWx0YSk7CiB9CiAgICAgCkBAIC0zMjksNyArMzMwLDcgQEAKICAgICAgICAgcmV0dXJu OwogCiAgICAgbV92YWx1ZSA9IG5vcm1hbGl6ZWRWYWx1ZTsKLSAgICBzZXRJbm5lclRleHRWYWx1 ZShtX3ZhbHVlKTsKKyAgICB1cGRhdGVJbm5lclRleHRWYWx1ZSgpOwogICAgIHNldExhc3RDaGFu Z2VXYXNOb3RVc2VyRWRpdCgpOwogICAgIHVwZGF0ZVBsYWNlaG9sZGVyVmlzaWJpbGl0eShmYWxz ZSk7CiAgICAgc2V0TmVlZHNTdHlsZVJlY2FsYygpOwpAQCAtMzQ1LDYgKzM0NiwxNSBAQAogICAg IHNldFRleHRBc09mTGFzdEZvcm1Db250cm9sQ2hhbmdlRXZlbnQobm9ybWFsaXplZFZhbHVlKTsK IH0KIAordm9pZCBIVE1MVGV4dEFyZWFFbGVtZW50Ojp1cGRhdGVJbm5lclRleHRWYWx1ZSgpCit7 CisgICAgLy8gSWYgdGhlcmUgd2FzIG91dC1zdGFuZGluZyBJTUUgY29tcG9zaXRpb24sIHRoZW4g c2V0dGluZyBpbm5lciB0ZXh0IHZhbHVlIG1heSB0cmlnZ2VyCisgICAgLy8gaXQgdG8gY29uZmly bSBhbmQgY2FsbCBzZXRWYWx1ZUZyb21SZW5kZXJlciB2aWEgc3VidHJlZUhhc0NoYW5nZWQgYmVm b3JlIHRoZSB0ZXh0IGlzIHJlcGxhY2VkLgorCisgICAgc2V0SW5uZXJUZXh0VmFsdWUobV92YWx1 ZSk7CisgICAgbV92YWx1ZSA9IGlubmVyVGV4dFZhbHVlKCk7Cit9CisKIFN0cmluZyBIVE1MVGV4 dEFyZWFFbGVtZW50OjpkZWZhdWx0VmFsdWUoKSBjb25zdAogewogICAgIFN0cmluZyB2YWx1ZSA9 ICIiOwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0 aW9uLWNoYW5nZS1jbG9zZXMtdHlwaW5nLTItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xv c2VzLXR5cGluZy0yLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0y LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBACitUZXN0IGZvciBidWcg MzI5MDU6IFdpdGggUGlueWluIFNpbXBsaWZpZWQgSU0sIGEgd3JvbmcgY2hhcmFjdGVyIGlzIGRl bGV0ZWQgZnJvbSBnb29nbGUuY29tIHN1Z2dlc3Rpb24uCisKK1Nob3VsZCBzYXkgUEFTUzogUEFT UworCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L3NlbGVj dGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0aW9uLWNoYW5nZS1jbG9zZXMtdHlw aW5nLTIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0 aW5nL2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMzEgQEAKKzxodG1sPgorPGJvZHk+Cis8cD5UZXN0IGZvciA8YSBocmVm PSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI5MDUiPmJ1ZyAzMjkw NTwvYT46CitXaXRoIFBpbnlpbiBTaW1wbGlmaWVkIElNLCBhIHdyb25nIGNoYXJhY3RlciBpcyBk ZWxldGVkIGZyb20gZ29vZ2xlLmNvbSBzdWdnZXN0aW9uLjwvcD4KKzxwPlNob3VsZCBzYXkgUEFT UzogPC9wPgorPHRleHRhcmVhIGlkPSJ0ZXN0Ij48L3RleHRhcmVhPgorPHNjcmlwdCB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiPgorCisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgdmFyIHRl c3RJbnB1dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0Iik7CisgICAgdGVzdElucHV0 LmZvY3VzKCk7CisKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAg ICAgIAorICAgICAgICB0cnkgeworICAgICAgICAgICAgdGV4dElucHV0Q29udHJvbGxlci5zZXRN YXJrZWRUZXh0KCJQIiwgMSwgMCk7CisgICAgICAgICAgICB0ZXN0SW5wdXQudmFsdWU9IlBBUyI7 CisgICAgICAgICAgICBldmVudFNlbmRlci5rZXlEb3duKCJTIik7CisKKyAgICAgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJwIilbMV0uaW5uZXJIVE1MICs9IHRlc3RJbnB1 dC52YWx1ZTsKKworICAgICAgICB9IGNhdGNoIChleCkgeworICAgICAgICAgICAgZG9jdW1lbnQu d3JpdGUoIkV4Y2VwdGlvbjogIiArIGV4LmRlc2NyaXB0aW9uKTsKKyAgICAgICAgfQorICAgIH0g ZWxzZQorICAgICAgICBkb2N1bWVudC53cml0ZSgiVGhpcyB0ZXN0IG9ubHkgcnVucyBpbiBhdXRv bWF0ZWQgbW9kZTxicj4iKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo= 106053 2011-09-01 16:05:55 -0700 2011-09-01 16:09:47 -0700 fixes the bug bug-67377-20110901160554.patch text/plain 5591 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MzU1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDktMDEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihyOTQyNzQpOiBz ZWxlY3Rpb24tY2hhbmdlLWNsb3Nlcy10eXBpbmcuaHRtbCBmYWlscworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjczNzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJvYmxlbSB3YXMgdGhhdCB3aGVu IHRoZSBzaGFkb3cgRE9NIGlzIHVwZGF0ZWQgYnkgc2V0SW5uZXJUZXh0VmFsdWUsIFdlYktpdCBs YXllciBkZXRlY3RzIHRoZSBzZWxlY3Rpb24KKyAgICAgICAgY2hhbmdlIGFuZCBjYWxscyBjb25m aXJtQ29tcG9zaXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbiwgd2hpY2ggaW4gdHVybiBt b2RpZmllcyB0aGUgc2hhZG93IERPTSBieQorICAgICAgICBpbnNlcnRpbmcgdGV4dC4KKworICAg ICAgICBGaXhlZCB0aGUgYnVnIGJ5IG5vdCBpbnNlcnRpbmcgdGV4dCBpbiBjb25maXJtQ29tcG9z aXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbi4gSXQgdHVybmVkIG91dCB0aGF0IHRoaXMK KyAgICAgICAgZnVuY3Rpb24gaXMgb25seSB1c2VkIHRvIGNhbmNlbCBjb21wb3NpdGlvbiBidXQg bmV2ZXIgdG8gY29uZmlybWluZyBjb21wb3NpdGlvbiBhbmQgcmVzdG9yaW5nIHNlbGVjdGlvbi4K KworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9zZWxlY3Rpb24tY2hh bmdlLWNsb3Nlcy10eXBpbmctMi5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OmNvbmZpcm1Db21wb3NpdGlvbldpdGhvdXREaXN0 dXJiaW5nU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6Y29uZmlybUNvbXBv c2l0aW9uKToKKwogMjAxMS0wOS0wMSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAg ICAgICAgIEFkZCBtaXNzaW5nIEV2ZW50IGNvbnN0cnVjdG9ycyB0byBET01XaW5kb3cuaWRsCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCShyZXZpc2lvbiA5NDI3NikKKysrIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3MiwxMSAr MTQ3MiwxMyBAQCB2b2lkIEVkaXRvcjo6Y29uZmlybUNvbXBvc2l0aW9uKCkKICAgICBjb25maXJt Q29tcG9zaXRpb24obV9jb21wb3NpdGlvbk5vZGUtPmRhdGEoKS5zdWJzdHJpbmcobV9jb21wb3Np dGlvblN0YXJ0LCBtX2NvbXBvc2l0aW9uRW5kIC0gbV9jb21wb3NpdGlvblN0YXJ0KSwgZmFsc2Up OwogfQogCisvLyBGSVhNRTogVGhpcyBmdW5jdGlvbiBpcyBwb29ybHkgbmFtZWQuIENhbGxlcnMg b2YgdGhpcyBmdW5jdGlvbiB1c2VzIHRoaXMgZnVuY3Rpb24gdG8gY2FuY2VsIGNvbXBvc2l0aW9u LAorLy8gYW5kIGRvbid0IGV4cGVjdCBpdCB0byBpbnNlcnQgdGhlIGN1cnJlbnQgY29tcG9zaXRp b24gYXMgdGhlIG5hbWUgc3VnZ2VzdHMuCiB2b2lkIEVkaXRvcjo6Y29uZmlybUNvbXBvc2l0aW9u V2l0aG91dERpc3R1cmJpbmdTZWxlY3Rpb24oKQogewogICAgIGlmICghbV9jb21wb3NpdGlvbk5v ZGUpCiAgICAgICAgIHJldHVybjsKLSAgICBjb25maXJtQ29tcG9zaXRpb24obV9jb21wb3NpdGlv bk5vZGUtPmRhdGEoKS5zdWJzdHJpbmcobV9jb21wb3NpdGlvblN0YXJ0LCBtX2NvbXBvc2l0aW9u RW5kIC0gbV9jb21wb3NpdGlvblN0YXJ0KSwgdHJ1ZSk7CisgICAgY29uZmlybUNvbXBvc2l0aW9u KGVtcHR5U3RyaW5nKCksIHRydWUpOwogfQogCiB2b2lkIEVkaXRvcjo6Y29uZmlybUNvbXBvc2l0 aW9uKGNvbnN0IFN0cmluZyYgdGV4dCkKQEAgLTE0OTAsOSArMTQ5MiwxMCBAQCB2b2lkIEVkaXRv cjo6Y29uZmlybUNvbXBvc2l0aW9uKGNvbnN0IFN0CiAKICAgICBzZXRJZ25vcmVDb21wb3NpdGlv blNlbGVjdGlvbkNoYW5nZSh0cnVlKTsKIAotICAgIFZpc2libGVTZWxlY3Rpb24gb2xkU2VsZWN0 aW9uID0gbV9mcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpOwotCi0gICAgc2VsZWN0Q29t cG9zaXRpb24oKTsKKyAgICBpZiAocHJlc2VydmVTZWxlY3Rpb24pCisgICAgICAgIEFTU0VSVCh0 ZXh0ID09IGVtcHR5U3RyaW5nKCkpOworICAgIGVsc2UKKyAgICAgICAgc2VsZWN0Q29tcG9zaXRp b24oKTsKIAogICAgIGlmIChtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+aXNOb25lKCkpIHsKICAgICAg ICAgc2V0SWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UoZmFsc2UpOwpAQCAtMTUyMCw3 ICsxNTIzLDYgQEAgdm9pZCBFZGl0b3I6OmNvbmZpcm1Db21wb3NpdGlvbihjb25zdCBTdAogICAg IGluc2VydFRleHRGb3JDb25maXJtZWRDb21wb3NpdGlvbih0ZXh0KTsKIAogICAgIGlmIChwcmVz ZXJ2ZVNlbGVjdGlvbikgewotICAgICAgICBtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0 aW9uKG9sZFNlbGVjdGlvbiwgMCk7CiAgICAgICAgIC8vIEFuIG9wZW4gdHlwaW5nIGNvbW1hbmQg dGhhdCBkaXNhZ3JlZXMgYWJvdXQgY3VycmVudCBzZWxlY3Rpb24gd291bGQgY2F1c2UgaXNzdWVz IHdpdGggdHlwaW5nIGxhdGVyIG9uLgogICAgICAgICBUeXBpbmdDb21tYW5kOjpjbG9zZVR5cGlu ZyhtX2xhc3RFZGl0Q29tbWFuZC5nZXQoKSk7CiAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gOTQz NTUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NSBAQAorMjAxMS0wOS0wMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAg ICAgICBSRUdSRVNTSU9OKHI5NDI3NCk6IHNlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy5o dG1sIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NzM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBhIHJlZ3Jlc3Npb24gdGVzdCB0byBlbnN1cmUgdGhlIHNhbWUgYnVnIGRvZXNuJ3QgZXhp c3QgaW4gdGV4dGFyZWEgZWxlbWVudC4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9lZGl0aW5n L2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0aW9uLWNoYW5n ZS1jbG9zZXMtdHlwaW5nLTIuaHRtbDogQWRkZWQuCisKIDIwMTEtMDktMDEgIFNhbSBXZWluaWcg IDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgbWlzc2luZyBFdmVudCBjb25zdHJ1Y3Rv cnMgdG8gRE9NV2luZG93LmlkbApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRp bmcvaW5wdXQvc2VsZWN0aW9uLWNoYW5nZS1jbG9zZXMtdHlwaW5nLTItZXhwZWN0ZWQudHh0Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L3NlbGVj dGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L3NlbGVjdGlvbi1jaGFuZ2Ut Y2xvc2VzLXR5cGluZy0yLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBA CitUZXN0IGZvciBidWcgMzI5MDU6IFdpdGggUGlueWluIFNpbXBsaWZpZWQgSU0sIGEgd3Jvbmcg Y2hhcmFjdGVyIGlzIGRlbGV0ZWQgZnJvbSBnb29nbGUuY29tIHN1Z2dlc3Rpb24uCisKK1Nob3Vs ZCBzYXkgUEFTUzogUEFTUworCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0 aW5nL2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLmh0bWwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0aW9uLWNo YW5nZS1jbG9zZXMtdHlwaW5nLTIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9lZGl0aW5nL2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0y Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzEgQEAKKzxodG1sPgorPGJvZHk+Cis8cD5U ZXN0IGZvciA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzI5MDUiPmJ1ZyAzMjkwNTwvYT46CitXaXRoIFBpbnlpbiBTaW1wbGlmaWVkIElNLCBhIHdyb25n IGNoYXJhY3RlciBpcyBkZWxldGVkIGZyb20gZ29vZ2xlLmNvbSBzdWdnZXN0aW9uLjwvcD4KKzxw PlNob3VsZCBzYXkgUEFTUzogPC9wPgorPHRleHRhcmVhIGlkPSJ0ZXN0Ij48L3RleHRhcmVhPgor PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorCisgICAgaWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgp OworCisgICAgdmFyIHRlc3RJbnB1dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0Iik7 CisgICAgdGVzdElucHV0LmZvY3VzKCk7CisKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250 cm9sbGVyKSB7CisgICAgICAgIAorICAgICAgICB0cnkgeworICAgICAgICAgICAgdGV4dElucHV0 Q29udHJvbGxlci5zZXRNYXJrZWRUZXh0KCJQIiwgMSwgMCk7CisgICAgICAgICAgICB0ZXN0SW5w dXQudmFsdWU9IlBBUyI7CisgICAgICAgICAgICBldmVudFNlbmRlci5rZXlEb3duKCJTIik7CisK KyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJwIilbMV0uaW5uZXJI VE1MICs9IHRlc3RJbnB1dC52YWx1ZTsKKworICAgICAgICB9IGNhdGNoIChleCkgeworICAgICAg ICAgICAgZG9jdW1lbnQud3JpdGUoIkV4Y2VwdGlvbjogIiArIGV4LmRlc2NyaXB0aW9uKTsKKyAg ICAgICAgfQorICAgIH0gZWxzZQorICAgICAgICBkb2N1bWVudC53cml0ZSgiVGhpcyB0ZXN0IG9u bHkgcnVucyBpbiBhdXRvbWF0ZWQgbW9kZTxicj4iKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgo= 106056 2011-09-01 16:09:51 -0700 2011-09-03 18:33:36 -0700 properly svn copy tests bug-67377-20110901160949.patch text/plain 6683 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MzU1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDktMDEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihyOTQyNzQpOiBz ZWxlY3Rpb24tY2hhbmdlLWNsb3Nlcy10eXBpbmcuaHRtbCBmYWlscworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjczNzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJvYmxlbSB3YXMgdGhhdCB3aGVu IHRoZSBzaGFkb3cgRE9NIGlzIHVwZGF0ZWQgYnkgc2V0SW5uZXJUZXh0VmFsdWUsIFdlYktpdCBs YXllciBkZXRlY3RzIHRoZSBzZWxlY3Rpb24KKyAgICAgICAgY2hhbmdlIGFuZCBjYWxscyBjb25m aXJtQ29tcG9zaXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbiwgd2hpY2ggaW4gdHVybiBt b2RpZmllcyB0aGUgc2hhZG93IERPTSBieQorICAgICAgICBpbnNlcnRpbmcgdGV4dC4KKworICAg ICAgICBGaXhlZCB0aGUgYnVnIGJ5IG5vdCBpbnNlcnRpbmcgdGV4dCBpbiBjb25maXJtQ29tcG9z aXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbi4gSXQgdHVybmVkIG91dCB0aGF0IHRoaXMK KyAgICAgICAgZnVuY3Rpb24gaXMgb25seSB1c2VkIHRvIGNhbmNlbCBjb21wb3NpdGlvbiBidXQg bmV2ZXIgdG8gY29uZmlybWluZyBjb21wb3NpdGlvbiBhbmQgcmVzdG9yaW5nIHNlbGVjdGlvbi4K KworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9zZWxlY3Rpb24tY2hh bmdlLWNsb3Nlcy10eXBpbmctMi5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OmNvbmZpcm1Db21wb3NpdGlvbldpdGhvdXREaXN0 dXJiaW5nU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6Y29uZmlybUNvbXBv c2l0aW9uKToKKwogMjAxMS0wOS0wMSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAg ICAgICAgIEFkZCBtaXNzaW5nIEV2ZW50IGNvbnN0cnVjdG9ycyB0byBET01XaW5kb3cuaWRsCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCShyZXZpc2lvbiA5NDI3NikKKysrIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3MiwxMSAr MTQ3MiwxMyBAQCB2b2lkIEVkaXRvcjo6Y29uZmlybUNvbXBvc2l0aW9uKCkKICAgICBjb25maXJt Q29tcG9zaXRpb24obV9jb21wb3NpdGlvbk5vZGUtPmRhdGEoKS5zdWJzdHJpbmcobV9jb21wb3Np dGlvblN0YXJ0LCBtX2NvbXBvc2l0aW9uRW5kIC0gbV9jb21wb3NpdGlvblN0YXJ0KSwgZmFsc2Up OwogfQogCisvLyBGSVhNRTogVGhpcyBmdW5jdGlvbiBpcyBwb29ybHkgbmFtZWQuIENhbGxlcnMg b2YgdGhpcyBmdW5jdGlvbiB1c2VzIHRoaXMgZnVuY3Rpb24gdG8gY2FuY2VsIGNvbXBvc2l0aW9u LAorLy8gYW5kIGRvbid0IGV4cGVjdCBpdCB0byBpbnNlcnQgdGhlIGN1cnJlbnQgY29tcG9zaXRp b24gYXMgdGhlIG5hbWUgc3VnZ2VzdHMuCiB2b2lkIEVkaXRvcjo6Y29uZmlybUNvbXBvc2l0aW9u V2l0aG91dERpc3R1cmJpbmdTZWxlY3Rpb24oKQogewogICAgIGlmICghbV9jb21wb3NpdGlvbk5v ZGUpCiAgICAgICAgIHJldHVybjsKLSAgICBjb25maXJtQ29tcG9zaXRpb24obV9jb21wb3NpdGlv bk5vZGUtPmRhdGEoKS5zdWJzdHJpbmcobV9jb21wb3NpdGlvblN0YXJ0LCBtX2NvbXBvc2l0aW9u RW5kIC0gbV9jb21wb3NpdGlvblN0YXJ0KSwgdHJ1ZSk7CisgICAgY29uZmlybUNvbXBvc2l0aW9u KGVtcHR5U3RyaW5nKCksIHRydWUpOwogfQogCiB2b2lkIEVkaXRvcjo6Y29uZmlybUNvbXBvc2l0 aW9uKGNvbnN0IFN0cmluZyYgdGV4dCkKQEAgLTE0OTAsOSArMTQ5MiwxMCBAQCB2b2lkIEVkaXRv cjo6Y29uZmlybUNvbXBvc2l0aW9uKGNvbnN0IFN0CiAKICAgICBzZXRJZ25vcmVDb21wb3NpdGlv blNlbGVjdGlvbkNoYW5nZSh0cnVlKTsKIAotICAgIFZpc2libGVTZWxlY3Rpb24gb2xkU2VsZWN0 aW9uID0gbV9mcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpOwotCi0gICAgc2VsZWN0Q29t cG9zaXRpb24oKTsKKyAgICBpZiAocHJlc2VydmVTZWxlY3Rpb24pCisgICAgICAgIEFTU0VSVCh0 ZXh0ID09IGVtcHR5U3RyaW5nKCkpOworICAgIGVsc2UKKyAgICAgICAgc2VsZWN0Q29tcG9zaXRp b24oKTsKIAogICAgIGlmIChtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+aXNOb25lKCkpIHsKICAgICAg ICAgc2V0SWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UoZmFsc2UpOwpAQCAtMTUyMCw3 ICsxNTIzLDYgQEAgdm9pZCBFZGl0b3I6OmNvbmZpcm1Db21wb3NpdGlvbihjb25zdCBTdAogICAg IGluc2VydFRleHRGb3JDb25maXJtZWRDb21wb3NpdGlvbih0ZXh0KTsKIAogICAgIGlmIChwcmVz ZXJ2ZVNlbGVjdGlvbikgewotICAgICAgICBtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0 aW9uKG9sZFNlbGVjdGlvbiwgMCk7CiAgICAgICAgIC8vIEFuIG9wZW4gdHlwaW5nIGNvbW1hbmQg dGhhdCBkaXNhZ3JlZXMgYWJvdXQgY3VycmVudCBzZWxlY3Rpb24gd291bGQgY2F1c2UgaXNzdWVz IHdpdGggdHlwaW5nIGxhdGVyIG9uLgogICAgICAgICBUeXBpbmdDb21tYW5kOjpjbG9zZVR5cGlu ZyhtX2xhc3RFZGl0Q29tbWFuZC5nZXQoKSk7CiAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gOTQz NTcpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NyBAQAorMjAxMS0wOS0wMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAg ICAgICBSRUdSRVNTSU9OKHI5NDI3NCk6IHNlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy5o dG1sIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NzM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBhIHJlZ3Jlc3Npb24gdGVzdCB0byBlbnN1cmUgdGhlIHNhbWUgYnVnIGRvZXNuJ3QgZXhp c3QgaW4gdGV4dGFyZWEgZWxlbWVudC4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9lZGl0aW5n L2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLWV4cGVjdGVkLnR4dDogQ29w aWVkIGZyb20KKyAgICAgICAgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQv c2VsZWN0aW9uLWNoYW5nZS1jbG9zZXMtdHlwaW5nLWV4cGVjdGVkLnR4dC4KKyAgICAgICAgKiBw bGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9zZWxlY3Rpb24tY2hhbmdlLWNsb3Nlcy10eXBpbmct Mi5odG1sOiBDb3BpZWQgZnJvbQorICAgICAgICBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRp dGluZy9pbnB1dC9zZWxlY3Rpb24tY2hhbmdlLWNsb3Nlcy10eXBpbmcuaHRtbC4KKwogMjAxMS0w OS0wMSAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBnb29nbGUuY29tPgogCiAgICAgICAgIFR5cGVF cnJvciBzaG91bGQgYmUgdGhyb3duIHdoZW4gYSBjb25zdHJ1Y3RvciBpcyBjYWxsZWQgYXMgYSBu b3JtYWwgZnVuY3Rpb24uCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9p bnB1dC9zZWxlY3Rpb24tY2hhbmdlLWNsb3Nlcy10eXBpbmctMi1leHBlY3RlZC50eHQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0aW9u LWNoYW5nZS1jbG9zZXMtdHlwaW5nLTItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA5NDI3NikJKGZy b20gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0aW9uLWNoYW5n ZS1jbG9zZXMtdHlwaW5nLWV4cGVjdGVkLnR4dDo5NDI3NikKKysrIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy9lZGl0aW5nL2lucHV0L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLWV4 cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDUgQEAKK1Rlc3QgZm9yIGJ1ZyAz MjkwNTogV2l0aCBQaW55aW4gU2ltcGxpZmllZCBJTSwgYSB3cm9uZyBjaGFyYWN0ZXIgaXMgZGVs ZXRlZCBmcm9tIGdvb2dsZS5jb20gc3VnZ2VzdGlvbi4KKworU2hvdWxkIHNheSBQQVNTOiBQQVNT CisKKwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0 aW9uLWNoYW5nZS1jbG9zZXMtdHlwaW5nLTIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9zZWxlY3Rpb24tY2hhbmdlLWNsb3Nlcy10eXBp bmctMi5odG1sCShyZXZpc2lvbiA5NDI3NikJKGZyb20gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj L2VkaXRpbmcvaW5wdXQvc2VsZWN0aW9uLWNoYW5nZS1jbG9zZXMtdHlwaW5nLmh0bWw6OTQyNzYp CisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnB1dC9zZWxlY3Rpb24tY2hh bmdlLWNsb3Nlcy10eXBpbmctMi5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzEgQEAK KzxodG1sPgorPGJvZHk+Cis8cD5UZXN0IGZvciA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI5MDUiPmJ1ZyAzMjkwNTwvYT46CitXaXRoIFBpbnlpbiBT aW1wbGlmaWVkIElNLCBhIHdyb25nIGNoYXJhY3RlciBpcyBkZWxldGVkIGZyb20gZ29vZ2xlLmNv bSBzdWdnZXN0aW9uLjwvcD4KKzxwPlNob3VsZCBzYXkgUEFTUzogPC9wPgorPGlucHV0IGlkPSJ0 ZXN0Ij4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKworICAgIGlmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBB c1RleHQoKTsKKworICAgIHZhciB0ZXN0SW5wdXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi dGVzdCIpOworICAgIHRlc3RJbnB1dC5mb2N1cygpOworCisgICAgaWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikgeworICAgICAgICAKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIHRl eHRJbnB1dENvbnRyb2xsZXIuc2V0TWFya2VkVGV4dCgiUCIsIDEsIDApOworICAgICAgICAgICAg dGVzdElucHV0LnZhbHVlPSJQQVMiOworICAgICAgICAgICAgZXZlbnRTZW5kZXIua2V5RG93bigi UyIpOworCisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgicCIpWzFd LmlubmVySFRNTCArPSB0ZXN0SW5wdXQudmFsdWU7CisKKyAgICAgICAgfSBjYXRjaCAoZXgpIHsK KyAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCJFeGNlcHRpb246ICIgKyBleC5kZXNjcmlwdGlv bik7CisgICAgICAgIH0KKyAgICB9IGVsc2UKKyAgICAgICAgZG9jdW1lbnQud3JpdGUoIlRoaXMg dGVzdCBvbmx5IHJ1bnMgaW4gYXV0b21hdGVkIG1vZGU8YnI+Iik7Cis8L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2lucHV0 L3NlbGVjdGlvbi1jaGFuZ2UtY2xvc2VzLXR5cGluZy0yLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5wdXQvc2VsZWN0aW9uLWNoYW5nZS1jbG9z ZXMtdHlwaW5nLTIuaHRtbAkocmV2aXNpb24gOTQyNzYpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvZWRpdGluZy9pbnB1dC9zZWxlY3Rpb24tY2hhbmdlLWNsb3Nlcy10eXBpbmctMi5odG1s CSh3b3JraW5nIGNvcHkpCkBAIC0zLDcgKzMsNyBAQAogPHA+VGVzdCBmb3IgPGEgaHJlZj0iaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyOTA1Ij5idWcgMzI5MDU8L2E+ OgogV2l0aCBQaW55aW4gU2ltcGxpZmllZCBJTSwgYSB3cm9uZyBjaGFyYWN0ZXIgaXMgZGVsZXRl ZCBmcm9tIGdvb2dsZS5jb20gc3VnZ2VzdGlvbi48L3A+CiA8cD5TaG91bGQgc2F5IFBBU1M6IDwv cD4KLTxpbnB1dCBpZD0idGVzdCI+Cis8dGV4dGFyZWEgaWQ9InRlc3QiPjwvdGV4dGFyZWE+CiA8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CiAKICAgICBpZiAod2luZG93LmxheW91dFRl c3RDb250cm9sbGVyKQo=