27942 2009-08-03 08:32:45 -0700 Form Reset does not work per w3c standard when single selection SELECT element has more than one option marked as selected. 2009-08-05 11:39:11 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 carol webkit-unassigned abarth darin ian kenneth laszlo.gombos oldest_to_newest 136635 0 33978 carol 2009-08-03 08:32:45 -0700 Created attachment 33978 Test page that shows the bug HTML 4.01 which is honored by XHTML 1.0 and 1.1 specifies that when a select element does not have the multiple attribute set a browser should never select more than one option element even when the source of the page has multiple options marked as selected as in this case (see sections 17.6.1 and 17.2.1 at http://www.w3.org/TR/html401/interact/forms.html) WebKit selects multiple options after the reset button is clicked, if these options are selected in the source of the page even for a single selection select element. 136654 1 33981 carol 2009-08-03 09:26:46 -0700 Created attachment 33981 Proposed patch Here is a proposed fix. This fix makes WebKit emulated Firefox (select the last option marked as selected), which is behavior compliant with the standard. IE 7, which is also compliant with the standard selects the first item marked as selected in this case. 136659 2 33982 carol 2009-08-03 09:31:27 -0700 Created attachment 33982 Fixed a code style guideline issue 136663 3 33978 eric 2009-08-03 09:43:58 -0700 Comment on attachment 33978 Test page that shows the bug I don't think you meant to mark this for review. See http://webkit.org/coding/contributing.html 136665 4 33982 eric 2009-08-03 09:45:34 -0700 Comment on attachment 33982 Fixed a code style guideline issue Please see http://webkit.org/coding/contributing.html. You need to add your test and expected results as part of this patch. If this change is untestable, you need to explain why. See http://webkit.org/coding/coding-style.html which documents how we use full english word/phrases for variable names. Thus: + OptionElement* selectedEl = 0; is not an OK variable name. The indent is also wrong here: + selectedEl->setSelectedState(false); 136666 5 kenneth 2009-08-03 09:47:59 -0700 There is a script in WebKitTools/Scripts called check-webkit-style that will *help* you to conform to the coding style guideline, though the script doesn't check everything such as variable names. 136795 6 34007 carol 2009-08-03 14:59:41 -0700 Created attachment 34007 Proposed patch improved and test added 136809 7 darin 2009-08-03 15:42:11 -0700 Why did you chose Firefox’s behavior over IE’s since they don’t agree? Does HTML 5 have anything to say about this? 136828 8 ian 2009-08-03 16:09:17 -0700 "The reset algorithm for select elements is to go through all the option elements in the element's list of options, and set their selectedness to true if the option element has a selected attribute, and false otherwise." "If the multiple attribute is absent, whenever an option element in the select element's list of options has its selectedness set to true, and whenever an option element with its selectedness set to true is added to the select element's list of options, the user agent must set the selectedness of all the other option element in its list of options to false." So per spec in the original test case after hitting reset you'd end up with just "3" being selected, just like initially. 136998 9 carol 2009-08-04 08:42:36 -0700 I chose Mozilla's behavior because it would yield the same item selected after reset as it was when the form first loaded and it was conforming to the spec. If I were to choose IE's behavior I would have either caused a different option to be selected after reset than after load or I would have had to change the behavior at page load also. As Ian 'Hixie' commented, my choice seems to match the behavior specified for load, assuming that options are viewed as added in textual order to the select element. In my humble opinion the case my patch is trying to address is an unusual and unimportant case anyway. It deals with a web page that is coded incorrectly. The biggest problem the bug caused is confusion on the user that the selection box may allow multiple selection. Choosing any single value after reset would have solved that. 137048 10 darin 2009-08-04 10:26:33 -0700 (In reply to comment #9) > I chose Mozilla's behavior because it would yield the same item selected after > reset as it was when the form first loaded and it was conforming to the spec. Since Mozilla's behavior matches both what HTML5 specifies and what value we would have when the page was first loaded, then it seems like the right thing to do, even though it does not match IE. 137050 11 34007 darin 2009-08-04 10:31:52 -0700 Comment on attachment 34007 Proposed patch improved and test added This patch looks wrong. As written all it does is rename the boolean to "isOptionSelected" and add a new, never-used "selectedOption". > + selectedOption=optionElement; Missing spaces around the "=" here. > +</form></body></html> > \ No newline at end of file Please add the newline. > Property changes on: LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html > ___________________________________________________________________ > Added: svn:executable > + * Please don't check in executable .html files. You can fix this by using chmod -x before adding the file to Subversion, or svn pd svn:executable after adding the file to Subversion. review- because the code change as posted doesn't seem to do anything! 137116 12 34082 carol 2009-08-04 13:54:46 -0700 Created attachment 34082 Removed the executable flag from the html file and added newline at the end of that file 137118 13 carol 2009-08-04 14:02:06 -0700 (In reply to comment #11) > (From update of attachment 34007 [details]) > This patch looks wrong. As written all it does is rename the boolean to > "isOptionSelected" and add a new, never-used "selectedOption". > > > + selectedOption=optionElement; > Darin, I think that you missed these lines: if (!items[i]->getAttribute(HTMLNames::selectedAttr).isNull()) { + if (selectedOption && !data.multiple()) + selectedOption->setSelectedState(false); optionElement->setSelectedState(true); - optionSelected = true; + selectedOption = optionElement; + isOptionSelected = true; They are intended to unselect the previously selected options if the select box is not a multiple selection box. 137119 14 34083 carol 2009-08-04 14:05:49 -0700 Created attachment 34083 Fixed coding style issue. I apologize for the repeated coding style offenses. The check-webkit-coding-style script does not run on my system so I have to manually check my style and apparently I am not very good at it. I promise to make a better effort next time. 137123 15 34083 darin 2009-08-04 14:23:04 -0700 Comment on attachment 34083 Fixed coding style issue. > + selectedOption = optionElement; > + isOptionSelected = true; I suggest eliminating the isOptionSelected boolean. It's the same as a null check on selectedOption now. > - if (!optionSelected && firstOption && data.usesMenuList()) > + if (!isOptionSelected && firstOption && data.usesMenuList()) Here you would just say !selectedOption. 137137 16 34088 carol 2009-08-04 14:50:16 -0700 Created attachment 34088 Implemented Darin's suggestion in comment #15 137236 17 34088 abarth 2009-08-04 19:30:51 -0700 Comment on attachment 34088 Implemented Darin's suggestion in comment #15 I don't know what this error means, but the commit queue can't handle this patch: patching file WebCore/dom/SelectElement.cpp patch: **** malformed patch at line 15: @@ -502,8 +503,11 @@ void SelectElement::reset(SelectElementD 137312 18 34138 carol 2009-08-05 08:56:51 -0700 Created attachment 34138 Regenerated patch should yield the same result as previous. This patch only differs from previous version in some of the control information for patching the only modified source file. Hopefully this goes through the patching process. I used svn-apply to test this patch and apparently it works. 137322 19 34138 darin 2009-08-05 09:33:57 -0700 Comment on attachment 34138 Regenerated patch should yield the same result as previous. > Property changes on: LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection-expected.txt > ___________________________________________________________________ > Added: svn:executable > + * New text files should not be marked executable! I'll mark this r=me because that's minor and should be harmless. 137358 20 34138 abarth 2009-08-05 11:39:06 -0700 Comment on attachment 34138 Regenerated patch should yield the same result as previous. Clearing review flag on attachment: 34138 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog A LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection-expected.txt A LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html M WebCore/ChangeLog M WebCore/dom/SelectElement.cpp Committed r46806 M WebKitTools/ChangeLog M WebKitTools/Scripts/modules/committers.py r46805 = 40ace582a5cfa5bb9bcd358a3747e3323f3c4a43 (trunk) M WebCore/dom/SelectElement.cpp M WebCore/ChangeLog M LayoutTests/ChangeLog A LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection-expected.txt A LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html r46806 = 8a73293fc161d96e48f967b087cf3131c3b11f62 (trunk) First, rewinding head to replay your work on top of it... Nothing to do. http://trac.webkit.org/changeset/46806 137359 21 abarth 2009-08-05 11:39:11 -0700 All reviewed patches have been landed. Closing bug. 33978 2009-08-03 08:32:45 -0700 2009-08-03 09:43:58 -0700 Test page that shows the bug badsel.htm text/html 511 carol PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0vL1czQy8vRFRE IFhIVE1MIEJhc2ljIDEuMC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbC1iYXNpYy94 aHRtbC1iYXNpYzEwLmR0ZCI+ICANCjxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5 L3hodG1sIj4NCjxib2R5Pg0KPGZvcm0gaWQ9ImZvcm0xIiBtZXRob2Q9InBvc3QiIGFjdGlvbj0i Zm9ybV9yZXNwLmFzcCI+DQogIDxzZWxlY3QgbmFtZT0iU2VsZWN0IiBzaXplPSIyIiA+DQogICAg PG9wdGlvbiBzZWxlY3RlZD0ic2VsZWN0ZWQiPjE8L29wdGlvbj4NCiAgICA8b3B0aW9uPjI8L29w dGlvbj4NCiAgICA8b3B0aW9uIHNlbGVjdGVkPSJzZWxlY3RlZCI+Mzwvb3B0aW9uPg0KDQogICAg PG9wdGlvbj40PC9vcHRpb24+DQogIDwvc2VsZWN0Pg0KPGlucHV0IHR5cGU9InJlc2V0IiBuYW1l PSJyZXNldCIgdmFsdWU9IlJlc2V0IDEiIC8+PGJyLz4NCjwvZm9ybT48L2JvZHk+PC9odG1sPg== 33981 2009-08-03 09:26:46 -0700 2009-08-03 09:31:27 -0700 Proposed patch mypatch.diff text/plain 1723 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNjUyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNzk0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisgICAgICAgICogZG9t L1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0RWxlbWVudDo6cmVz ZXQpOgorICAgICAgICAgICBBZGRlZCBIVE1MIDQuMDEgY29tcGxpYW50IGhhbmRsaW5nIG9mIGJy b2tlbiB3ZWJwYWdlcyB0aGF0CisgICAgICAgICAgIHNwZWNpZnkgbW9yZSB0aGFuIG9uZSBzZWxl Y3RlZCBvcHRpb24gZm9yIHNpbmdsZSBzZWxlY3Rpb24gU0VMRUNUCisgICAgICAgICAgIGVsZW1l bnQsIGluIG1hbm5lciB0aGF0IGVtdWxhdGVzIEZpcmVmb3ggYW5kIGlzIHNpbWlsYXIgdG8gSUUg NworCiAyMDA5LTA2LTMwICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViQ29yZS9kb20vU2Vs ZWN0RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5j cHAJKHJldmlzaW9uIDE2NDI2KQorKysgV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ4Nyw2ICs0ODcsNyBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnJlc2V0 KFNlbGVjdEVsZW1lbnRECiB7CiAgICAgYm9vbCBvcHRpb25TZWxlY3RlZCA9IGZhbHNlOwogICAg IE9wdGlvbkVsZW1lbnQqIGZpcnN0T3B0aW9uID0gMDsKKyAgICBPcHRpb25FbGVtZW50KiBzZWxl Y3RlZEVsPTA7CiAKICAgICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBpdGVtcyA9IGRhdGEubGlz dEl0ZW1zKGVsZW1lbnQpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVtcy5zaXpl KCk7ICsraSkgewpAQCAtNDk1LDcgKzQ5NiwxMCBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnJlc2V0 KFNlbGVjdEVsZW1lbnRECiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoIWl0 ZW1zW2ldLT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpzZWxlY3RlZEF0dHIpLmlzTnVsbCgpKSB7 CisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRFbCAmJiAhZGF0YS5tdWx0aXBsZSgpKQorICAgICAg ICAgICAgICBzZWxlY3RlZEVsLT5zZXRTZWxlY3RlZFN0YXRlKGZhbHNlKTsKICAgICAgICAgICAg IG9wdGlvbkVsZW1lbnQtPnNldFNlbGVjdGVkU3RhdGUodHJ1ZSk7CisgICAgICAgICAgICBzZWxl Y3RlZEVsPW9wdGlvbkVsZW1lbnQ7CiAgICAgICAgICAgICBvcHRpb25TZWxlY3RlZCA9IHRydWU7 CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgb3B0aW9uRWxlbWVudC0+c2V0U2VsZWN0ZWRT dGF0ZShmYWxzZSk7Cg== 33982 2009-08-03 09:31:27 -0700 2009-08-03 14:59:41 -0700 Fixed a code style guideline issue mypatch.diff text/plain 1727 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNjUyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNzk0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisgICAgICAgICogZG9t L1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0RWxlbWVudDo6cmVz ZXQpOgorICAgICAgICAgICBBZGRlZCBIVE1MIDQuMDEgY29tcGxpYW50IGhhbmRsaW5nIG9mIGJy b2tlbiB3ZWJwYWdlcyB0aGF0CisgICAgICAgICAgIHNwZWNpZnkgbW9yZSB0aGFuIG9uZSBzZWxl Y3RlZCBvcHRpb24gZm9yIHNpbmdsZSBzZWxlY3Rpb24gU0VMRUNUCisgICAgICAgICAgIGVsZW1l bnQsIGluIG1hbm5lciB0aGF0IGVtdWxhdGVzIEZpcmVmb3ggYW5kIGlzIHNpbWlsYXIgdG8gSUUg NworCiAyMDA5LTA2LTMwICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViQ29yZS9kb20vU2Vs ZWN0RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5j cHAJKHJldmlzaW9uIDE2NDI2KQorKysgV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ4Nyw2ICs0ODcsNyBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnJlc2V0 KFNlbGVjdEVsZW1lbnRECiB7CiAgICAgYm9vbCBvcHRpb25TZWxlY3RlZCA9IGZhbHNlOwogICAg IE9wdGlvbkVsZW1lbnQqIGZpcnN0T3B0aW9uID0gMDsKKyAgICBPcHRpb25FbGVtZW50KiBzZWxl Y3RlZEVsID0gMDsKIAogICAgIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGl0ZW1zID0gZGF0YS5s aXN0SXRlbXMoZWxlbWVudCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGl0ZW1zLnNp emUoKTsgKytpKSB7CkBAIC00OTUsNyArNDk2LDEwIEBAIHZvaWQgU2VsZWN0RWxlbWVudDo6cmVz ZXQoU2VsZWN0RWxlbWVudEQKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGlmICgh aXRlbXNbaV0tPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OnNlbGVjdGVkQXR0cikuaXNOdWxsKCkp IHsKKyAgICAgICAgICAgIGlmIChzZWxlY3RlZEVsICYmICFkYXRhLm11bHRpcGxlKCkpCisgICAg ICAgICAgICAgIHNlbGVjdGVkRWwtPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOwogICAgICAgICAg ICAgb3B0aW9uRWxlbWVudC0+c2V0U2VsZWN0ZWRTdGF0ZSh0cnVlKTsKKyAgICAgICAgICAgIHNl bGVjdGVkRWwgPSBvcHRpb25FbGVtZW50OwogICAgICAgICAgICAgb3B0aW9uU2VsZWN0ZWQgPSB0 cnVlOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG9wdGlvbkVsZW1lbnQtPnNldFNlbGVj dGVkU3RhdGUoZmFsc2UpOwo= 34007 2009-08-03 14:59:41 -0700 2009-08-04 13:54:46 -0700 Proposed patch improved and test added patchFor27942.txt text/plain 6401 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjczMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzk0MgorCisgICAgICAg IFRlc3Q6IGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5n bGUtc2VsZWN0aW9uLmh0bWwKKworICAgICAgICAqIGRvbS9TZWxlY3RFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6OnJlc2V0KToKKyAgICAgICAgICAgQWRkZWQg SFRNTCA0LjAxIGNvbXBsaWFudCBoYW5kbGluZyBvZiBicm9rZW4gd2VicGFnZXMgdGhhdAorICAg ICAgICAgICBzcGVjaWZ5IG1vcmUgdGhhbiBvbmUgc2VsZWN0ZWQgb3B0aW9uIGZvciBzaW5nbGUg c2VsZWN0aW9uIFNFTEVDVAorICAgICAgICAgICBlbGVtZW50LCBpbiBhIG1hbm5lciB0aGF0IGVt dWxhdGVzIEZpcmVmb3ggYW5kIGlzIHNpbWlsYXIgdG8gSUUgNworCisKIDIwMDktMDgtMDMgIEpv c2VwaCBQZWNvcmFybyAgPGpvZXBlY2swMkBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHJldmlzaW9uIDQ2 NzE2KQorKysgV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ5Miw4ICs0OTIsOSBAQCBib29sIFNlbGVjdEVsZW1lbnQ6OmFwcGVuZEZvcm1EYXRhKFNlbGVj CiAKIHZvaWQgU2VsZWN0RWxlbWVudDo6cmVzZXQoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVs ZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgYm9vbCBvcHRpb25TZWxlY3RlZCA9IGZhbHNlOworICAg IGJvb2wgaXNPcHRpb25TZWxlY3RlZCA9IGZhbHNlOwogICAgIE9wdGlvbkVsZW1lbnQqIGZpcnN0 T3B0aW9uID0gMDsKKyAgICBPcHRpb25FbGVtZW50KiBzZWxlY3RlZE9wdGlvbiA9IDA7CiAKICAg ICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBpdGVtcyA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQp OwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVtcy5zaXplKCk7ICsraSkgewpAQCAt NTAyLDggKzUwMywxMSBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnJlc2V0KFNlbGVjdEVsZW1lbnRE CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoIWl0ZW1zW2ldLT5nZXRBdHRy aWJ1dGUoSFRNTE5hbWVzOjpzZWxlY3RlZEF0dHIpLmlzTnVsbCgpKSB7CisgICAgICAgICAgICBp ZiAoc2VsZWN0ZWRPcHRpb24gJiYgIWRhdGEubXVsdGlwbGUoKSkKKyAgICAgICAgICAgICAgICBz ZWxlY3RlZE9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxzZSk7CiAgICAgICAgICAgICBvcHRp b25FbGVtZW50LT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOwotICAgICAgICAgICAgb3B0aW9uU2Vs ZWN0ZWQgPSB0cnVlOworICAgICAgICAgICAgc2VsZWN0ZWRPcHRpb249b3B0aW9uRWxlbWVudDsK KyAgICAgICAgICAgIGlzT3B0aW9uU2VsZWN0ZWQgPSB0cnVlOwogICAgICAgICB9IGVsc2UKICAg ICAgICAgICAgIG9wdGlvbkVsZW1lbnQtPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOwogCkBAIC01 MTEsNyArNTE1LDcgQEAgdm9pZCBTZWxlY3RFbGVtZW50OjpyZXNldChTZWxlY3RFbGVtZW50RAog ICAgICAgICAgICAgZmlyc3RPcHRpb24gPSBvcHRpb25FbGVtZW50OwogICAgIH0KIAotICAgIGlm ICghb3B0aW9uU2VsZWN0ZWQgJiYgZmlyc3RPcHRpb24gJiYgZGF0YS51c2VzTWVudUxpc3QoKSkK KyAgICBpZiAoIWlzT3B0aW9uU2VsZWN0ZWQgJiYgZmlyc3RPcHRpb24gJiYgZGF0YS51c2VzTWVu dUxpc3QoKSkKICAgICAgICAgZmlyc3RPcHRpb24tPnNldFNlbGVjdGVkU3RhdGUodHJ1ZSk7CiAK ICAgICBlbGVtZW50LT5zZXROZWVkc1N0eWxlUmVjYWxjKCk7CkluZGV4OiBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA0 NjczMikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE0IEBACisyMDA5LTA4LTAzICBTemFibyBDYXJvbCAgPGNhcm9sLnN6YWJvQG5va2lhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IGZv ciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc5NDIKKyAgICAgICAg Rm9ybSBSZXNldCBkb2VzIG5vdCB3b3JrIHBlciB3M2Mgc3RhbmRhcmQgd2hlbiBzaW5nbGUgc2Vs ZWN0aW9uCisgICAgICAgIFNFTEVDVCBlbGVtZW50IGhhcyBtb3JlIHRoYW4gb25lIG9wdGlvbiBt YXJrZWQgYXMgc2VsZWN0ZWQuCisKKyAgICAgICAgKiBmYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1t dWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMt NC1zaW5nbGUtc2VsZWN0aW9uLmh0bWw6IEFkZGVkLgorCiAyMDA5LTA4LTAzICBKYW4gTWljaGFl bCBBbG9uem8gIDxqbWFsb256b0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtHdGtdIFNraXAgYWNj ZXNzaWJpbGl0eS9pbnB1dC1zbGlkZXIuaHRtbCBhcyBpdCBuZWVkcwpJbmRleDogTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmdsZS1z ZWxlY3Rpb24tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZm9y bXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VsZWN0 LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw5IEBACitUaGlzIHRlc3QgY2hlY2tzIHRvIHNlZSB3 aGF0IGhhcHBlbnMgaWYgd2UgbWFyayAyIGl0ZW1zIGFzIHNlbGVjdGVkIGluIGEgc2luZ2xlIHNl bGVjdGlvbiBzZWxlY3QgZWxlbWVudC4KKworSWYgVGhlIHRlc3Qgc3VjY2VlZHMgb25lIHNob3Vs ZCBzZWUgMyBsaW5lcyBiZWxvdyB0aGUgcnVsbGVyIGJlbG93IGVhY2ggY29udGFpbmluZyB0aGUg d29yZCBTVUNDRUVERUQgaW4gaXQuCisKKyAKK0xPQUQ6U1VDQ0VFREVEIQorU0VMRUNUOlNVQ0NF RURFRCEKK1JFU0VUOlNVQ0NFRURFRCEKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmdsZS1z ZWxlY3Rpb24tZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjpleGVjdXRhYmxlCiAg ICsgKgoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxl LXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLmh0bWwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmds ZS1zZWxlY3Rpb24uaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZm9ybXMv c2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDggQEAKKzw/eG1sIHZlcnNpb249IjEuMCI/Pg0KKzwh RE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgQmFzaWMgMS4wLy9FTiIgImh0 dHA6Ly93d3cudzMub3JnL1RSL3hodG1sLWJhc2ljL3hodG1sLWJhc2ljMTAuZHRkIj4gIA0KKzxo dG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4NCis8aGVhZD4NCis8c2Ny aXB0Pg0KK2Z1bmN0aW9uIHByaW50KG1lc3NhZ2UpDQorew0KKyAgICB2YXIgcGFyYWdyYXBoID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgibGkiKTsNCisgICAgcGFyYWdyYXBoLmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UpKTsNCisgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImNvbnNvbGUiKS5hcHBlbmRDaGlsZChwYXJhZ3JhcGgpOw0KK30NCitmdW5jdGlv biB0ZXN0KCkNCit7DQorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpDQorICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7DQorICAgIHNlbGVjdEVsZW1l bnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VsZWN0MSIpOw0KKyAgICBpZiAoc2VsZWN0 RWxlbWVudC52YWx1ZSA9PSAiMyIpDQorICAgICAgICBwcmludCgiTE9BRDpTVUNDRUVERUQhIik7 DQorICAgIGVsc2UNCisgICAgICAgIHByaW50KCJMT0FEOkZBSUxFRDogRXhwZWN0ZWQgJzMnIGZv dW5kICIgKyBzZWxlY3RFbGVtZW50LnZhbHVlKTsNCisgICAgc2VsZWN0RWxlbWVudC5nZXRFbGVt ZW50c0J5VGFnTmFtZSgib3B0aW9uIikuaXRlbSgxKS5zZWxlY3RlZD10cnVlOw0KKyAgICBpZiAo c2VsZWN0RWxlbWVudC52YWx1ZSA9PSAiMiIpDQorICAgICAgICBwcmludCgiU0VMRUNUOlNVQ0NF RURFRCEiKTsNCisgICAgZWxzZQ0KKyAgICAgICAgcHJpbnQoIlNFTEVDVDpGQUlMRUQ6IEV4cGVj dGVkICcyJyBmb3VuZCAiICsgc2VsZWN0RWxlbWVudC52YWx1ZSk7DQorICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJyZXNldDEiKS5jbGljaygpOw0KKyAgICBpZiAoc2VsZWN0RWxlbWVudC52 YWx1ZSA9PSAiMyIpDQorICAgICAgICBwcmludCgiUkVTRVQ6U1VDQ0VFREVEISIpOw0KKyAgICBl bHNlDQorICAgICAgICBwcmludCgiUkVTRVQ6RkFJTEVEOiBFeHBlY3RlZCAnMycgZm91bmQgIiAr IHNlbGVjdEVsZW1lbnQudmFsdWUpOw0KK30NCis8L3NjcmlwdD4NCis8L2hlYWQ+DQorPGJvZHkg b25sb2FkPSJ0ZXN0KCkiPg0KKzxwPlRoaXMgdGVzdCBjaGVja3MgdG8gc2VlIHdoYXQgaGFwcGVu cyBpZiB3ZSBtYXJrIDIgaXRlbXMgYXMgc2VsZWN0ZWQgaW4gYSBzaW5nbGUgc2VsZWN0aW9uIHNl bGVjdCBlbGVtZW50LjwvcD4NCis8cD5JZiBUaGUgdGVzdCBzdWNjZWVkcyBvbmUgc2hvdWxkIHNl ZSAzIGxpbmVzIGJlbG93IHRoZSBydWxsZXIgYmVsb3cgZWFjaCBjb250YWluaW5nIHRoZSB3b3Jk IFNVQ0NFRURFRCBpbiBpdC48L3A+DQorPGZvcm0gaWQ9ImZvcm0xIiBtZXRob2Q9InBvc3QiIGFj dGlvbj0iZm9ybV9yZXNwLmFzcCI+DQorICA8c2VsZWN0IG5hbWU9IlNlbGVjdCIgc2l6ZT0iMiIg aWQ9InNlbGVjdDEiPg0KKyAgICA8b3B0aW9uIHNlbGVjdGVkPSJzZWxlY3RlZCI+MTwvb3B0aW9u Pg0KKyAgICA8b3B0aW9uPjI8L29wdGlvbj4NCisgICAgPG9wdGlvbiBzZWxlY3RlZD0ic2VsZWN0 ZWQiPjM8L29wdGlvbj4NCisNCisgICAgPG9wdGlvbj40PC9vcHRpb24+DQorICA8L3NlbGVjdD4N Cis8aW5wdXQgdHlwZT0icmVzZXQiIG5hbWU9InJlc2V0IiB2YWx1ZT0iUmVzZXQgMSIgaWQ9InJl c2V0MSIvPjxici8+DQorPGhyPg0KKzxwPjxvbCBpZD1jb25zb2xlPjwvb2w+PC9wPg0KKzwvZm9y bT48L2JvZHk+PC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKClByb3BlcnR5IGNo YW5nZXMgb246IExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNl bGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLmh0bWwKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOmV4 ZWN1dGFibGUKICAgKyAqCgo= 34082 2009-08-04 13:54:46 -0700 2009-08-04 14:05:49 -0700 Removed the executable flag from the html file and added newline at the end of that file patchFor27942.txt text/plain 6173 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjczMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzk0MgorCisgICAgICAg IFRlc3Q6IGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5n bGUtc2VsZWN0aW9uLmh0bWwKKworICAgICAgICAqIGRvbS9TZWxlY3RFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6OnJlc2V0KToKKyAgICAgICAgICAgQWRkZWQg SFRNTCA0LjAxIGNvbXBsaWFudCBoYW5kbGluZyBvZiBicm9rZW4gd2VicGFnZXMgdGhhdAorICAg ICAgICAgICBzcGVjaWZ5IG1vcmUgdGhhbiBvbmUgc2VsZWN0ZWQgb3B0aW9uIGZvciBzaW5nbGUg c2VsZWN0aW9uIFNFTEVDVAorICAgICAgICAgICBlbGVtZW50LCBpbiBhIG1hbm5lciB0aGF0IGVt dWxhdGVzIEZpcmVmb3ggYW5kIGlzIHNpbWlsYXIgdG8gSUUgNworCisKIDIwMDktMDgtMDMgIEpv c2VwaCBQZWNvcmFybyAgPGpvZXBlY2swMkBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHJldmlzaW9uIDQ2 NzE2KQorKysgV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ5Miw4ICs0OTIsOSBAQCBib29sIFNlbGVjdEVsZW1lbnQ6OmFwcGVuZEZvcm1EYXRhKFNlbGVj CiAKIHZvaWQgU2VsZWN0RWxlbWVudDo6cmVzZXQoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVs ZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgYm9vbCBvcHRpb25TZWxlY3RlZCA9IGZhbHNlOworICAg IGJvb2wgaXNPcHRpb25TZWxlY3RlZCA9IGZhbHNlOwogICAgIE9wdGlvbkVsZW1lbnQqIGZpcnN0 T3B0aW9uID0gMDsKKyAgICBPcHRpb25FbGVtZW50KiBzZWxlY3RlZE9wdGlvbiA9IDA7CiAKICAg ICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBpdGVtcyA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQp OwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVtcy5zaXplKCk7ICsraSkgewpAQCAt NTAyLDggKzUwMywxMSBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnJlc2V0KFNlbGVjdEVsZW1lbnRE CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoIWl0ZW1zW2ldLT5nZXRBdHRy aWJ1dGUoSFRNTE5hbWVzOjpzZWxlY3RlZEF0dHIpLmlzTnVsbCgpKSB7CisgICAgICAgICAgICBp ZiAoc2VsZWN0ZWRPcHRpb24gJiYgIWRhdGEubXVsdGlwbGUoKSkKKyAgICAgICAgICAgICAgICBz ZWxlY3RlZE9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxzZSk7CiAgICAgICAgICAgICBvcHRp b25FbGVtZW50LT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOwotICAgICAgICAgICAgb3B0aW9uU2Vs ZWN0ZWQgPSB0cnVlOworICAgICAgICAgICAgc2VsZWN0ZWRPcHRpb249b3B0aW9uRWxlbWVudDsK KyAgICAgICAgICAgIGlzT3B0aW9uU2VsZWN0ZWQgPSB0cnVlOwogICAgICAgICB9IGVsc2UKICAg ICAgICAgICAgIG9wdGlvbkVsZW1lbnQtPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOwogCkBAIC01 MTEsNyArNTE1LDcgQEAgdm9pZCBTZWxlY3RFbGVtZW50OjpyZXNldChTZWxlY3RFbGVtZW50RAog ICAgICAgICAgICAgZmlyc3RPcHRpb24gPSBvcHRpb25FbGVtZW50OwogICAgIH0KIAotICAgIGlm ICghb3B0aW9uU2VsZWN0ZWQgJiYgZmlyc3RPcHRpb24gJiYgZGF0YS51c2VzTWVudUxpc3QoKSkK KyAgICBpZiAoIWlzT3B0aW9uU2VsZWN0ZWQgJiYgZmlyc3RPcHRpb24gJiYgZGF0YS51c2VzTWVu dUxpc3QoKSkKICAgICAgICAgZmlyc3RPcHRpb24tPnNldFNlbGVjdGVkU3RhdGUodHJ1ZSk7CiAK ICAgICBlbGVtZW50LT5zZXROZWVkc1N0eWxlUmVjYWxjKCk7CkluZGV4OiBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA0 NjczMikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE0IEBACisyMDA5LTA4LTAzICBTemFibyBDYXJvbCAgPGNhcm9sLnN6YWJvQG5va2lhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IGZv ciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc5NDIKKyAgICAgICAg Rm9ybSBSZXNldCBkb2VzIG5vdCB3b3JrIHBlciB3M2Mgc3RhbmRhcmQgd2hlbiBzaW5nbGUgc2Vs ZWN0aW9uCisgICAgICAgIFNFTEVDVCBlbGVtZW50IGhhcyBtb3JlIHRoYW4gb25lIG9wdGlvbiBt YXJrZWQgYXMgc2VsZWN0ZWQuCisKKyAgICAgICAgKiBmYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1t dWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMt NC1zaW5nbGUtc2VsZWN0aW9uLmh0bWw6IEFkZGVkLgorCiAyMDA5LTA4LTAzICBKYW4gTWljaGFl bCBBbG9uem8gIDxqbWFsb256b0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtHdGtdIFNraXAgYWNj ZXNzaWJpbGl0eS9pbnB1dC1zbGlkZXIuaHRtbCBhcyBpdCBuZWVkcwpJbmRleDogTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmdsZS1z ZWxlY3Rpb24tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZm9y bXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VsZWN0 LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw5IEBACitUaGlzIHRlc3QgY2hlY2tzIHRvIHNlZSB3 aGF0IGhhcHBlbnMgaWYgd2UgbWFyayAyIGl0ZW1zIGFzIHNlbGVjdGVkIGluIGEgc2luZ2xlIHNl bGVjdGlvbiBzZWxlY3QgZWxlbWVudC4KKworSWYgVGhlIHRlc3Qgc3VjY2VlZHMgb25lIHNob3Vs ZCBzZWUgMyBsaW5lcyBiZWxvdyB0aGUgcnVsbGVyIGJlbG93IGVhY2ggY29udGFpbmluZyB0aGUg d29yZCBTVUNDRUVERUQgaW4gaXQuCisKKyAKK0xPQUQ6U1VDQ0VFREVEIQorU0VMRUNUOlNVQ0NF RURFRCEKK1JFU0VUOlNVQ0NFRURFRCEKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmdsZS1z ZWxlY3Rpb24tZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjpleGVjdXRhYmxlCiAg ICsgKgoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxl LXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLmh0bWwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmds ZS1zZWxlY3Rpb24uaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZm9ybXMv c2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDggQEAKKzw/eG1sIHZlcnNpb249IjEuMCI/Pg0KKzwh RE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgQmFzaWMgMS4wLy9FTiIgImh0 dHA6Ly93d3cudzMub3JnL1RSL3hodG1sLWJhc2ljL3hodG1sLWJhc2ljMTAuZHRkIj4gIA0KKzxo dG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4NCis8aGVhZD4NCis8c2Ny aXB0Pg0KK2Z1bmN0aW9uIHByaW50KG1lc3NhZ2UpDQorew0KKyAgICB2YXIgcGFyYWdyYXBoID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgibGkiKTsNCisgICAgcGFyYWdyYXBoLmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UpKTsNCisgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImNvbnNvbGUiKS5hcHBlbmRDaGlsZChwYXJhZ3JhcGgpOw0KK30NCitmdW5jdGlv biB0ZXN0KCkNCit7DQorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpDQorICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7DQorICAgIHNlbGVjdEVsZW1l bnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VsZWN0MSIpOw0KKyAgICBpZiAoc2VsZWN0 RWxlbWVudC52YWx1ZSA9PSAiMyIpDQorICAgICAgICBwcmludCgiTE9BRDpTVUNDRUVERUQhIik7 DQorICAgIGVsc2UNCisgICAgICAgIHByaW50KCJMT0FEOkZBSUxFRDogRXhwZWN0ZWQgJzMnIGZv dW5kICIgKyBzZWxlY3RFbGVtZW50LnZhbHVlKTsNCisgICAgc2VsZWN0RWxlbWVudC5nZXRFbGVt ZW50c0J5VGFnTmFtZSgib3B0aW9uIikuaXRlbSgxKS5zZWxlY3RlZD10cnVlOw0KKyAgICBpZiAo c2VsZWN0RWxlbWVudC52YWx1ZSA9PSAiMiIpDQorICAgICAgICBwcmludCgiU0VMRUNUOlNVQ0NF RURFRCEiKTsNCisgICAgZWxzZQ0KKyAgICAgICAgcHJpbnQoIlNFTEVDVDpGQUlMRUQ6IEV4cGVj dGVkICcyJyBmb3VuZCAiICsgc2VsZWN0RWxlbWVudC52YWx1ZSk7DQorICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJyZXNldDEiKS5jbGljaygpOw0KKyAgICBpZiAoc2VsZWN0RWxlbWVudC52 YWx1ZSA9PSAiMyIpDQorICAgICAgICBwcmludCgiUkVTRVQ6U1VDQ0VFREVEISIpOw0KKyAgICBl bHNlDQorICAgICAgICBwcmludCgiUkVTRVQ6RkFJTEVEOiBFeHBlY3RlZCAnMycgZm91bmQgIiAr IHNlbGVjdEVsZW1lbnQudmFsdWUpOw0KK30NCis8L3NjcmlwdD4NCis8L2hlYWQ+DQorPGJvZHkg b25sb2FkPSJ0ZXN0KCkiPg0KKzxwPlRoaXMgdGVzdCBjaGVja3MgdG8gc2VlIHdoYXQgaGFwcGVu cyBpZiB3ZSBtYXJrIDIgaXRlbXMgYXMgc2VsZWN0ZWQgaW4gYSBzaW5nbGUgc2VsZWN0aW9uIHNl bGVjdCBlbGVtZW50LjwvcD4NCis8cD5JZiBUaGUgdGVzdCBzdWNjZWVkcyBvbmUgc2hvdWxkIHNl ZSAzIGxpbmVzIGJlbG93IHRoZSBydWxsZXIgYmVsb3cgZWFjaCBjb250YWluaW5nIHRoZSB3b3Jk IFNVQ0NFRURFRCBpbiBpdC48L3A+DQorPGZvcm0gaWQ9ImZvcm0xIiBtZXRob2Q9InBvc3QiIGFj dGlvbj0iZm9ybV9yZXNwLmFzcCI+DQorICA8c2VsZWN0IG5hbWU9IlNlbGVjdCIgc2l6ZT0iMiIg aWQ9InNlbGVjdDEiPg0KKyAgICA8b3B0aW9uIHNlbGVjdGVkPSJzZWxlY3RlZCI+MTwvb3B0aW9u Pg0KKyAgICA8b3B0aW9uPjI8L29wdGlvbj4NCisgICAgPG9wdGlvbiBzZWxlY3RlZD0ic2VsZWN0 ZWQiPjM8L29wdGlvbj4NCisNCisgICAgPG9wdGlvbj40PC9vcHRpb24+DQorICA8L3NlbGVjdD4N Cis8aW5wdXQgdHlwZT0icmVzZXQiIG5hbWU9InJlc2V0IiB2YWx1ZT0iUmVzZXQgMSIgaWQ9InJl c2V0MSIvPjxici8+DQorPGhyPg0KKzxwPjxvbCBpZD1jb25zb2xlPjwvb2w+PC9wPg0KKzwvZm9y bT48L2JvZHk+PC9odG1sPgo= 34083 2009-08-04 14:05:49 -0700 2009-08-04 14:50:16 -0700 Fixed coding style issue. patchFor27942.txt text/plain 6175 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjczMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzk0MgorCisgICAgICAg IFRlc3Q6IGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5n bGUtc2VsZWN0aW9uLmh0bWwKKworICAgICAgICAqIGRvbS9TZWxlY3RFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6OnJlc2V0KToKKyAgICAgICAgICAgQWRkZWQg SFRNTCA0LjAxIGNvbXBsaWFudCBoYW5kbGluZyBvZiBicm9rZW4gd2VicGFnZXMgdGhhdAorICAg ICAgICAgICBzcGVjaWZ5IG1vcmUgdGhhbiBvbmUgc2VsZWN0ZWQgb3B0aW9uIGZvciBzaW5nbGUg c2VsZWN0aW9uIFNFTEVDVAorICAgICAgICAgICBlbGVtZW50LCBpbiBhIG1hbm5lciB0aGF0IGVt dWxhdGVzIEZpcmVmb3ggYW5kIGlzIHNpbWlsYXIgdG8gSUUgNworCisKIDIwMDktMDgtMDMgIEpv c2VwaCBQZWNvcmFybyAgPGpvZXBlY2swMkBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHJldmlzaW9uIDQ2 NzE2KQorKysgV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ5Miw4ICs0OTIsOSBAQCBib29sIFNlbGVjdEVsZW1lbnQ6OmFwcGVuZEZvcm1EYXRhKFNlbGVj CiAKIHZvaWQgU2VsZWN0RWxlbWVudDo6cmVzZXQoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVs ZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgYm9vbCBvcHRpb25TZWxlY3RlZCA9IGZhbHNlOworICAg IGJvb2wgaXNPcHRpb25TZWxlY3RlZCA9IGZhbHNlOwogICAgIE9wdGlvbkVsZW1lbnQqIGZpcnN0 T3B0aW9uID0gMDsKKyAgICBPcHRpb25FbGVtZW50KiBzZWxlY3RlZE9wdGlvbiA9IDA7CiAKICAg ICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBpdGVtcyA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQp OwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVtcy5zaXplKCk7ICsraSkgewpAQCAt NTAyLDggKzUwMywxMSBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnJlc2V0KFNlbGVjdEVsZW1lbnRE CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoIWl0ZW1zW2ldLT5nZXRBdHRy aWJ1dGUoSFRNTE5hbWVzOjpzZWxlY3RlZEF0dHIpLmlzTnVsbCgpKSB7CisgICAgICAgICAgICBp ZiAoc2VsZWN0ZWRPcHRpb24gJiYgIWRhdGEubXVsdGlwbGUoKSkKKyAgICAgICAgICAgICAgICBz ZWxlY3RlZE9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxzZSk7CiAgICAgICAgICAgICBvcHRp b25FbGVtZW50LT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOwotICAgICAgICAgICAgb3B0aW9uU2Vs ZWN0ZWQgPSB0cnVlOworICAgICAgICAgICAgc2VsZWN0ZWRPcHRpb24gPSBvcHRpb25FbGVtZW50 OworICAgICAgICAgICAgaXNPcHRpb25TZWxlY3RlZCA9IHRydWU7CiAgICAgICAgIH0gZWxzZQog ICAgICAgICAgICAgb3B0aW9uRWxlbWVudC0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxzZSk7CiAKQEAg LTUxMSw3ICs1MTUsNyBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6OnJlc2V0KFNlbGVjdEVsZW1lbnRE CiAgICAgICAgICAgICBmaXJzdE9wdGlvbiA9IG9wdGlvbkVsZW1lbnQ7CiAgICAgfQogCi0gICAg aWYgKCFvcHRpb25TZWxlY3RlZCAmJiBmaXJzdE9wdGlvbiAmJiBkYXRhLnVzZXNNZW51TGlzdCgp KQorICAgIGlmICghaXNPcHRpb25TZWxlY3RlZCAmJiBmaXJzdE9wdGlvbiAmJiBkYXRhLnVzZXNN ZW51TGlzdCgpKQogICAgICAgICBmaXJzdE9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZSh0cnVlKTsK IAogICAgIGVsZW1lbnQtPnNldE5lZWRzU3R5bGVSZWNhbGMoKTsKSW5kZXg6IExheW91dFRlc3Rz L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9u IDQ2NzMyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTQgQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Qg Zm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzk0MgorICAgICAg ICBGb3JtIFJlc2V0IGRvZXMgbm90IHdvcmsgcGVyIHczYyBzdGFuZGFyZCB3aGVuIHNpbmdsZSBz ZWxlY3Rpb24KKyAgICAgICAgU0VMRUNUIGVsZW1lbnQgaGFzIG1vcmUgdGhhbiBvbmUgb3B0aW9u IG1hcmtlZCBhcyBzZWxlY3RlZC4KKworICAgICAgICAqIGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0 LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9u cy00LXNpbmdsZS1zZWxlY3Rpb24uaHRtbDogQWRkZWQuCisKIDIwMDktMDgtMDMgIEphbiBNaWNo YWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0d0a10gU2tpcCBh Y2Nlc3NpYmlsaXR5L2lucHV0LXNsaWRlci5odG1sIGFzIGl0IG5lZWRzCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xl LXNlbGVjdGlvbi1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9m b3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmdsZS1zZWxlY3Rpb24t ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWxl Y3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmdsZS1zZWxlY3Rpb24tZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDkgQEAKK1RoaXMgdGVzdCBjaGVja3MgdG8gc2Vl IHdoYXQgaGFwcGVucyBpZiB3ZSBtYXJrIDIgaXRlbXMgYXMgc2VsZWN0ZWQgaW4gYSBzaW5nbGUg c2VsZWN0aW9uIHNlbGVjdCBlbGVtZW50LgorCitJZiBUaGUgdGVzdCBzdWNjZWVkcyBvbmUgc2hv dWxkIHNlZSAzIGxpbmVzIGJlbG93IHRoZSBydWxsZXIgYmVsb3cgZWFjaCBjb250YWluaW5nIHRo ZSB3b3JkIFNVQ0NFRURFRCBpbiBpdC4KKworIAorTE9BRDpTVUNDRUVERUQhCitTRUxFQ1Q6U1VD Q0VFREVEIQorUkVTRVQ6U1VDQ0VFREVEIQorCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRU ZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xl LXNlbGVjdGlvbi1leHBlY3RlZC50eHQKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOmV4ZWN1dGFibGUK ICAgKyAqCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlw bGUtc2VsZWN0aW9ucy00LXNpbmdsZS1zZWxlY3Rpb24uaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1zZWxlY3Rpb25zLTQtc2lu Z2xlLXNlbGVjdGlvbi5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9mb3Jt cy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9ucy00LXNpbmdsZS1zZWxlY3Rpb24uaHRt bAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0OCBAQAorPD94bWwgdmVyc2lvbj0iMS4wIj8+DQor PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCBCYXNpYyAxLjAvL0VOIiAi aHR0cDovL3d3dy53My5vcmcvVFIveGh0bWwtYmFzaWMveGh0bWwtYmFzaWMxMC5kdGQiPiAgDQor PGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPg0KKzxoZWFkPg0KKzxz Y3JpcHQ+DQorZnVuY3Rpb24gcHJpbnQobWVzc2FnZSkNCit7DQorICAgIHZhciBwYXJhZ3JhcGgg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJsaSIpOw0KKyAgICBwYXJhZ3JhcGguYXBwZW5kQ2hp bGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobWVzc2FnZSkpOw0KKyAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiY29uc29sZSIpLmFwcGVuZENoaWxkKHBhcmFncmFwaCk7DQorfQ0KK2Z1bmN0 aW9uIHRlc3QoKQ0KK3sNCisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikNCisg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsNCisgICAgc2VsZWN0RWxl bWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWxlY3QxIik7DQorICAgIGlmIChzZWxl Y3RFbGVtZW50LnZhbHVlID09ICIzIikNCisgICAgICAgIHByaW50KCJMT0FEOlNVQ0NFRURFRCEi KTsNCisgICAgZWxzZQ0KKyAgICAgICAgcHJpbnQoIkxPQUQ6RkFJTEVEOiBFeHBlY3RlZCAnMycg Zm91bmQgIiArIHNlbGVjdEVsZW1lbnQudmFsdWUpOw0KKyAgICBzZWxlY3RFbGVtZW50LmdldEVs ZW1lbnRzQnlUYWdOYW1lKCJvcHRpb24iKS5pdGVtKDEpLnNlbGVjdGVkPXRydWU7DQorICAgIGlm IChzZWxlY3RFbGVtZW50LnZhbHVlID09ICIyIikNCisgICAgICAgIHByaW50KCJTRUxFQ1Q6U1VD Q0VFREVEISIpOw0KKyAgICBlbHNlDQorICAgICAgICBwcmludCgiU0VMRUNUOkZBSUxFRDogRXhw ZWN0ZWQgJzInIGZvdW5kICIgKyBzZWxlY3RFbGVtZW50LnZhbHVlKTsNCisgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInJlc2V0MSIpLmNsaWNrKCk7DQorICAgIGlmIChzZWxlY3RFbGVtZW50 LnZhbHVlID09ICIzIikNCisgICAgICAgIHByaW50KCJSRVNFVDpTVUNDRUVERUQhIik7DQorICAg IGVsc2UNCisgICAgICAgIHByaW50KCJSRVNFVDpGQUlMRUQ6IEV4cGVjdGVkICczJyBmb3VuZCAi ICsgc2VsZWN0RWxlbWVudC52YWx1ZSk7DQorfQ0KKzwvc2NyaXB0Pg0KKzwvaGVhZD4NCis8Ym9k eSBvbmxvYWQ9InRlc3QoKSI+DQorPHA+VGhpcyB0ZXN0IGNoZWNrcyB0byBzZWUgd2hhdCBoYXBw ZW5zIGlmIHdlIG1hcmsgMiBpdGVtcyBhcyBzZWxlY3RlZCBpbiBhIHNpbmdsZSBzZWxlY3Rpb24g c2VsZWN0IGVsZW1lbnQuPC9wPg0KKzxwPklmIFRoZSB0ZXN0IHN1Y2NlZWRzIG9uZSBzaG91bGQg c2VlIDMgbGluZXMgYmVsb3cgdGhlIHJ1bGxlciBiZWxvdyBlYWNoIGNvbnRhaW5pbmcgdGhlIHdv cmQgU1VDQ0VFREVEIGluIGl0LjwvcD4NCis8Zm9ybSBpZD0iZm9ybTEiIG1ldGhvZD0icG9zdCIg YWN0aW9uPSJmb3JtX3Jlc3AuYXNwIj4NCisgIDxzZWxlY3QgbmFtZT0iU2VsZWN0IiBzaXplPSIy IiBpZD0ic2VsZWN0MSI+DQorICAgIDxvcHRpb24gc2VsZWN0ZWQ9InNlbGVjdGVkIj4xPC9vcHRp b24+DQorICAgIDxvcHRpb24+Mjwvb3B0aW9uPg0KKyAgICA8b3B0aW9uIHNlbGVjdGVkPSJzZWxl Y3RlZCI+Mzwvb3B0aW9uPg0KKw0KKyAgICA8b3B0aW9uPjQ8L29wdGlvbj4NCisgIDwvc2VsZWN0 Pg0KKzxpbnB1dCB0eXBlPSJyZXNldCIgbmFtZT0icmVzZXQiIHZhbHVlPSJSZXNldCAxIiBpZD0i cmVzZXQxIi8+PGJyLz4NCis8aHI+DQorPHA+PG9sIGlkPWNvbnNvbGU+PC9vbD48L3A+DQorPC9m b3JtPjwvYm9keT48L2h0bWw+Cg== 34088 2009-08-04 14:50:16 -0700 2009-08-05 08:56:51 -0700 Implemented Darin's suggestion in comment #15 patchFor27942.txt text/plain 6099 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjczMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzk0MgorCisgICAgICAg IFRlc3Q6IGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5n bGUtc2VsZWN0aW9uLmh0bWwKKworICAgICAgICAqIGRvbS9TZWxlY3RFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6OnJlc2V0KToKKyAgICAgICAgICAgQWRkZWQg SFRNTCA0LjAxIGNvbXBsaWFudCBoYW5kbGluZyBvZiBicm9rZW4gd2VicGFnZXMgdGhhdAorICAg ICAgICAgICBzcGVjaWZ5IG1vcmUgdGhhbiBvbmUgc2VsZWN0ZWQgb3B0aW9uIGZvciBzaW5nbGUg c2VsZWN0aW9uIFNFTEVDVAorICAgICAgICAgICBlbGVtZW50LCBpbiBhIG1hbm5lciB0aGF0IGVt dWxhdGVzIEZpcmVmb3ggYW5kIGlzIHNpbWlsYXIgdG8gSUUgNworCisKIDIwMDktMDgtMDMgIEpv c2VwaCBQZWNvcmFybyAgPGpvZXBlY2swMkBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHJldmlzaW9uIDQ2 NzE2KQorKysgV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ5Miw4ICs0OTIsOSBAQCBib29sIFNlbGVjdEVsZW1lbnQ6OmFwcGVuZEZvcm1EYXRhKFNlbGVj CiAKIHZvaWQgU2VsZWN0RWxlbWVudDo6cmVzZXQoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVs ZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgYm9vbCBvcHRpb25TZWxlY3RlZCA9IGZhbHNlOwogICAg IE9wdGlvbkVsZW1lbnQqIGZpcnN0T3B0aW9uID0gMDsKKyAgICBPcHRpb25FbGVtZW50KiBzZWxl Y3RlZE9wdGlvbiA9IDA7CiAKICAgICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBpdGVtcyA9IGRh dGEubGlzdEl0ZW1zKGVsZW1lbnQpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVt cy5zaXplKCk7ICsraSkgewpAQCAtNTAyLDggKzUwMywxMSBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6 OnJlc2V0KFNlbGVjdEVsZW1lbnRECiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBp ZiAoIWl0ZW1zW2ldLT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpzZWxlY3RlZEF0dHIpLmlzTnVs bCgpKSB7CisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRPcHRpb24gJiYgIWRhdGEubXVsdGlwbGUo KSkKKyAgICAgICAgICAgICAgICBzZWxlY3RlZE9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxz ZSk7CiAgICAgICAgICAgICBvcHRpb25FbGVtZW50LT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOwot ICAgICAgICAgICAgb3B0aW9uU2VsZWN0ZWQgPSB0cnVlOworICAgICAgICAgICAgc2VsZWN0ZWRP cHRpb24gPSBvcHRpb25FbGVtZW50OwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG9wdGlv bkVsZW1lbnQtPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOwogCkBAIC01MTEsNyArNTE1LDcgQEAg dm9pZCBTZWxlY3RFbGVtZW50OjpyZXNldChTZWxlY3RFbGVtZW50RAogICAgICAgICAgICAgZmly c3RPcHRpb24gPSBvcHRpb25FbGVtZW50OwogICAgIH0KIAotICAgIGlmICghb3B0aW9uU2VsZWN0 ZWQgJiYgZmlyc3RPcHRpb24gJiYgZGF0YS51c2VzTWVudUxpc3QoKSkKKyAgICBpZiAoIXNlbGVj dGVkT3B0aW9uICYmIGZpcnN0T3B0aW9uICYmIGRhdGEudXNlc01lbnVMaXN0KCkpCiAgICAgICAg IGZpcnN0T3B0aW9uLT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOwogCiAgICAgZWxlbWVudC0+c2V0 TmVlZHNTdHlsZVJlY2FsYygpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDY3MzIpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wOC0w MyAgU3phYm8gQ2Fyb2wgIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCBmb3IgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3OTQyCisgICAgICAgIEZvcm0gUmVzZXQgZG9lcyBu b3Qgd29yayBwZXIgdzNjIHN0YW5kYXJkIHdoZW4gc2luZ2xlIHNlbGVjdGlvbgorICAgICAgICBT RUxFQ1QgZWxlbWVudCBoYXMgbW9yZSB0aGFuIG9uZSBvcHRpb24gbWFya2VkIGFzIHNlbGVjdGVk LgorCisgICAgICAgICogZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9u cy00LXNpbmdsZS1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlv bi5odG1sOiBBZGRlZC4KKwogMjAwOS0wOC0wMyAgSmFuIE1pY2hhZWwgQWxvbnpvICA8am1hbG9u em9Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbR3RrXSBTa2lwIGFjY2Vzc2liaWxpdHkvaW5wdXQt c2xpZGVyLmh0bWwgYXMgaXQgbmVlZHMKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2Vs ZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1t dWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQJKHJldmlz aW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1z ZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsOSBAQAorVGhpcyB0ZXN0IGNoZWNrcyB0byBzZWUgd2hhdCBoYXBwZW5zIGlmIHdl IG1hcmsgMiBpdGVtcyBhcyBzZWxlY3RlZCBpbiBhIHNpbmdsZSBzZWxlY3Rpb24gc2VsZWN0IGVs ZW1lbnQuCisKK0lmIFRoZSB0ZXN0IHN1Y2NlZWRzIG9uZSBzaG91bGQgc2VlIDMgbGluZXMgYmVs b3cgdGhlIHJ1bGxlciBiZWxvdyBlYWNoIGNvbnRhaW5pbmcgdGhlIHdvcmQgU1VDQ0VFREVEIGlu IGl0LgorCisgCitMT0FEOlNVQ0NFRURFRCEKK1NFTEVDVDpTVUNDRUVERUQhCitSRVNFVDpTVUND RUVERUQhCisKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2Vs ZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4cGVjdGVk LnR4dApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkFkZGVkOiBzdm46ZXhlY3V0YWJsZQogICArICoKCkluZGV4OiBMYXlv dXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1zZWxlY3Rpb25zLTQtc2lu Z2xlLXNlbGVjdGlvbi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZm9ybXMv c2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0 aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi5odG1sCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDQ4IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiPz4NCis8IURPQ1RZUEUgaHRtbCBQVUJM SUMgIi0vL1czQy8vRFREIFhIVE1MIEJhc2ljIDEuMC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9U Ui94aHRtbC1iYXNpYy94aHRtbC1iYXNpYzEwLmR0ZCI+ICANCis8aHRtbCB4bWxucz0iaHR0cDov L3d3dy53My5vcmcvMTk5OS94aHRtbCI+DQorPGhlYWQ+DQorPHNjcmlwdD4NCitmdW5jdGlvbiBw cmludChtZXNzYWdlKQ0KK3sNCisgICAgdmFyIHBhcmFncmFwaCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImxpIik7DQorICAgIHBhcmFncmFwaC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVU ZXh0Tm9kZShtZXNzYWdlKSk7DQorICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xl IikuYXBwZW5kQ2hpbGQocGFyYWdyYXBoKTsNCit9DQorZnVuY3Rpb24gdGVzdCgpDQorew0KKyAg ICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQ0KKyAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOw0KKyAgICBzZWxlY3RFbGVtZW50ID0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInNlbGVjdDEiKTsNCisgICAgaWYgKHNlbGVjdEVsZW1lbnQudmFsdWUgPT0g IjMiKQ0KKyAgICAgICAgcHJpbnQoIkxPQUQ6U1VDQ0VFREVEISIpOw0KKyAgICBlbHNlDQorICAg ICAgICBwcmludCgiTE9BRDpGQUlMRUQ6IEV4cGVjdGVkICczJyBmb3VuZCAiICsgc2VsZWN0RWxl bWVudC52YWx1ZSk7DQorICAgIHNlbGVjdEVsZW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoIm9w dGlvbiIpLml0ZW0oMSkuc2VsZWN0ZWQ9dHJ1ZTsNCisgICAgaWYgKHNlbGVjdEVsZW1lbnQudmFs dWUgPT0gIjIiKQ0KKyAgICAgICAgcHJpbnQoIlNFTEVDVDpTVUNDRUVERUQhIik7DQorICAgIGVs c2UNCisgICAgICAgIHByaW50KCJTRUxFQ1Q6RkFJTEVEOiBFeHBlY3RlZCAnMicgZm91bmQgIiAr IHNlbGVjdEVsZW1lbnQudmFsdWUpOw0KKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVz ZXQxIikuY2xpY2soKTsNCisgICAgaWYgKHNlbGVjdEVsZW1lbnQudmFsdWUgPT0gIjMiKQ0KKyAg ICAgICAgcHJpbnQoIlJFU0VUOlNVQ0NFRURFRCEiKTsNCisgICAgZWxzZQ0KKyAgICAgICAgcHJp bnQoIlJFU0VUOkZBSUxFRDogRXhwZWN0ZWQgJzMnIGZvdW5kICIgKyBzZWxlY3RFbGVtZW50LnZh bHVlKTsNCit9DQorPC9zY3JpcHQ+DQorPC9oZWFkPg0KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4N Cis8cD5UaGlzIHRlc3QgY2hlY2tzIHRvIHNlZSB3aGF0IGhhcHBlbnMgaWYgd2UgbWFyayAyIGl0 ZW1zIGFzIHNlbGVjdGVkIGluIGEgc2luZ2xlIHNlbGVjdGlvbiBzZWxlY3QgZWxlbWVudC48L3A+ DQorPHA+SWYgVGhlIHRlc3Qgc3VjY2VlZHMgb25lIHNob3VsZCBzZWUgMyBsaW5lcyBiZWxvdyB0 aGUgcnVsbGVyIGJlbG93IGVhY2ggY29udGFpbmluZyB0aGUgd29yZCBTVUNDRUVERUQgaW4gaXQu PC9wPg0KKzxmb3JtIGlkPSJmb3JtMSIgbWV0aG9kPSJwb3N0IiBhY3Rpb249ImZvcm1fcmVzcC5h c3AiPg0KKyAgPHNlbGVjdCBuYW1lPSJTZWxlY3QiIHNpemU9IjIiIGlkPSJzZWxlY3QxIj4NCisg ICAgPG9wdGlvbiBzZWxlY3RlZD0ic2VsZWN0ZWQiPjE8L29wdGlvbj4NCisgICAgPG9wdGlvbj4y PC9vcHRpb24+DQorICAgIDxvcHRpb24gc2VsZWN0ZWQ9InNlbGVjdGVkIj4zPC9vcHRpb24+DQor DQorICAgIDxvcHRpb24+NDwvb3B0aW9uPg0KKyAgPC9zZWxlY3Q+DQorPGlucHV0IHR5cGU9InJl c2V0IiBuYW1lPSJyZXNldCIgdmFsdWU9IlJlc2V0IDEiIGlkPSJyZXNldDEiLz48YnIvPg0KKzxo cj4NCis8cD48b2wgaWQ9Y29uc29sZT48L29sPjwvcD4NCis8L2Zvcm0+PC9ib2R5PjwvaHRtbD4K 34138 2009-08-05 08:56:51 -0700 2009-08-05 11:39:05 -0700 Regenerated patch should yield the same result as previous. patchFor27942.txt text/plain 6099 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjczMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDgtMDMgIFN6YWJvIENhcm9sICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzk0MgorCisgICAgICAg IFRlc3Q6IGZhc3QvZm9ybXMvc2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5n bGUtc2VsZWN0aW9uLmh0bWwKKworICAgICAgICAqIGRvbS9TZWxlY3RFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6OnJlc2V0KToKKyAgICAgICAgICAgQWRkZWQg SFRNTCA0LjAxIGNvbXBsaWFudCBoYW5kbGluZyBvZiBicm9rZW4gd2VicGFnZXMgdGhhdAorICAg ICAgICAgICBzcGVjaWZ5IG1vcmUgdGhhbiBvbmUgc2VsZWN0ZWQgb3B0aW9uIGZvciBzaW5nbGUg c2VsZWN0aW9uIFNFTEVDVAorICAgICAgICAgICBlbGVtZW50LCBpbiBhIG1hbm5lciB0aGF0IGVt dWxhdGVzIEZpcmVmb3ggYW5kIGlzIHNpbWlsYXIgdG8gSUUgNworCisKIDIwMDktMDgtMDMgIEpv c2VwaCBQZWNvcmFybyAgPGpvZXBlY2swMkBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHJldmlzaW9uIDQ2 NzY4KQorKysgV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ5Miw4ICs0OTIsOCBAQCBib29sIFNlbGVjdEVsZW1lbnQ6OmFwcGVuZEZvcm1EYXRhKFNlbGVj CiAKIHZvaWQgU2VsZWN0RWxlbWVudDo6cmVzZXQoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVs ZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgYm9vbCBvcHRpb25TZWxlY3RlZCA9IGZhbHNlOwogICAg IE9wdGlvbkVsZW1lbnQqIGZpcnN0T3B0aW9uID0gMDsKKyAgICBPcHRpb25FbGVtZW50KiBzZWxl Y3RlZE9wdGlvbiA9IDA7CiAKICAgICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBpdGVtcyA9IGRh dGEubGlzdEl0ZW1zKGVsZW1lbnQpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVt cy5zaXplKCk7ICsraSkgewpAQCAtNTAyLDggKzUwMiwxMCBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6 OnJlc2V0KFNlbGVjdEVsZW1lbnRECiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBp ZiAoIWl0ZW1zW2ldLT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpzZWxlY3RlZEF0dHIpLmlzTnVs bCgpKSB7CisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRPcHRpb24gJiYgIWRhdGEubXVsdGlwbGUo KSkKKyAgICAgICAgICAgICAgICBzZWxlY3RlZE9wdGlvbi0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxz ZSk7CiAgICAgICAgICAgICBvcHRpb25FbGVtZW50LT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOwot ICAgICAgICAgICAgb3B0aW9uU2VsZWN0ZWQgPSB0cnVlOworICAgICAgICAgICAgc2VsZWN0ZWRP cHRpb24gPSBvcHRpb25FbGVtZW50OwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG9wdGlv bkVsZW1lbnQtPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOwogCkBAIC01MTEsNyArNTEzLDcgQEAg dm9pZCBTZWxlY3RFbGVtZW50OjpyZXNldChTZWxlY3RFbGVtZW50RAogICAgICAgICAgICAgZmly c3RPcHRpb24gPSBvcHRpb25FbGVtZW50OwogICAgIH0KIAotICAgIGlmICghb3B0aW9uU2VsZWN0 ZWQgJiYgZmlyc3RPcHRpb24gJiYgZGF0YS51c2VzTWVudUxpc3QoKSkKKyAgICBpZiAoIXNlbGVj dGVkT3B0aW9uICYmIGZpcnN0T3B0aW9uICYmIGRhdGEudXNlc01lbnVMaXN0KCkpCiAgICAgICAg IGZpcnN0T3B0aW9uLT5zZXRTZWxlY3RlZFN0YXRlKHRydWUpOwogCiAgICAgZWxlbWVudC0+c2V0 TmVlZHNTdHlsZVJlY2FsYygpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDY3MzIpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wOC0w MyAgU3phYm8gQ2Fyb2wgIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCBmb3IgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3OTQyCisgICAgICAgIEZvcm0gUmVzZXQgZG9lcyBu b3Qgd29yayBwZXIgdzNjIHN0YW5kYXJkIHdoZW4gc2luZ2xlIHNlbGVjdGlvbgorICAgICAgICBT RUxFQ1QgZWxlbWVudCBoYXMgbW9yZSB0aGFuIG9uZSBvcHRpb24gbWFya2VkIGFzIHNlbGVjdGVk LgorCisgICAgICAgICogZmFzdC9mb3Jtcy9zZWxlY3QtcmVzZXQtbXVsdGlwbGUtc2VsZWN0aW9u cy00LXNpbmdsZS1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlv bi5odG1sOiBBZGRlZC4KKwogMjAwOS0wOC0wMyAgSmFuIE1pY2hhZWwgQWxvbnpvICA8am1hbG9u em9Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbR3RrXSBTa2lwIGFjY2Vzc2liaWxpdHkvaW5wdXQt c2xpZGVyLmh0bWwgYXMgaXQgbmVlZHMKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2Vs ZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1t dWx0aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQJKHJldmlz aW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1z ZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsOSBAQAorVGhpcyB0ZXN0IGNoZWNrcyB0byBzZWUgd2hhdCBoYXBwZW5zIGlmIHdl IG1hcmsgMiBpdGVtcyBhcyBzZWxlY3RlZCBpbiBhIHNpbmdsZSBzZWxlY3Rpb24gc2VsZWN0IGVs ZW1lbnQuCisKK0lmIFRoZSB0ZXN0IHN1Y2NlZWRzIG9uZSBzaG91bGQgc2VlIDMgbGluZXMgYmVs b3cgdGhlIHJ1bGxlciBiZWxvdyBlYWNoIGNvbnRhaW5pbmcgdGhlIHdvcmQgU1VDQ0VFREVEIGlu IGl0LgorCisgCitMT0FEOlNVQ0NFRURFRCEKK1NFTEVDVDpTVUNDRUVERUQhCitSRVNFVDpTVUND RUVERUQhCisKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2Vs ZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLWV4cGVjdGVk LnR4dApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkFkZGVkOiBzdm46ZXhlY3V0YWJsZQogICArICoKCkluZGV4OiBMYXlv dXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0aXBsZS1zZWxlY3Rpb25zLTQtc2lu Z2xlLXNlbGVjdGlvbi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZm9ybXMv c2VsZWN0LXJlc2V0LW11bHRpcGxlLXNlbGVjdGlvbnMtNC1zaW5nbGUtc2VsZWN0aW9uLmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1yZXNldC1tdWx0 aXBsZS1zZWxlY3Rpb25zLTQtc2luZ2xlLXNlbGVjdGlvbi5odG1sCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDQ4IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiPz4NCis8IURPQ1RZUEUgaHRtbCBQVUJM SUMgIi0vL1czQy8vRFREIFhIVE1MIEJhc2ljIDEuMC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9U Ui94aHRtbC1iYXNpYy94aHRtbC1iYXNpYzEwLmR0ZCI+ICANCis8aHRtbCB4bWxucz0iaHR0cDov L3d3dy53My5vcmcvMTk5OS94aHRtbCI+DQorPGhlYWQ+DQorPHNjcmlwdD4NCitmdW5jdGlvbiBw cmludChtZXNzYWdlKQ0KK3sNCisgICAgdmFyIHBhcmFncmFwaCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImxpIik7DQorICAgIHBhcmFncmFwaC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVU ZXh0Tm9kZShtZXNzYWdlKSk7DQorICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xl IikuYXBwZW5kQ2hpbGQocGFyYWdyYXBoKTsNCit9DQorZnVuY3Rpb24gdGVzdCgpDQorew0KKyAg ICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQ0KKyAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOw0KKyAgICBzZWxlY3RFbGVtZW50ID0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInNlbGVjdDEiKTsNCisgICAgaWYgKHNlbGVjdEVsZW1lbnQudmFsdWUgPT0g IjMiKQ0KKyAgICAgICAgcHJpbnQoIkxPQUQ6U1VDQ0VFREVEISIpOw0KKyAgICBlbHNlDQorICAg ICAgICBwcmludCgiTE9BRDpGQUlMRUQ6IEV4cGVjdGVkICczJyBmb3VuZCAiICsgc2VsZWN0RWxl bWVudC52YWx1ZSk7DQorICAgIHNlbGVjdEVsZW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoIm9w dGlvbiIpLml0ZW0oMSkuc2VsZWN0ZWQ9dHJ1ZTsNCisgICAgaWYgKHNlbGVjdEVsZW1lbnQudmFs dWUgPT0gIjIiKQ0KKyAgICAgICAgcHJpbnQoIlNFTEVDVDpTVUNDRUVERUQhIik7DQorICAgIGVs c2UNCisgICAgICAgIHByaW50KCJTRUxFQ1Q6RkFJTEVEOiBFeHBlY3RlZCAnMicgZm91bmQgIiAr IHNlbGVjdEVsZW1lbnQudmFsdWUpOw0KKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVz ZXQxIikuY2xpY2soKTsNCisgICAgaWYgKHNlbGVjdEVsZW1lbnQudmFsdWUgPT0gIjMiKQ0KKyAg ICAgICAgcHJpbnQoIlJFU0VUOlNVQ0NFRURFRCEiKTsNCisgICAgZWxzZQ0KKyAgICAgICAgcHJp bnQoIlJFU0VUOkZBSUxFRDogRXhwZWN0ZWQgJzMnIGZvdW5kICIgKyBzZWxlY3RFbGVtZW50LnZh bHVlKTsNCit9DQorPC9zY3JpcHQ+DQorPC9oZWFkPg0KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4N Cis8cD5UaGlzIHRlc3QgY2hlY2tzIHRvIHNlZSB3aGF0IGhhcHBlbnMgaWYgd2UgbWFyayAyIGl0 ZW1zIGFzIHNlbGVjdGVkIGluIGEgc2luZ2xlIHNlbGVjdGlvbiBzZWxlY3QgZWxlbWVudC48L3A+ DQorPHA+SWYgVGhlIHRlc3Qgc3VjY2VlZHMgb25lIHNob3VsZCBzZWUgMyBsaW5lcyBiZWxvdyB0 aGUgcnVsbGVyIGJlbG93IGVhY2ggY29udGFpbmluZyB0aGUgd29yZCBTVUNDRUVERUQgaW4gaXQu PC9wPg0KKzxmb3JtIGlkPSJmb3JtMSIgbWV0aG9kPSJwb3N0IiBhY3Rpb249ImZvcm1fcmVzcC5h c3AiPg0KKyAgPHNlbGVjdCBuYW1lPSJTZWxlY3QiIHNpemU9IjIiIGlkPSJzZWxlY3QxIj4NCisg ICAgPG9wdGlvbiBzZWxlY3RlZD0ic2VsZWN0ZWQiPjE8L29wdGlvbj4NCisgICAgPG9wdGlvbj4y PC9vcHRpb24+DQorICAgIDxvcHRpb24gc2VsZWN0ZWQ9InNlbGVjdGVkIj4zPC9vcHRpb24+DQor DQorICAgIDxvcHRpb24+NDwvb3B0aW9uPg0KKyAgPC9zZWxlY3Q+DQorPGlucHV0IHR5cGU9InJl c2V0IiBuYW1lPSJyZXNldCIgdmFsdWU9IlJlc2V0IDEiIGlkPSJyZXNldDEiLz48YnIvPg0KKzxo cj4NCis8cD48b2wgaWQ9Y29uc29sZT48L29sPjwvcD4NCis8L2Zvcm0+PC9ib2R5PjwvaHRtbD4K