75652 2012-01-05 14:51:08 -0800 Inconsistent text selection behavior with option-shift-left/right 2012-01-19 18:51:23 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac OS X 10.7 RESOLVED FIXED P2 Minor --- 1 nallegra webkit-unassigned ap enrica pf rniwa webkit.review.bot oldest_to_newest 530652 0 nallegra 2012-01-05 14:51:08 -0800 To reproduce, enter a word in a text field, place the cursor in the middle of the word, and press option-shift-left followed by option-shift-right. In WebKit text fields, the latter changes the selection to go from the middle to the end of the word, but in OS text fields it only brings the cursor back to the middle, and another option-shift-right is required to select to the end of the word. 530947 1 ap 2012-01-05 23:11:46 -0800 Indeed, this is different from what TextEdit does. 533570 2 121960 pf 2012-01-10 19:10:50 -0800 Created attachment 121960 proposed patch 533571 3 pf 2012-01-10 19:14:51 -0800 Don't have a unix machine handy, but i assume it's the same behavior as windows. Also, option+alt+arrows seem to fire ParagraphGranularity, but programatically LineGranularity works the same way, as far as i could see, so i set it to handle both (in addition to word). Don't know how to emulate SentenceGranularity with the keyboard, so i'm not sure if it should also be handled the same way or not, i guess it's not really important anyway... 533956 4 121960 enrica 2012-01-11 09:30:24 -0800 Comment on attachment 121960 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=121960&action=review > Source/WebCore/ChangeLog:14 > + There is no description of what the fix is. You should also provide some information of there changes to each file. > Source/WebCore/editing/FrameSelection.cpp:943 > + // behavior when, for instance, word-selecting backwards starting with the caret on typo "on". Should be "in". You should provide some of this information in the ChangeLog. > Source/WebCore/editing/FrameSelection.cpp:946 > + VisibleSelection testSelection(m_selection); This is a non descriptive variable name. I would rather use newSelection. 534031 5 122051 pf 2012-01-11 10:50:22 -0800 Created attachment 122051 fixed review comments from enrica 536946 6 pf 2012-01-17 01:05:44 -0800 Ping? 537212 7 122051 rniwa 2012-01-17 11:09:03 -0800 Comment on attachment 122051 fixed review comments from enrica View in context: https://bugs.webkit.org/attachment.cgi?id=122051&action=review r=me provided nits below are fixed. > Source/WebCore/editing/FrameSelection.cpp:946 > + VisibleSelection newSelection(m_selection); We prefer newSelection = m_selection over newSelection(m_selection). > LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac.html:21 > + function editingTest(behavior) { > + if (window.layoutTestController) { > + layoutTestController.dumpAsText(); > + layoutTestController.setEditingBehavior(behavior); > + } It seems redundant to indent the entire contents inside <script>. 537221 8 122785 pf 2012-01-17 11:22:15 -0800 Created attachment 122785 nitfixing 537230 9 122785 ap 2012-01-17 11:33:21 -0800 Comment on attachment 122785 nitfixing View in context: https://bugs.webkit.org/attachment.cgi?id=122785&action=review > Source/WebCore/editing/EditingBehavior.h:73 > + // On Mac, selecting backwards by word/line from the middle of a word/line, and then going > + // forward leaves the caret back in the middle with no selection, instead of directly selecting > + // to the other end of the line/word (Unix/Windows behavior). > + bool shouldExtendSelectionByWordOrLineAcrossCaret() const { return m_type != EditingMacBehavior; } Just a drive by comment that shouldn't prevent landing: isn't this overly specific? This sounds like one example of anchored selection behavior. 537331 10 122785 enrica 2012-01-17 13:42:03 -0800 Comment on attachment 122785 nitfixing Looks good to me. 537502 11 122785 webkit.review.bot 2012-01-17 17:46:25 -0800 Comment on attachment 122785 nitfixing Rejecting attachment 122785 from commit-queue. pablof@motorola.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 539184 12 pf 2012-01-19 17:37:03 -0800 Could anyone land this one for me if there are no further objections? Thanks! 539232 13 122785 webkit.review.bot 2012-01-19 18:51:18 -0800 Comment on attachment 122785 nitfixing Clearing flags on attachment: 122785 Committed r105473: <http://trac.webkit.org/changeset/105473> 539233 14 webkit.review.bot 2012-01-19 18:51:23 -0800 All reviewed patches have been landed. Closing bug. 121960 2012-01-10 19:10:50 -0800 2012-01-11 10:50:17 -0800 proposed patch bug-75652-20120110191049.patch text/plain 9045 pf U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk3NTQ4NGYwY2M1ZTk1 MjZmNTEwYmFkOWEyMDhhZjg2M2ZmZjliZC4uNTM3NzUxZTMzOTQ2Zjc2ZDc3MTBjNDZkOWU0ODFk MWU4MzAwNjMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAxLTEwICBQYWJs byBGbG91cmV0ICA8cGFibG9mQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBGaXggaW5jb25zaXN0 ZW50IHRleHQgc2VsZWN0aW9uIGJlaGF2aW9yIHdpdGggb3B0aW9uLXNoaWZ0LWxlZnQvcmlnaHQv dXAvZG93bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc1NjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGVzdDogZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLWV4dGVuZC1zaG91bGQtbm90LW1vdmUt YWNyb3NzLWNhcmV0LW9uLW1hYy5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRpbmdCZWhh dmlvci5oOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ0JlaGF2aW9yOjpzaG91bGRFeHRlbmRT ZWxlY3Rpb25CeVdvcmRPckxpbmVBY3Jvc3NDYXJldCk6CisgICAgICAgICogZWRpdGluZy9GcmFt ZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVNlbGVjdGlvbjo6bW9kaWZ5 KToKKwogMjAxMi0wMS0wOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEwNDQxOC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ0JlaGF2aW9yLmggYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvci5oCmluZGV4IDcyMGYzOGEzZWE5Zjk5YzdlYmEx MWEyMWEyNjRjNTE1N2ExYTk5NDQuLjllZDFkNzdkZGQzM2EwMTQzYzMwMWQ0MzFkYjAxZWQ0NTFh MGRjODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ0JlaGF2aW9y LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3IuaApAQCAtNjcs NiArNjcsMTEgQEAgcHVibGljOgogICAgIC8vIE9uIE1hYyBhbmQgV2luZG93cywgcHJlc3Npbmcg YmFja3NwYWNlICh3aGVuIGl0IGlzbid0IGhhbmRsZWQgb3RoZXJ3aXNlKSBzaG91bGQgbmF2aWdh dGUgYmFjay4KICAgICBib29sIHNob3VsZE5hdmlnYXRlQmFja09uQmFja3NwYWNlKCkgY29uc3Qg eyByZXR1cm4gbV90eXBlICE9IEVkaXRpbmdVbml4QmVoYXZpb3I7IH0KIAorICAgIC8vIE9uIE1h Yywgc2VsZWN0aW5nIGJhY2t3YXJkcyBieSB3b3JkL2xpbmUgZnJvbSB0aGUgbWlkZGxlIG9mIGEg d29yZC9saW5lLCBhbmQgdGhlbiBnb2luZworICAgIC8vIGZvcndhcmQgbGVhdmVzIHRoZSBjYXJl dCBiYWNrIGluIHRoZSBtaWRkbGUgd2l0aCBubyBzZWxlY3Rpb24sIGluc3RlYWQgb2YgZGlyZWN0 bHkgc2VsZWN0aW5nCisgICAgLy8gdG8gdGhlIG90aGVyIGVuZCBvZiB0aGUgbGluZS93b3JkIChV bml4L1dpbmRvd3MgYmVoYXZpb3IpLgorICAgIGJvb2wgc2hvdWxkRXh0ZW5kU2VsZWN0aW9uQnlX b3JkT3JMaW5lQWNyb3NzQ2FyZXQoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgIT0gRWRpdGluZ01h Y0JlaGF2aW9yOyB9CisKIHByaXZhdGU6CiAgICAgRWRpdGluZ0JlaGF2aW9yVHlwZSBtX3R5cGU7 CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAppbmRleCBkMTI2 N2VhZWRmZTJmOGQwZmZjZGVkZWY5NmIwNzYxZmRhNTI0YWZmLi5hZjQ5YWUyMTc0N2ZhMjNlN2Uz ZDc1MTY1N2RmZmViYjk4NzJlMmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0ZyYW1lU2VsZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2Vs ZWN0aW9uLmNwcApAQCAtOTM2LDYgKzkzNiwxOSBAQCBib29sIEZyYW1lU2VsZWN0aW9uOjptb2Rp ZnkoRUFsdGVyYXRpb24gYWx0ZXIsIFNlbGVjdGlvbkRpcmVjdGlvbiBkaXJlY3Rpb24sIFRleAog ICAgICAgICBtb3ZlVG8ocG9zaXRpb24sIHVzZXJUcmlnZ2VyZWQpOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIEFsdGVyYXRpb25FeHRlbmQ6CisgICAgICAgIGlmICghbV9zZWxlY3Rpb24uaXND YXJldCgpCisgICAgICAgICAgICAmJiAoZ3JhbnVsYXJpdHkgPT0gV29yZEdyYW51bGFyaXR5IHx8 IGdyYW51bGFyaXR5ID09IFBhcmFncmFwaEdyYW51bGFyaXR5IHx8IGdyYW51bGFyaXR5ID09IExp bmVHcmFudWxhcml0eSkKKyAgICAgICAgICAgICYmIG1fZnJhbWUgJiYgIW1fZnJhbWUtPmVkaXRv cigpLT5iZWhhdmlvcigpLnNob3VsZEV4dGVuZFNlbGVjdGlvbkJ5V29yZE9yTGluZUFjcm9zc0Nh cmV0KCkpIHsKKyAgICAgICAgICAgIC8vIERvbid0IGxldCB0aGUgc2VsZWN0aW9uIGdvIGFjcm9z cyB0aGUgYmFzZSBwb3NpdGlvbiBkaXJlY3RseS4gTmVlZGVkIHRvIG1hdGNoIG1hYworICAgICAg ICAgICAgLy8gYmVoYXZpb3Igd2hlbiwgZm9yIGluc3RhbmNlLCB3b3JkLXNlbGVjdGluZyBiYWNr d2FyZHMgc3RhcnRpbmcgd2l0aCB0aGUgY2FyZXQgb24KKyAgICAgICAgICAgIC8vIHRoZSBtaWRk bGUgb2YgYSB3b3JkIGFuZCB0aGVuIHdvcmQtc2VsZWN0aW5nIGZvcndhcmQsIGxlYXZpbmcgdGhl IGNhcmV0IGluIHRoZQorICAgICAgICAgICAgLy8gc2FtZSBwbGFjZSB3aGVyZSBpdCB3YXMsIGlu c3RlYWQgb2YgZGlyZWN0bHkgc2VsZWN0aW5nIHRvIHRoZSBlbmQgb2YgdGhlIHdvcmQuCisgICAg ICAgICAgICBWaXNpYmxlU2VsZWN0aW9uIHRlc3RTZWxlY3Rpb24obV9zZWxlY3Rpb24pOworICAg ICAgICAgICAgdGVzdFNlbGVjdGlvbi5zZXRFeHRlbnQocG9zaXRpb24pOworICAgICAgICAgICAg aWYgKG1fc2VsZWN0aW9uLmlzQmFzZUZpcnN0KCkgIT0gdGVzdFNlbGVjdGlvbi5pc0Jhc2VGaXJz dCgpKQorICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbV9zZWxlY3Rpb24uYmFzZSgpOworICAg ICAgICB9CisKICAgICAgICAgLy8gU3RhbmRhcmQgTWFjIGJlaGF2aW9yIHdoZW4gZXh0ZW5kaW5n IHRvIGEgYm91bmRhcnkgaXMgZ3JvdyB0aGUgc2VsZWN0aW9uIHJhdGhlciB0aGFuIGxlYXZpbmcg dGhlCiAgICAgICAgIC8vIGJhc2UgaW4gcGxhY2UgYW5kIG1vdmluZyB0aGUgZXh0ZW50LiBNYXRj aGVzIE5TVGV4dFZpZXcuCiAgICAgICAgIGlmICghbV9mcmFtZSB8fCAhbV9mcmFtZS0+ZWRpdG9y KCktPmJlaGF2aW9yKCkuc2hvdWxkQWx3YXlzR3Jvd1NlbGVjdGlvbldoZW5FeHRlbmRpbmdUb0Jv dW5kYXJ5KCkgfHwgbV9zZWxlY3Rpb24uaXNDYXJldCgpIHx8ICFpc0JvdW5kYXJ5KGdyYW51bGFy aXR5KSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA3YmI0YmFmMDAxY2I2YzhkNmFjOTM5MmY5NzQxNzU1MDNiNTAyZGJjLi5j OThmYTU5ODdmMWEyMGFjZWU4YzAxMjBmMjhhOGUwOTlkNWYwNmRjIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTItMDEtMTAgIFBhYmxvIEZsb3VyZXQgIDxwYWJsb2ZAbW90b3JvbGEuY29tPgor CisgICAgICAgIEZpeCBpbmNvbnNpc3RlbnQgdGV4dCBzZWxlY3Rpb24gYmVoYXZpb3Igd2l0aCBv cHRpb24tc2hpZnQtbGVmdC9yaWdodC91cC9kb3duLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU2NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1leHRl bmQtc2hvdWxkLW5vdC1tb3ZlLWFjcm9zcy1jYXJldC1vbi1tYWMtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tZXh0ZW5kLXNob3VsZC1u b3QtbW92ZS1hY3Jvc3MtY2FyZXQtb24tbWFjLmh0bWw6IEFkZGVkLgorCiAyMDEyLTAxLTA5ICBK b2huIEtub3R0ZW5iZWx0ICA8amtub3R0ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJv bWl1bV0gVXBkYXRlIHRlc3QgZXhwZWN0YXRpb25zLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLWV4dGVuZC1zaG91bGQtbm90LW1vdmUtYWNyb3Nz LWNhcmV0LW9uLW1hYy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlv bi9zZWxlY3Rpb24tZXh0ZW5kLXNob3VsZC1ub3QtbW92ZS1hY3Jvc3MtY2FyZXQtb24tbWFjLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42ZmM1ZGFkMDQ1OTY2MWUzNmM2MmJmZDhiMThhZWNlOTEw MGEzNWZmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24v c2VsZWN0aW9uLWV4dGVuZC1zaG91bGQtbm90LW1vdmUtYWNyb3NzLWNhcmV0LW9uLW1hYy1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSwxNyBAQAorT24gTWFjIHdoZW4gd29yZC1zZWxlY3RpbmcgYmFj a3dhcmRzIHN0YXJ0aW5nIHdpdGggdGhlIGNhcmV0IG9uIHRoZSBtaWRkbGUgb2YgYSB3b3JkIGFu ZCB0aGVuIHdvcmQtc2VsZWN0aW5nIGZvcndhcmQsIHRoZSBjYXJldCBpcyBsZWZ0IGluIHRoZSBz YW1lIHBsYWNlIHdoZXJlIGl0IHdhcywgaW5zdGVhZCBvZiBkaXJlY3RseSBzZWxlY3RpbmcgdG8g dGhlIGVuZCBvZiB0aGUgd29yZCAod2hpY2ggaXMgd2luZG93cy91bml4IGJlaGF2aW9yKS4KKwor bWFjOgorRXh0ZW5kIGJhY2t3YXJkIGFuZCB0aGVuIGZvcndhcmQgYnkgd29yZDogUEFTUworRXh0 ZW5kIGZvcndhcmQgYW5kIHRoZW4gYmFja3dhcmQgYnkgd29yZDogUEFTUworRXh0ZW5kIGJhY2t3 YXJkIGFuZCB0aGVuIGZvcndhcmQgYnkgbGluZTogUEFTUworRXh0ZW5kIGZvcndhcmQgYW5kIHRo ZW4gYmFja3dhcmQgYnkgbGluZTogUEFTUworRXh0ZW5kIGJhY2t3YXJkIGFuZCB0aGVuIGZvcndh cmQgYnkgcGFyYWdyYXBoOiBQQVNTCitFeHRlbmQgZm9yd2FyZCBhbmQgdGhlbiBiYWNrd2FyZCBi eSBwYXJhZ3JhcGg6IFBBU1MKK3dpbjoKK0V4dGVuZCBiYWNrd2FyZCBhbmQgdGhlbiBmb3J3YXJk IGJ5IHdvcmQ6IFBBU1MKK0V4dGVuZCBmb3J3YXJkIGFuZCB0aGVuIGJhY2t3YXJkIGJ5IHdvcmQ6 IFBBU1MKK0V4dGVuZCBiYWNrd2FyZCBhbmQgdGhlbiBmb3J3YXJkIGJ5IGxpbmU6IFBBU1MKK0V4 dGVuZCBmb3J3YXJkIGFuZCB0aGVuIGJhY2t3YXJkIGJ5IGxpbmU6IFBBU1MKK0V4dGVuZCBiYWNr d2FyZCBhbmQgdGhlbiBmb3J3YXJkIGJ5IHBhcmFncmFwaDogUEFTUworRXh0ZW5kIGZvcndhcmQg YW5kIHRoZW4gYmFja3dhcmQgYnkgcGFyYWdyYXBoOiBQQVNTCisKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1leHRlbmQtc2hvdWxkLW5vdC1tb3Zl LWFjcm9zcy1jYXJldC1vbi1tYWMuaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9u L3NlbGVjdGlvbi1leHRlbmQtc2hvdWxkLW5vdC1tb3ZlLWFjcm9zcy1jYXJldC1vbi1tYWMuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5kMTU3NGJhYmI5MjRhM2IxOGJmYWE1YjNhMTJjY2M0YjY3MTc4YWE3Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9u LWV4dGVuZC1zaG91bGQtbm90LW1vdmUtYWNyb3NzLWNhcmV0LW9uLW1hYy5odG1sCkBAIC0wLDAg KzEsNjQgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8cD4KK09uIE1hYyB3aGVuIHdvcmQtc2VsZWN0 aW5nIGJhY2t3YXJkcyBzdGFydGluZyB3aXRoIHRoZQorY2FyZXQgb24gdGhlIG1pZGRsZSBvZiBh IHdvcmQgYW5kIHRoZW4gd29yZC1zZWxlY3RpbmcgZm9yd2FyZCwgdGhlCitjYXJldCBpcyBsZWZ0 IGluIHRoZSBzYW1lIHBsYWNlIHdoZXJlIGl0IHdhcywgaW5zdGVhZCBvZiBkaXJlY3RseSBzZWxl Y3RpbmcgdG8gdGhlIGVuZAorb2YgdGhlIHdvcmQgKHdoaWNoIGlzIHdpbmRvd3MvdW5peCBiZWhh dmlvcikuCis8L3A+CisKKzxkaXYgaWQ9InRlc3QtZGl2IiBjb250ZW50ZWRpdGFibGU9dHJ1ZT4K KyAgICBsaW5lIDE8YnI+CisgICAgbGluZSAyPGJyPgorICAgIGxpbmUgMworPC9kaXY+CisKKzxz Y3JpcHQ+CisgICAgZnVuY3Rpb24gZWRpdGluZ1Rlc3QoYmVoYXZpb3IpIHsKKyAgICAgICAgaWYg KHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu c2V0RWRpdGluZ0JlaGF2aW9yKGJlaGF2aW9yKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0 aW9uIGdldFNldENhcmV0RnVuY3Rpb24obm9kZSwgY29udGFpbmVyLCBvZmZzZXQpIHsKKyAgICAg ICAgICAgIHJldHVybiBmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICAgICAgdmFyIHNlbGVjdGlv biA9IHdpbmRvdy5nZXRTZWxlY3Rpb24oKTsKKyAgICAgICAgICAgICAgICBzZWxlY3Rpb24uZW1w dHkoKTsKKworICAgICAgICAgICAgICAgIHZhciByYW5nZSA9IGRvY3VtZW50LmNyZWF0ZVJhbmdl KCk7CisgICAgICAgICAgICAgICAgcmFuZ2Uuc2V0U3RhcnQoY29udGFpbmVyLCBvZmZzZXQpOwor ICAgICAgICAgICAgICAgIHNlbGVjdGlvbi5hZGRSYW5nZShyYW5nZSk7CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBydW5UZXN0KGZpcnN0RGlyZWN0aW9uLCBz ZWNvbmREaXJlY3Rpb24sIGdyYW51bGFyaXR5LCBleHBlY3RlZFRleHQsIHNldENhcmV0KSB7Cisg ICAgICAgICAgICB2YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgICAg ICAgICAgc2V0Q2FyZXQoKTsKKyAgICAgICAgICAgIHNlbGVjdGlvbi5tb2RpZnkoImV4dGVuZCIs IGZpcnN0RGlyZWN0aW9uLCBncmFudWxhcml0eSk7CisgICAgICAgICAgICBzZWxlY3Rpb24ubW9k aWZ5KCJleHRlbmQiLCBzZWNvbmREaXJlY3Rpb24sIGdyYW51bGFyaXR5KTsKKyAgICAgICAgICAg IHZhciBzID0gc2VsZWN0aW9uLnRvU3RyaW5nKCk7CisgICAgICAgICAgICBkb2N1bWVudC53cml0 ZSgiRXh0ZW5kICIgKyBmaXJzdERpcmVjdGlvbiArICIgYW5kIHRoZW4gIiArIHNlY29uZERpcmVj dGlvbiArICIgYnkgIiArIGdyYW51bGFyaXR5ICsgIjogIik7CisgICAgICAgICAgICBkb2N1bWVu dC53cml0ZShzID09PSBleHBlY3RlZFRleHQgPyAiUEFTUyIgOiAnRkFJTDogZXhwZWN0ZWQgIicg KyBlc2NhcGUoZXhwZWN0ZWRUZXh0KSArICciLCBnb3QgIicgKyBlc2NhcGUocykgKyAnIicpOwor ICAgICAgICAgICAgZG9jdW1lbnQud3JpdGUoIjxicj4iKTsKKyAgICAgICAgfQorCisgICAgICAg IHZhciBub2RlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3QtZGl2Iik7CisgICAgICAg IHZhciBjaGlsZHJlbiA9IG5vZGUuY2hpbGROb2RlczsKKworICAgICAgICB2YXIgd29yZENhcmV0 RnVuY3Rpb24gPSBnZXRTZXRDYXJldEZ1bmN0aW9uKG5vZGUsIGNoaWxkcmVuWzJdLCBjaGlsZHJl blsyXS5kYXRhLnNlYXJjaCgibmUgMiIpKTsKKworICAgICAgICBkb2N1bWVudC53cml0ZShiZWhh dmlvciArICI6PGJyPiIpOworICAgICAgICBydW5UZXN0KCJiYWNrd2FyZCIsICJmb3J3YXJkIiwg IndvcmQiLCBiZWhhdmlvciA9PSAibWFjIiA/ICIiIDogIm5lIiwgZ2V0U2V0Q2FyZXRGdW5jdGlv bihub2RlLCBjaGlsZHJlblsyXSwgY2hpbGRyZW5bMl0uZGF0YS5zZWFyY2goIm5lIDIiKSkpOwor ICAgICAgICBydW5UZXN0KCJmb3J3YXJkIiwgImJhY2t3YXJkIiwgIndvcmQiLCBiZWhhdmlvciA9 PSAibWFjIiA/ICIiIDogImxpIiwgZ2V0U2V0Q2FyZXRGdW5jdGlvbihub2RlLCBjaGlsZHJlblsy XSwgY2hpbGRyZW5bMl0uZGF0YS5zZWFyY2goIm5lIDIiKSkpOworICAgICAgICBydW5UZXN0KCJi YWNrd2FyZCIsICJmb3J3YXJkIiwgImxpbmUiLCBiZWhhdmlvciA9PSAibWFjIiA/ICIiIDogIjFc bmxpbmUgIiwgZ2V0U2V0Q2FyZXRGdW5jdGlvbihub2RlLCBjaGlsZHJlblswXSwgY2hpbGRyZW5b MF0uZGF0YS5zZWFyY2goIjEiKSkpOworICAgICAgICBydW5UZXN0KCJmb3J3YXJkIiwgImJhY2t3 YXJkIiwgImxpbmUiLCBiZWhhdmlvciA9PSAibWFjIiA/ICIiIDogIjJcbmxpbmUgIiwgZ2V0U2V0 Q2FyZXRGdW5jdGlvbihub2RlLCBjaGlsZHJlbls0XSwgY2hpbGRyZW5bNF0uZGF0YS5zZWFyY2go IjMiKSkpOworICAgICAgICBydW5UZXN0KCJiYWNrd2FyZCIsICJmb3J3YXJkIiwgInBhcmFncmFw aCIsIGJlaGF2aW9yID09ICJtYWMiID8gIiIgOiAiMVxubGluZSAiLCBnZXRTZXRDYXJldEZ1bmN0 aW9uKG5vZGUsIGNoaWxkcmVuWzBdLCBjaGlsZHJlblswXS5kYXRhLnNlYXJjaCgiMSIpKSk7Cisg ICAgICAgIHJ1blRlc3QoImZvcndhcmQiLCAiYmFja3dhcmQiLCAicGFyYWdyYXBoIiwgYmVoYXZp b3IgPT0gIm1hYyIgPyAiIiA6ICIyXG5saW5lICIsIGdldFNldENhcmV0RnVuY3Rpb24obm9kZSwg Y2hpbGRyZW5bNF0sIGNoaWxkcmVuWzRdLmRhdGEuc2VhcmNoKCIzIikpKTsKKyAgICB9CisKKyAg ICBlZGl0aW5nVGVzdCgibWFjIik7CisgICAgZWRpdGluZ1Rlc3QoIndpbiIpOworCisgICAgdmFy IG5vZGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdC1kaXYiKTsKKyAgICBub2RlLnBh cmVudE5vZGUucmVtb3ZlQ2hpbGQobm9kZSk7Cis8L3NjcmlwdD4K 122051 2012-01-11 10:50:22 -0800 2012-01-17 11:21:51 -0800 fixed review comments from enrica bug-75652-20120111105021.patch text/plain 10066 pf U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk3NTQ4NGYwY2M1ZTk1 MjZmNTEwYmFkOWEyMDhhZjg2M2ZmZjliZC4uNWFkNGU3ODA4OTEzYzllMWU3YTYwZjBjZjdhYThm NDAzYTRkOGU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAxLTEwICBQYWJs byBGbG91cmV0ICA8cGFibG9mQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBGaXggaW5jb25zaXN0 ZW50IHRleHQgc2VsZWN0aW9uIGJlaGF2aW9yIHdpdGggb3B0aW9uLXNoaWZ0LWxlZnQvcmlnaHQv dXAvZG93bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc1NjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg T24gTWFjLCBzZWxlY3RpbmcgYmFja3dhcmRzIGJ5IHdvcmQsIGxpbmUgb3IgcGFyYWdyYXBoIGZy b20gdGhlIG1pZGRsZQorICAgICAgICBvZiBzb21lIHRleHQsIGFuZCB0aGVuIGdvaW5nIGZvcndh cmQgbGVhdmVzIHRoZSBjYXJldCBiYWNrIGluIHRoZSBtaWRkbGUKKyAgICAgICAgd2l0aCBubyBz ZWxlY3Rpb24sIGluc3RlYWQgb2YgZGlyZWN0bHkgc2VsZWN0aW5nIHRvIHRoZSBvdGhlciBlbmQg b2YgdGhlCisgICAgICAgIHdvcmQvbGluZS9wYXJhZ3JhcGggKFVuaXgvV2luZG93cyBiZWhhdmlv cikuIEZpeCB0aGlzIGJ5IGFkZGluZyBhIG5ldworICAgICAgICBlZGl0aW5nIGJlaGF2aW9yIHRv IGNvbnRyb2wgd2hldGhlciB0aGUgc2VsZWN0aW9uIHNob3VsZCBnbyBhY3Jvc3MgdGhlCisgICAg ICAgIGluaXRpYWwgcG9zaXRpb24gb2YgdGhlIGNhcmV0IGRpcmVjdGx5IG9yIG5vdCBpbiBzaXR1 YXRpb25zIGxpa2UgdGhlIG9uZQorICAgICAgICBvdXRsaW5lZCBhYm92ZS4KKworICAgICAgICBU ZXN0OiBlZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tZXh0ZW5kLXNob3VsZC1ub3QtbW92ZS1h Y3Jvc3MtY2FyZXQtb24tbWFjLmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ0JlaGF2 aW9yLmg6CisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nQmVoYXZpb3I6OnNob3VsZEV4dGVuZFNl bGVjdGlvbkJ5V29yZE9yTGluZUFjcm9zc0NhcmV0KToKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjptb2RpZnkp OgorCiAyMDEyLTAxLTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTA0NDE4LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3IuaCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdGluZ0JlaGF2aW9yLmgKaW5kZXggNzIwZjM4YTNlYTlmOTljN2ViYTEx YTIxYTI2NGM1MTU3YTFhOTk0NC4uOWVkMWQ3N2RkZDMzYTAxNDNjMzAxZDQzMWRiMDFlZDQ1MWEw ZGM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3Iu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvci5oCkBAIC02Nyw2 ICs2NywxMSBAQCBwdWJsaWM6CiAgICAgLy8gT24gTWFjIGFuZCBXaW5kb3dzLCBwcmVzc2luZyBi YWNrc3BhY2UgKHdoZW4gaXQgaXNuJ3QgaGFuZGxlZCBvdGhlcndpc2UpIHNob3VsZCBuYXZpZ2F0 ZSBiYWNrLgogICAgIGJvb2wgc2hvdWxkTmF2aWdhdGVCYWNrT25CYWNrc3BhY2UoKSBjb25zdCB7 IHJldHVybiBtX3R5cGUgIT0gRWRpdGluZ1VuaXhCZWhhdmlvcjsgfQogCisgICAgLy8gT24gTWFj LCBzZWxlY3RpbmcgYmFja3dhcmRzIGJ5IHdvcmQvbGluZSBmcm9tIHRoZSBtaWRkbGUgb2YgYSB3 b3JkL2xpbmUsIGFuZCB0aGVuIGdvaW5nCisgICAgLy8gZm9yd2FyZCBsZWF2ZXMgdGhlIGNhcmV0 IGJhY2sgaW4gdGhlIG1pZGRsZSB3aXRoIG5vIHNlbGVjdGlvbiwgaW5zdGVhZCBvZiBkaXJlY3Rs eSBzZWxlY3RpbmcKKyAgICAvLyB0byB0aGUgb3RoZXIgZW5kIG9mIHRoZSBsaW5lL3dvcmQgKFVu aXgvV2luZG93cyBiZWhhdmlvcikuCisgICAgYm9vbCBzaG91bGRFeHRlbmRTZWxlY3Rpb25CeVdv cmRPckxpbmVBY3Jvc3NDYXJldCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSAhPSBFZGl0aW5nTWFj QmVoYXZpb3I7IH0KKwogcHJpdmF0ZToKICAgICBFZGl0aW5nQmVoYXZpb3JUeXBlIG1fdHlwZTsK IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IGQxMjY3 ZWFlZGZlMmY4ZDBmZmNkZWRlZjk2YjA3NjFmZGE1MjRhZmYuLmQ3OTc2NWY5ZDNmNjUxZDY1MzAw MDFjM2JkODZmMGM3OWUxMTExM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RnJhbWVTZWxlY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxl Y3Rpb24uY3BwCkBAIC05MzYsNiArOTM2LDE5IEBAIGJvb2wgRnJhbWVTZWxlY3Rpb246Om1vZGlm eShFQWx0ZXJhdGlvbiBhbHRlciwgU2VsZWN0aW9uRGlyZWN0aW9uIGRpcmVjdGlvbiwgVGV4CiAg ICAgICAgIG1vdmVUbyhwb3NpdGlvbiwgdXNlclRyaWdnZXJlZCk7CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgQWx0ZXJhdGlvbkV4dGVuZDoKKyAgICAgICAgaWYgKCFtX3NlbGVjdGlvbi5pc0Nh cmV0KCkKKyAgICAgICAgICAgICYmIChncmFudWxhcml0eSA9PSBXb3JkR3JhbnVsYXJpdHkgfHwg Z3JhbnVsYXJpdHkgPT0gUGFyYWdyYXBoR3JhbnVsYXJpdHkgfHwgZ3JhbnVsYXJpdHkgPT0gTGlu ZUdyYW51bGFyaXR5KQorICAgICAgICAgICAgJiYgbV9mcmFtZSAmJiAhbV9mcmFtZS0+ZWRpdG9y KCktPmJlaGF2aW9yKCkuc2hvdWxkRXh0ZW5kU2VsZWN0aW9uQnlXb3JkT3JMaW5lQWNyb3NzQ2Fy ZXQoKSkgeworICAgICAgICAgICAgLy8gRG9uJ3QgbGV0IHRoZSBzZWxlY3Rpb24gZ28gYWNyb3Nz IHRoZSBiYXNlIHBvc2l0aW9uIGRpcmVjdGx5LiBOZWVkZWQgdG8gbWF0Y2ggbWFjCisgICAgICAg ICAgICAvLyBiZWhhdmlvciB3aGVuLCBmb3IgaW5zdGFuY2UsIHdvcmQtc2VsZWN0aW5nIGJhY2t3 YXJkcyBzdGFydGluZyB3aXRoIHRoZSBjYXJldCBpbgorICAgICAgICAgICAgLy8gdGhlIG1pZGRs ZSBvZiBhIHdvcmQgYW5kIHRoZW4gd29yZC1zZWxlY3RpbmcgZm9yd2FyZCwgbGVhdmluZyB0aGUg Y2FyZXQgaW4gdGhlCisgICAgICAgICAgICAvLyBzYW1lIHBsYWNlIHdoZXJlIGl0IHdhcywgaW5z dGVhZCBvZiBkaXJlY3RseSBzZWxlY3RpbmcgdG8gdGhlIGVuZCBvZiB0aGUgd29yZC4KKyAgICAg ICAgICAgIFZpc2libGVTZWxlY3Rpb24gbmV3U2VsZWN0aW9uKG1fc2VsZWN0aW9uKTsKKyAgICAg ICAgICAgIG5ld1NlbGVjdGlvbi5zZXRFeHRlbnQocG9zaXRpb24pOworICAgICAgICAgICAgaWYg KG1fc2VsZWN0aW9uLmlzQmFzZUZpcnN0KCkgIT0gbmV3U2VsZWN0aW9uLmlzQmFzZUZpcnN0KCkp CisgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBtX3NlbGVjdGlvbi5iYXNlKCk7CisgICAgICAg IH0KKwogICAgICAgICAvLyBTdGFuZGFyZCBNYWMgYmVoYXZpb3Igd2hlbiBleHRlbmRpbmcgdG8g YSBib3VuZGFyeSBpcyBncm93IHRoZSBzZWxlY3Rpb24gcmF0aGVyIHRoYW4gbGVhdmluZyB0aGUK ICAgICAgICAgLy8gYmFzZSBpbiBwbGFjZSBhbmQgbW92aW5nIHRoZSBleHRlbnQuIE1hdGNoZXMg TlNUZXh0Vmlldy4KICAgICAgICAgaWYgKCFtX2ZyYW1lIHx8ICFtX2ZyYW1lLT5lZGl0b3IoKS0+ YmVoYXZpb3IoKS5zaG91bGRBbHdheXNHcm93U2VsZWN0aW9uV2hlbkV4dGVuZGluZ1RvQm91bmRh cnkoKSB8fCBtX3NlbGVjdGlvbi5pc0NhcmV0KCkgfHwgIWlzQm91bmRhcnkoZ3JhbnVsYXJpdHkp KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDdiYjRiYWYwMDFjYjZjOGQ2YWM5MzkyZjk3NDE3NTUwM2I1MDJkYmMuLmIwZDNh ZDZkYTc0NGVmZWZjM2FmMWM1NTUyNjNlMzE1NTkwNjA1MWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBA QAorMjAxMi0wMS0xMCAgUGFibG8gRmxvdXJldCAgPHBhYmxvZkBtb3Rvcm9sYS5jb20+CisKKyAg ICAgICAgRml4IGluY29uc2lzdGVudCB0ZXh0IHNlbGVjdGlvbiBiZWhhdmlvciB3aXRoIG9wdGlv bi1zaGlmdC1sZWZ0L3JpZ2h0L3VwL2Rvd24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03NTY1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE9uIE1hYywgc2VsZWN0aW5nIGJhY2t3YXJkcyBieSB3b3JkLCBs aW5lIG9yIHBhcmFncmFwaCBmcm9tIHRoZSBtaWRkbGUKKyAgICAgICAgb2Ygc29tZSB0ZXh0LCBh bmQgdGhlbiBnb2luZyBmb3J3YXJkIGxlYXZlcyB0aGUgY2FyZXQgYmFjayBpbiB0aGUgbWlkZGxl CisgICAgICAgIHdpdGggbm8gc2VsZWN0aW9uLCBpbnN0ZWFkIG9mIGRpcmVjdGx5IHNlbGVjdGlu ZyB0byB0aGUgb3RoZXIgZW5kIG9mIHRoZQorICAgICAgICB3b3JkL2xpbmUvcGFyYWdyYXBoIChV bml4L1dpbmRvd3MgYmVoYXZpb3IpLiBGaXggdGhpcyBieSBhZGRpbmcgYSBuZXcKKyAgICAgICAg ZWRpdGluZyBiZWhhdmlvciB0byBjb250cm9sIHdoZXRoZXIgdGhlIHNlbGVjdGlvbiBzaG91bGQg Z28gYWNyb3NzIHRoZQorICAgICAgICBpbml0aWFsIHBvc2l0aW9uIG9mIHRoZSBjYXJldCBkaXJl Y3RseSBvciBub3QgaW4gc2l0dWF0aW9ucyBsaWtlIHRoZSBvbmUKKyAgICAgICAgb3V0bGluZWQg YWJvdmUuCisKKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tZXh0ZW5kLXNo b3VsZC1ub3QtbW92ZS1hY3Jvc3MtY2FyZXQtb24tbWFjLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLWV4dGVuZC1zaG91bGQtbm90LW1v dmUtYWNyb3NzLWNhcmV0LW9uLW1hYy5odG1sOiBBZGRlZC4KKwogMjAxMi0wMS0wOSAgSm9obiBL bm90dGVuYmVsdCAgPGprbm90dGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1d IFVwZGF0ZSB0ZXN0IGV4cGVjdGF0aW9ucy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRp bmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1leHRlbmQtc2hvdWxkLW5vdC1tb3ZlLWFjcm9zcy1jYXJl dC1vbi1tYWMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vc2Vs ZWN0aW9uLWV4dGVuZC1zaG91bGQtbm90LW1vdmUtYWNyb3NzLWNhcmV0LW9uLW1hYy1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uNmZjNWRhZDA0NTk2NjFlMzZjNjJiZmQ4YjE4YWVjZTkxMDBhMzVm ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3NlbGVj dGlvbi1leHRlbmQtc2hvdWxkLW5vdC1tb3ZlLWFjcm9zcy1jYXJldC1vbi1tYWMtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMTcgQEAKK09uIE1hYyB3aGVuIHdvcmQtc2VsZWN0aW5nIGJhY2t3YXJk cyBzdGFydGluZyB3aXRoIHRoZSBjYXJldCBvbiB0aGUgbWlkZGxlIG9mIGEgd29yZCBhbmQgdGhl biB3b3JkLXNlbGVjdGluZyBmb3J3YXJkLCB0aGUgY2FyZXQgaXMgbGVmdCBpbiB0aGUgc2FtZSBw bGFjZSB3aGVyZSBpdCB3YXMsIGluc3RlYWQgb2YgZGlyZWN0bHkgc2VsZWN0aW5nIHRvIHRoZSBl bmQgb2YgdGhlIHdvcmQgKHdoaWNoIGlzIHdpbmRvd3MvdW5peCBiZWhhdmlvcikuCisKK21hYzoK K0V4dGVuZCBiYWNrd2FyZCBhbmQgdGhlbiBmb3J3YXJkIGJ5IHdvcmQ6IFBBU1MKK0V4dGVuZCBm b3J3YXJkIGFuZCB0aGVuIGJhY2t3YXJkIGJ5IHdvcmQ6IFBBU1MKK0V4dGVuZCBiYWNrd2FyZCBh bmQgdGhlbiBmb3J3YXJkIGJ5IGxpbmU6IFBBU1MKK0V4dGVuZCBmb3J3YXJkIGFuZCB0aGVuIGJh Y2t3YXJkIGJ5IGxpbmU6IFBBU1MKK0V4dGVuZCBiYWNrd2FyZCBhbmQgdGhlbiBmb3J3YXJkIGJ5 IHBhcmFncmFwaDogUEFTUworRXh0ZW5kIGZvcndhcmQgYW5kIHRoZW4gYmFja3dhcmQgYnkgcGFy YWdyYXBoOiBQQVNTCit3aW46CitFeHRlbmQgYmFja3dhcmQgYW5kIHRoZW4gZm9yd2FyZCBieSB3 b3JkOiBQQVNTCitFeHRlbmQgZm9yd2FyZCBhbmQgdGhlbiBiYWNrd2FyZCBieSB3b3JkOiBQQVNT CitFeHRlbmQgYmFja3dhcmQgYW5kIHRoZW4gZm9yd2FyZCBieSBsaW5lOiBQQVNTCitFeHRlbmQg Zm9yd2FyZCBhbmQgdGhlbiBiYWNrd2FyZCBieSBsaW5lOiBQQVNTCitFeHRlbmQgYmFja3dhcmQg YW5kIHRoZW4gZm9yd2FyZCBieSBwYXJhZ3JhcGg6IFBBU1MKK0V4dGVuZCBmb3J3YXJkIGFuZCB0 aGVuIGJhY2t3YXJkIGJ5IHBhcmFncmFwaDogUEFTUworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tZXh0ZW5kLXNob3VsZC1ub3QtbW92ZS1hY3Jv c3MtY2FyZXQtb24tbWFjLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxl Y3Rpb24tZXh0ZW5kLXNob3VsZC1ub3QtbW92ZS1hY3Jvc3MtY2FyZXQtb24tbWFjLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZDE1NzRiYWJiOTI0YTNiMThiZmFhNWIzYTEyY2NjNGI2NzE3OGFhNwotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1leHRl bmQtc2hvdWxkLW5vdC1tb3ZlLWFjcm9zcy1jYXJldC1vbi1tYWMuaHRtbApAQCAtMCwwICsxLDY0 IEBACis8IURPQ1RZUEUgaHRtbD4KKworPHA+CitPbiBNYWMgd2hlbiB3b3JkLXNlbGVjdGluZyBi YWNrd2FyZHMgc3RhcnRpbmcgd2l0aCB0aGUKK2NhcmV0IG9uIHRoZSBtaWRkbGUgb2YgYSB3b3Jk IGFuZCB0aGVuIHdvcmQtc2VsZWN0aW5nIGZvcndhcmQsIHRoZQorY2FyZXQgaXMgbGVmdCBpbiB0 aGUgc2FtZSBwbGFjZSB3aGVyZSBpdCB3YXMsIGluc3RlYWQgb2YgZGlyZWN0bHkgc2VsZWN0aW5n IHRvIHRoZSBlbmQKK29mIHRoZSB3b3JkICh3aGljaCBpcyB3aW5kb3dzL3VuaXggYmVoYXZpb3Ip LgorPC9wPgorCis8ZGl2IGlkPSJ0ZXN0LWRpdiIgY29udGVudGVkaXRhYmxlPXRydWU+CisgICAg bGluZSAxPGJyPgorICAgIGxpbmUgMjxicj4KKyAgICBsaW5lIDMKKzwvZGl2PgorCis8c2NyaXB0 PgorICAgIGZ1bmN0aW9uIGVkaXRpbmdUZXN0KGJlaGF2aW9yKSB7CisgICAgICAgIGlmICh3aW5k b3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9s bGVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLnNldEVk aXRpbmdCZWhhdmlvcihiZWhhdmlvcik7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBn ZXRTZXRDYXJldEZ1bmN0aW9uKG5vZGUsIGNvbnRhaW5lciwgb2Zmc2V0KSB7CisgICAgICAgICAg ICByZXR1cm4gZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgIHZhciBzZWxlY3Rpb24gPSB3 aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CisgICAgICAgICAgICAgICAgc2VsZWN0aW9uLmVtcHR5KCk7 CisKKyAgICAgICAgICAgICAgICB2YXIgcmFuZ2UgPSBkb2N1bWVudC5jcmVhdGVSYW5nZSgpOwor ICAgICAgICAgICAgICAgIHJhbmdlLnNldFN0YXJ0KGNvbnRhaW5lciwgb2Zmc2V0KTsKKyAgICAg ICAgICAgICAgICBzZWxlY3Rpb24uYWRkUmFuZ2UocmFuZ2UpOworICAgICAgICAgICAgfQorICAg ICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gcnVuVGVzdChmaXJzdERpcmVjdGlvbiwgc2Vjb25k RGlyZWN0aW9uLCBncmFudWxhcml0eSwgZXhwZWN0ZWRUZXh0LCBzZXRDYXJldCkgeworICAgICAg ICAgICAgdmFyIHNlbGVjdGlvbiA9IHdpbmRvdy5nZXRTZWxlY3Rpb24oKTsKKyAgICAgICAgICAg IHNldENhcmV0KCk7CisgICAgICAgICAgICBzZWxlY3Rpb24ubW9kaWZ5KCJleHRlbmQiLCBmaXJz dERpcmVjdGlvbiwgZ3JhbnVsYXJpdHkpOworICAgICAgICAgICAgc2VsZWN0aW9uLm1vZGlmeSgi ZXh0ZW5kIiwgc2Vjb25kRGlyZWN0aW9uLCBncmFudWxhcml0eSk7CisgICAgICAgICAgICB2YXIg cyA9IHNlbGVjdGlvbi50b1N0cmluZygpOworICAgICAgICAgICAgZG9jdW1lbnQud3JpdGUoIkV4 dGVuZCAiICsgZmlyc3REaXJlY3Rpb24gKyAiIGFuZCB0aGVuICIgKyBzZWNvbmREaXJlY3Rpb24g KyAiIGJ5ICIgKyBncmFudWxhcml0eSArICI6ICIpOworICAgICAgICAgICAgZG9jdW1lbnQud3Jp dGUocyA9PT0gZXhwZWN0ZWRUZXh0ID8gIlBBU1MiIDogJ0ZBSUw6IGV4cGVjdGVkICInICsgZXNj YXBlKGV4cGVjdGVkVGV4dCkgKyAnIiwgZ290ICInICsgZXNjYXBlKHMpICsgJyInKTsKKyAgICAg ICAgICAgIGRvY3VtZW50LndyaXRlKCI8YnI+Iik7CisgICAgICAgIH0KKworICAgICAgICB2YXIg bm9kZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0LWRpdiIpOworICAgICAgICB2YXIg Y2hpbGRyZW4gPSBub2RlLmNoaWxkTm9kZXM7CisKKyAgICAgICAgdmFyIHdvcmRDYXJldEZ1bmN0 aW9uID0gZ2V0U2V0Q2FyZXRGdW5jdGlvbihub2RlLCBjaGlsZHJlblsyXSwgY2hpbGRyZW5bMl0u ZGF0YS5zZWFyY2goIm5lIDIiKSk7CisKKyAgICAgICAgZG9jdW1lbnQud3JpdGUoYmVoYXZpb3Ig KyAiOjxicj4iKTsKKyAgICAgICAgcnVuVGVzdCgiYmFja3dhcmQiLCAiZm9yd2FyZCIsICJ3b3Jk IiwgYmVoYXZpb3IgPT0gIm1hYyIgPyAiIiA6ICJuZSIsIGdldFNldENhcmV0RnVuY3Rpb24obm9k ZSwgY2hpbGRyZW5bMl0sIGNoaWxkcmVuWzJdLmRhdGEuc2VhcmNoKCJuZSAyIikpKTsKKyAgICAg ICAgcnVuVGVzdCgiZm9yd2FyZCIsICJiYWNrd2FyZCIsICJ3b3JkIiwgYmVoYXZpb3IgPT0gIm1h YyIgPyAiIiA6ICJsaSIsIGdldFNldENhcmV0RnVuY3Rpb24obm9kZSwgY2hpbGRyZW5bMl0sIGNo aWxkcmVuWzJdLmRhdGEuc2VhcmNoKCJuZSAyIikpKTsKKyAgICAgICAgcnVuVGVzdCgiYmFja3dh cmQiLCAiZm9yd2FyZCIsICJsaW5lIiwgYmVoYXZpb3IgPT0gIm1hYyIgPyAiIiA6ICIxXG5saW5l ICIsIGdldFNldENhcmV0RnVuY3Rpb24obm9kZSwgY2hpbGRyZW5bMF0sIGNoaWxkcmVuWzBdLmRh dGEuc2VhcmNoKCIxIikpKTsKKyAgICAgICAgcnVuVGVzdCgiZm9yd2FyZCIsICJiYWNrd2FyZCIs ICJsaW5lIiwgYmVoYXZpb3IgPT0gIm1hYyIgPyAiIiA6ICIyXG5saW5lICIsIGdldFNldENhcmV0 RnVuY3Rpb24obm9kZSwgY2hpbGRyZW5bNF0sIGNoaWxkcmVuWzRdLmRhdGEuc2VhcmNoKCIzIikp KTsKKyAgICAgICAgcnVuVGVzdCgiYmFja3dhcmQiLCAiZm9yd2FyZCIsICJwYXJhZ3JhcGgiLCBi ZWhhdmlvciA9PSAibWFjIiA/ICIiIDogIjFcbmxpbmUgIiwgZ2V0U2V0Q2FyZXRGdW5jdGlvbihu b2RlLCBjaGlsZHJlblswXSwgY2hpbGRyZW5bMF0uZGF0YS5zZWFyY2goIjEiKSkpOworICAgICAg ICBydW5UZXN0KCJmb3J3YXJkIiwgImJhY2t3YXJkIiwgInBhcmFncmFwaCIsIGJlaGF2aW9yID09 ICJtYWMiID8gIiIgOiAiMlxubGluZSAiLCBnZXRTZXRDYXJldEZ1bmN0aW9uKG5vZGUsIGNoaWxk cmVuWzRdLCBjaGlsZHJlbls0XS5kYXRhLnNlYXJjaCgiMyIpKSk7CisgICAgfQorCisgICAgZWRp dGluZ1Rlc3QoIm1hYyIpOworICAgIGVkaXRpbmdUZXN0KCJ3aW4iKTsKKworICAgIHZhciBub2Rl ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3QtZGl2Iik7CisgICAgbm9kZS5wYXJlbnRO b2RlLnJlbW92ZUNoaWxkKG5vZGUpOworPC9zY3JpcHQ+Cg== 122785 2012-01-17 11:22:15 -0800 2012-01-19 18:51:17 -0800 nitfixing bug-75652-20120117112215.patch text/plain 9911 pf U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk3NTQ4NGYwY2M1ZTk1 MjZmNTEwYmFkOWEyMDhhZjg2M2ZmZjliZC4uNWFkNGU3ODA4OTEzYzllMWU3YTYwZjBjZjdhYThm NDAzYTRkOGU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAxLTEwICBQYWJs byBGbG91cmV0ICA8cGFibG9mQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBGaXggaW5jb25zaXN0 ZW50IHRleHQgc2VsZWN0aW9uIGJlaGF2aW9yIHdpdGggb3B0aW9uLXNoaWZ0LWxlZnQvcmlnaHQv dXAvZG93bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc1NjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg T24gTWFjLCBzZWxlY3RpbmcgYmFja3dhcmRzIGJ5IHdvcmQsIGxpbmUgb3IgcGFyYWdyYXBoIGZy b20gdGhlIG1pZGRsZQorICAgICAgICBvZiBzb21lIHRleHQsIGFuZCB0aGVuIGdvaW5nIGZvcndh cmQgbGVhdmVzIHRoZSBjYXJldCBiYWNrIGluIHRoZSBtaWRkbGUKKyAgICAgICAgd2l0aCBubyBz ZWxlY3Rpb24sIGluc3RlYWQgb2YgZGlyZWN0bHkgc2VsZWN0aW5nIHRvIHRoZSBvdGhlciBlbmQg b2YgdGhlCisgICAgICAgIHdvcmQvbGluZS9wYXJhZ3JhcGggKFVuaXgvV2luZG93cyBiZWhhdmlv cikuIEZpeCB0aGlzIGJ5IGFkZGluZyBhIG5ldworICAgICAgICBlZGl0aW5nIGJlaGF2aW9yIHRv IGNvbnRyb2wgd2hldGhlciB0aGUgc2VsZWN0aW9uIHNob3VsZCBnbyBhY3Jvc3MgdGhlCisgICAg ICAgIGluaXRpYWwgcG9zaXRpb24gb2YgdGhlIGNhcmV0IGRpcmVjdGx5IG9yIG5vdCBpbiBzaXR1 YXRpb25zIGxpa2UgdGhlIG9uZQorICAgICAgICBvdXRsaW5lZCBhYm92ZS4KKworICAgICAgICBU ZXN0OiBlZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tZXh0ZW5kLXNob3VsZC1ub3QtbW92ZS1h Y3Jvc3MtY2FyZXQtb24tbWFjLmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ0JlaGF2 aW9yLmg6CisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nQmVoYXZpb3I6OnNob3VsZEV4dGVuZFNl bGVjdGlvbkJ5V29yZE9yTGluZUFjcm9zc0NhcmV0KToKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjptb2RpZnkp OgorCiAyMDEyLTAxLTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTA0NDE4LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3IuaCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdGluZ0JlaGF2aW9yLmgKaW5kZXggNzIwZjM4YTNlYTlmOTljN2ViYTEx YTIxYTI2NGM1MTU3YTFhOTk0NC4uOWVkMWQ3N2RkZDMzYTAxNDNjMzAxZDQzMWRiMDFlZDQ1MWEw ZGM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3Iu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvci5oCkBAIC02Nyw2 ICs2NywxMSBAQCBwdWJsaWM6CiAgICAgLy8gT24gTWFjIGFuZCBXaW5kb3dzLCBwcmVzc2luZyBi YWNrc3BhY2UgKHdoZW4gaXQgaXNuJ3QgaGFuZGxlZCBvdGhlcndpc2UpIHNob3VsZCBuYXZpZ2F0 ZSBiYWNrLgogICAgIGJvb2wgc2hvdWxkTmF2aWdhdGVCYWNrT25CYWNrc3BhY2UoKSBjb25zdCB7 IHJldHVybiBtX3R5cGUgIT0gRWRpdGluZ1VuaXhCZWhhdmlvcjsgfQogCisgICAgLy8gT24gTWFj LCBzZWxlY3RpbmcgYmFja3dhcmRzIGJ5IHdvcmQvbGluZSBmcm9tIHRoZSBtaWRkbGUgb2YgYSB3 b3JkL2xpbmUsIGFuZCB0aGVuIGdvaW5nCisgICAgLy8gZm9yd2FyZCBsZWF2ZXMgdGhlIGNhcmV0 IGJhY2sgaW4gdGhlIG1pZGRsZSB3aXRoIG5vIHNlbGVjdGlvbiwgaW5zdGVhZCBvZiBkaXJlY3Rs eSBzZWxlY3RpbmcKKyAgICAvLyB0byB0aGUgb3RoZXIgZW5kIG9mIHRoZSBsaW5lL3dvcmQgKFVu aXgvV2luZG93cyBiZWhhdmlvcikuCisgICAgYm9vbCBzaG91bGRFeHRlbmRTZWxlY3Rpb25CeVdv cmRPckxpbmVBY3Jvc3NDYXJldCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSAhPSBFZGl0aW5nTWFj QmVoYXZpb3I7IH0KKwogcHJpdmF0ZToKICAgICBFZGl0aW5nQmVoYXZpb3JUeXBlIG1fdHlwZTsK IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IGQxMjY3 ZWFlZGZlMmY4ZDBmZmNkZWRlZjk2YjA3NjFmZGE1MjRhZmYuLjY3MTFmMjk1NzY0OGYyNjZhZmNl ZWJmZjUxYmNlODJkZTcxN2FjYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RnJhbWVTZWxlY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxl Y3Rpb24uY3BwCkBAIC05MzYsNiArOTM2LDE5IEBAIGJvb2wgRnJhbWVTZWxlY3Rpb246Om1vZGlm eShFQWx0ZXJhdGlvbiBhbHRlciwgU2VsZWN0aW9uRGlyZWN0aW9uIGRpcmVjdGlvbiwgVGV4CiAg ICAgICAgIG1vdmVUbyhwb3NpdGlvbiwgdXNlclRyaWdnZXJlZCk7CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgQWx0ZXJhdGlvbkV4dGVuZDoKKyAgICAgICAgaWYgKCFtX3NlbGVjdGlvbi5pc0Nh cmV0KCkKKyAgICAgICAgICAgICYmIChncmFudWxhcml0eSA9PSBXb3JkR3JhbnVsYXJpdHkgfHwg Z3JhbnVsYXJpdHkgPT0gUGFyYWdyYXBoR3JhbnVsYXJpdHkgfHwgZ3JhbnVsYXJpdHkgPT0gTGlu ZUdyYW51bGFyaXR5KQorICAgICAgICAgICAgJiYgbV9mcmFtZSAmJiAhbV9mcmFtZS0+ZWRpdG9y KCktPmJlaGF2aW9yKCkuc2hvdWxkRXh0ZW5kU2VsZWN0aW9uQnlXb3JkT3JMaW5lQWNyb3NzQ2Fy ZXQoKSkgeworICAgICAgICAgICAgLy8gRG9uJ3QgbGV0IHRoZSBzZWxlY3Rpb24gZ28gYWNyb3Nz IHRoZSBiYXNlIHBvc2l0aW9uIGRpcmVjdGx5LiBOZWVkZWQgdG8gbWF0Y2ggbWFjCisgICAgICAg ICAgICAvLyBiZWhhdmlvciB3aGVuLCBmb3IgaW5zdGFuY2UsIHdvcmQtc2VsZWN0aW5nIGJhY2t3 YXJkcyBzdGFydGluZyB3aXRoIHRoZSBjYXJldCBpbgorICAgICAgICAgICAgLy8gdGhlIG1pZGRs ZSBvZiBhIHdvcmQgYW5kIHRoZW4gd29yZC1zZWxlY3RpbmcgZm9yd2FyZCwgbGVhdmluZyB0aGUg Y2FyZXQgaW4gdGhlCisgICAgICAgICAgICAvLyBzYW1lIHBsYWNlIHdoZXJlIGl0IHdhcywgaW5z dGVhZCBvZiBkaXJlY3RseSBzZWxlY3RpbmcgdG8gdGhlIGVuZCBvZiB0aGUgd29yZC4KKyAgICAg ICAgICAgIFZpc2libGVTZWxlY3Rpb24gbmV3U2VsZWN0aW9uID0gbV9zZWxlY3Rpb247CisgICAg ICAgICAgICBuZXdTZWxlY3Rpb24uc2V0RXh0ZW50KHBvc2l0aW9uKTsKKyAgICAgICAgICAgIGlm IChtX3NlbGVjdGlvbi5pc0Jhc2VGaXJzdCgpICE9IG5ld1NlbGVjdGlvbi5pc0Jhc2VGaXJzdCgp KQorICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbV9zZWxlY3Rpb24uYmFzZSgpOworICAgICAg ICB9CisKICAgICAgICAgLy8gU3RhbmRhcmQgTWFjIGJlaGF2aW9yIHdoZW4gZXh0ZW5kaW5nIHRv IGEgYm91bmRhcnkgaXMgZ3JvdyB0aGUgc2VsZWN0aW9uIHJhdGhlciB0aGFuIGxlYXZpbmcgdGhl CiAgICAgICAgIC8vIGJhc2UgaW4gcGxhY2UgYW5kIG1vdmluZyB0aGUgZXh0ZW50LiBNYXRjaGVz IE5TVGV4dFZpZXcuCiAgICAgICAgIGlmICghbV9mcmFtZSB8fCAhbV9mcmFtZS0+ZWRpdG9yKCkt PmJlaGF2aW9yKCkuc2hvdWxkQWx3YXlzR3Jvd1NlbGVjdGlvbldoZW5FeHRlbmRpbmdUb0JvdW5k YXJ5KCkgfHwgbV9zZWxlY3Rpb24uaXNDYXJldCgpIHx8ICFpc0JvdW5kYXJ5KGdyYW51bGFyaXR5 KSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCA3YmI0YmFmMDAxY2I2YzhkNmFjOTM5MmY5NzQxNzU1MDNiNTAyZGJjLi5iMGQz YWQ2ZGE3NDRlZmVmYzNhZjFjNTU1MjYzZTMxNTU5MDYwNTFjIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMDEtMTAgIFBhYmxvIEZsb3VyZXQgIDxwYWJsb2ZAbW90b3JvbGEuY29tPgorCisg ICAgICAgIEZpeCBpbmNvbnNpc3RlbnQgdGV4dCBzZWxlY3Rpb24gYmVoYXZpb3Igd2l0aCBvcHRp b24tc2hpZnQtbGVmdC9yaWdodC91cC9kb3duLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU2NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBPbiBNYWMsIHNlbGVjdGluZyBiYWNrd2FyZHMgYnkgd29yZCwg bGluZSBvciBwYXJhZ3JhcGggZnJvbSB0aGUgbWlkZGxlCisgICAgICAgIG9mIHNvbWUgdGV4dCwg YW5kIHRoZW4gZ29pbmcgZm9yd2FyZCBsZWF2ZXMgdGhlIGNhcmV0IGJhY2sgaW4gdGhlIG1pZGRs ZQorICAgICAgICB3aXRoIG5vIHNlbGVjdGlvbiwgaW5zdGVhZCBvZiBkaXJlY3RseSBzZWxlY3Rp bmcgdG8gdGhlIG90aGVyIGVuZCBvZiB0aGUKKyAgICAgICAgd29yZC9saW5lL3BhcmFncmFwaCAo VW5peC9XaW5kb3dzIGJlaGF2aW9yKS4gRml4IHRoaXMgYnkgYWRkaW5nIGEgbmV3CisgICAgICAg IGVkaXRpbmcgYmVoYXZpb3IgdG8gY29udHJvbCB3aGV0aGVyIHRoZSBzZWxlY3Rpb24gc2hvdWxk IGdvIGFjcm9zcyB0aGUKKyAgICAgICAgaW5pdGlhbCBwb3NpdGlvbiBvZiB0aGUgY2FyZXQgZGly ZWN0bHkgb3Igbm90IGluIHNpdHVhdGlvbnMgbGlrZSB0aGUgb25lCisgICAgICAgIG91dGxpbmVk IGFib3ZlLgorCisgICAgICAgICogZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLWV4dGVuZC1z aG91bGQtbm90LW1vdmUtYWNyb3NzLWNhcmV0LW9uLW1hYy1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIGVkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1leHRlbmQtc2hvdWxkLW5vdC1t b3ZlLWFjcm9zcy1jYXJldC1vbi1tYWMuaHRtbDogQWRkZWQuCisKIDIwMTItMDEtMDkgIEpvaG4g S25vdHRlbmJlbHQgIDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVt XSBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0 aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tZXh0ZW5kLXNob3VsZC1ub3QtbW92ZS1hY3Jvc3MtY2Fy ZXQtb24tbWFjLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3Nl bGVjdGlvbi1leHRlbmQtc2hvdWxkLW5vdC1tb3ZlLWFjcm9zcy1jYXJldC1vbi1tYWMtZXhwZWN0 ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjZmYzVkYWQwNDU5NjYxZTM2YzYyYmZkOGIxOGFlY2U5MTAwYTM1 ZmYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxl Y3Rpb24tZXh0ZW5kLXNob3VsZC1ub3QtbW92ZS1hY3Jvc3MtY2FyZXQtb24tbWFjLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDE3IEBACitPbiBNYWMgd2hlbiB3b3JkLXNlbGVjdGluZyBiYWNrd2Fy ZHMgc3RhcnRpbmcgd2l0aCB0aGUgY2FyZXQgb24gdGhlIG1pZGRsZSBvZiBhIHdvcmQgYW5kIHRo ZW4gd29yZC1zZWxlY3RpbmcgZm9yd2FyZCwgdGhlIGNhcmV0IGlzIGxlZnQgaW4gdGhlIHNhbWUg cGxhY2Ugd2hlcmUgaXQgd2FzLCBpbnN0ZWFkIG9mIGRpcmVjdGx5IHNlbGVjdGluZyB0byB0aGUg ZW5kIG9mIHRoZSB3b3JkICh3aGljaCBpcyB3aW5kb3dzL3VuaXggYmVoYXZpb3IpLgorCittYWM6 CitFeHRlbmQgYmFja3dhcmQgYW5kIHRoZW4gZm9yd2FyZCBieSB3b3JkOiBQQVNTCitFeHRlbmQg Zm9yd2FyZCBhbmQgdGhlbiBiYWNrd2FyZCBieSB3b3JkOiBQQVNTCitFeHRlbmQgYmFja3dhcmQg YW5kIHRoZW4gZm9yd2FyZCBieSBsaW5lOiBQQVNTCitFeHRlbmQgZm9yd2FyZCBhbmQgdGhlbiBi YWNrd2FyZCBieSBsaW5lOiBQQVNTCitFeHRlbmQgYmFja3dhcmQgYW5kIHRoZW4gZm9yd2FyZCBi eSBwYXJhZ3JhcGg6IFBBU1MKK0V4dGVuZCBmb3J3YXJkIGFuZCB0aGVuIGJhY2t3YXJkIGJ5IHBh cmFncmFwaDogUEFTUword2luOgorRXh0ZW5kIGJhY2t3YXJkIGFuZCB0aGVuIGZvcndhcmQgYnkg d29yZDogUEFTUworRXh0ZW5kIGZvcndhcmQgYW5kIHRoZW4gYmFja3dhcmQgYnkgd29yZDogUEFT UworRXh0ZW5kIGJhY2t3YXJkIGFuZCB0aGVuIGZvcndhcmQgYnkgbGluZTogUEFTUworRXh0ZW5k IGZvcndhcmQgYW5kIHRoZW4gYmFja3dhcmQgYnkgbGluZTogUEFTUworRXh0ZW5kIGJhY2t3YXJk IGFuZCB0aGVuIGZvcndhcmQgYnkgcGFyYWdyYXBoOiBQQVNTCitFeHRlbmQgZm9yd2FyZCBhbmQg dGhlbiBiYWNrd2FyZCBieSBwYXJhZ3JhcGg6IFBBU1MKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLWV4dGVuZC1zaG91bGQtbm90LW1vdmUtYWNy b3NzLWNhcmV0LW9uLW1hYy5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vc2Vs ZWN0aW9uLWV4dGVuZC1zaG91bGQtbm90LW1vdmUtYWNyb3NzLWNhcmV0LW9uLW1hYy5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjQ1MjQ0ZjU2MDcyYTRkYzhiMDQwM2Y4NDk5NjhkODJhMWQ1MDdmMDAKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tZXh0 ZW5kLXNob3VsZC1ub3QtbW92ZS1hY3Jvc3MtY2FyZXQtb24tbWFjLmh0bWwKQEAgLTAsMCArMSw2 NCBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxwPgorT24gTWFjIHdoZW4gd29yZC1zZWxlY3Rpbmcg YmFja3dhcmRzIHN0YXJ0aW5nIHdpdGggdGhlCitjYXJldCBvbiB0aGUgbWlkZGxlIG9mIGEgd29y ZCBhbmQgdGhlbiB3b3JkLXNlbGVjdGluZyBmb3J3YXJkLCB0aGUKK2NhcmV0IGlzIGxlZnQgaW4g dGhlIHNhbWUgcGxhY2Ugd2hlcmUgaXQgd2FzLCBpbnN0ZWFkIG9mIGRpcmVjdGx5IHNlbGVjdGlu ZyB0byB0aGUgZW5kCitvZiB0aGUgd29yZCAod2hpY2ggaXMgd2luZG93cy91bml4IGJlaGF2aW9y KS4KKzwvcD4KKworPGRpdiBpZD0idGVzdC1kaXYiIGNvbnRlbnRlZGl0YWJsZT10cnVlPgorICAg IGxpbmUgMTxicj4KKyAgICBsaW5lIDI8YnI+CisgICAgbGluZSAzCis8L2Rpdj4KKworPHNjcmlw dD4KK2Z1bmN0aW9uIGVkaXRpbmdUZXN0KGJlaGF2aW9yKSB7CisgICAgaWYgKHdpbmRvdy5sYXlv dXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNU ZXh0KCk7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLnNldEVkaXRpbmdCZWhhdmlvcihi ZWhhdmlvcik7CisgICAgfQorCisgICAgZnVuY3Rpb24gZ2V0U2V0Q2FyZXRGdW5jdGlvbihub2Rl LCBjb250YWluZXIsIG9mZnNldCkgeworICAgICAgICByZXR1cm4gZnVuY3Rpb24gKCkgeworICAg ICAgICAgICAgdmFyIHNlbGVjdGlvbiA9IHdpbmRvdy5nZXRTZWxlY3Rpb24oKTsKKyAgICAgICAg ICAgIHNlbGVjdGlvbi5lbXB0eSgpOworCisgICAgICAgICAgICB2YXIgcmFuZ2UgPSBkb2N1bWVu dC5jcmVhdGVSYW5nZSgpOworICAgICAgICAgICAgcmFuZ2Uuc2V0U3RhcnQoY29udGFpbmVyLCBv ZmZzZXQpOworICAgICAgICAgICAgc2VsZWN0aW9uLmFkZFJhbmdlKHJhbmdlKTsKKyAgICAgICAg fQorICAgIH0KKworICAgIGZ1bmN0aW9uIHJ1blRlc3QoZmlyc3REaXJlY3Rpb24sIHNlY29uZERp cmVjdGlvbiwgZ3JhbnVsYXJpdHksIGV4cGVjdGVkVGV4dCwgc2V0Q2FyZXQpIHsKKyAgICAgICAg dmFyIHNlbGVjdGlvbiA9IHdpbmRvdy5nZXRTZWxlY3Rpb24oKTsKKyAgICAgICAgc2V0Q2FyZXQo KTsKKyAgICAgICAgc2VsZWN0aW9uLm1vZGlmeSgiZXh0ZW5kIiwgZmlyc3REaXJlY3Rpb24sIGdy YW51bGFyaXR5KTsKKyAgICAgICAgc2VsZWN0aW9uLm1vZGlmeSgiZXh0ZW5kIiwgc2Vjb25kRGly ZWN0aW9uLCBncmFudWxhcml0eSk7CisgICAgICAgIHZhciBzID0gc2VsZWN0aW9uLnRvU3RyaW5n KCk7CisgICAgICAgIGRvY3VtZW50LndyaXRlKCJFeHRlbmQgIiArIGZpcnN0RGlyZWN0aW9uICsg IiBhbmQgdGhlbiAiICsgc2Vjb25kRGlyZWN0aW9uICsgIiBieSAiICsgZ3JhbnVsYXJpdHkgKyAi OiAiKTsKKyAgICAgICAgZG9jdW1lbnQud3JpdGUocyA9PT0gZXhwZWN0ZWRUZXh0ID8gIlBBU1Mi IDogJ0ZBSUw6IGV4cGVjdGVkICInICsgZXNjYXBlKGV4cGVjdGVkVGV4dCkgKyAnIiwgZ290ICIn ICsgZXNjYXBlKHMpICsgJyInKTsKKyAgICAgICAgZG9jdW1lbnQud3JpdGUoIjxicj4iKTsKKyAg ICB9CisKKyAgICB2YXIgbm9kZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0LWRpdiIp OworICAgIHZhciBjaGlsZHJlbiA9IG5vZGUuY2hpbGROb2RlczsKKworICAgIHZhciB3b3JkQ2Fy ZXRGdW5jdGlvbiA9IGdldFNldENhcmV0RnVuY3Rpb24obm9kZSwgY2hpbGRyZW5bMl0sIGNoaWxk cmVuWzJdLmRhdGEuc2VhcmNoKCJuZSAyIikpOworCisgICAgZG9jdW1lbnQud3JpdGUoYmVoYXZp b3IgKyAiOjxicj4iKTsKKyAgICBydW5UZXN0KCJiYWNrd2FyZCIsICJmb3J3YXJkIiwgIndvcmQi LCBiZWhhdmlvciA9PSAibWFjIiA/ICIiIDogIm5lIiwgZ2V0U2V0Q2FyZXRGdW5jdGlvbihub2Rl LCBjaGlsZHJlblsyXSwgY2hpbGRyZW5bMl0uZGF0YS5zZWFyY2goIm5lIDIiKSkpOworICAgIHJ1 blRlc3QoImZvcndhcmQiLCAiYmFja3dhcmQiLCAid29yZCIsIGJlaGF2aW9yID09ICJtYWMiID8g IiIgOiAibGkiLCBnZXRTZXRDYXJldEZ1bmN0aW9uKG5vZGUsIGNoaWxkcmVuWzJdLCBjaGlsZHJl blsyXS5kYXRhLnNlYXJjaCgibmUgMiIpKSk7CisgICAgcnVuVGVzdCgiYmFja3dhcmQiLCAiZm9y d2FyZCIsICJsaW5lIiwgYmVoYXZpb3IgPT0gIm1hYyIgPyAiIiA6ICIxXG5saW5lICIsIGdldFNl dENhcmV0RnVuY3Rpb24obm9kZSwgY2hpbGRyZW5bMF0sIGNoaWxkcmVuWzBdLmRhdGEuc2VhcmNo KCIxIikpKTsKKyAgICBydW5UZXN0KCJmb3J3YXJkIiwgImJhY2t3YXJkIiwgImxpbmUiLCBiZWhh dmlvciA9PSAibWFjIiA/ICIiIDogIjJcbmxpbmUgIiwgZ2V0U2V0Q2FyZXRGdW5jdGlvbihub2Rl LCBjaGlsZHJlbls0XSwgY2hpbGRyZW5bNF0uZGF0YS5zZWFyY2goIjMiKSkpOworICAgIHJ1blRl c3QoImJhY2t3YXJkIiwgImZvcndhcmQiLCAicGFyYWdyYXBoIiwgYmVoYXZpb3IgPT0gIm1hYyIg PyAiIiA6ICIxXG5saW5lICIsIGdldFNldENhcmV0RnVuY3Rpb24obm9kZSwgY2hpbGRyZW5bMF0s IGNoaWxkcmVuWzBdLmRhdGEuc2VhcmNoKCIxIikpKTsKKyAgICBydW5UZXN0KCJmb3J3YXJkIiwg ImJhY2t3YXJkIiwgInBhcmFncmFwaCIsIGJlaGF2aW9yID09ICJtYWMiID8gIiIgOiAiMlxubGlu ZSAiLCBnZXRTZXRDYXJldEZ1bmN0aW9uKG5vZGUsIGNoaWxkcmVuWzRdLCBjaGlsZHJlbls0XS5k YXRhLnNlYXJjaCgiMyIpKSk7Cit9CisKK2VkaXRpbmdUZXN0KCJtYWMiKTsKK2VkaXRpbmdUZXN0 KCJ3aW4iKTsKKwordmFyIG5vZGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdC1kaXYi KTsKK25vZGUucGFyZW50Tm9kZS5yZW1vdmVDaGlsZChub2RlKTsKKzwvc2NyaXB0Pgo=