37792 2010-04-19 01:07:01 -0700 bugs.webkit.org: should not hard-wrap comment lines exceeding 80 characters 2010-05-09 00:13:25 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek cjerdonek ddkilzer eric mjs wsiegrist oldest_to_newest 213943 0 cjerdonek 2010-04-19 01:07:01 -0700 This report stems from the following webkit-dev e-mail: https://lists.webkit.org/pipermail/webkit-dev/2010-April/012528.html 213945 1 cjerdonek 2010-04-19 01:11:32 -0700 This is configured here: http://trac.webkit.org/browser/trunk/BugsSite/Bugzilla/Constants.pm?rev=45520#L263 213953 2 cjerdonek 2010-04-19 01:33:59 -0700 Hmm, I guess it would be best if we can also make the box's wrapping behave dynamically based on browser window size, etc. (when reading comments). Otherwise, increasing the limit to 120, say, will force all flowing comment text to be at least that wide. 213960 3 mjs 2010-04-19 01:54:49 -0700 (In reply to comment #2) > Hmm, I guess it would be best if we can also make the box's wrapping behave > dynamically based on browser window size, etc. (when reading comments). > Otherwise, increasing the limit to 120, say, will force all flowing comment > text to be at least that wide. My thought is that maybe the comments field can be just white-space: pre-wrap instead of white-space: pre, and therefore wrap to the window width. That way we shouldn't need hard line breaks at all. 218964 4 cjerdonek 2010-04-29 04:57:01 -0700 I didn't know until looking at the code that Bugzilla already doesn't wrap lines if they begin with ">": http://trac.webkit.org/browser/trunk/BugsSite/Bugzilla/Util.pm?rev=45520#L367 For example, 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 >23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 Perhaps the fix can be there (simply always execute the "if" block). 218969 5 cjerdonek 2010-04-29 05:07:35 -0700 (In reply to comment #4) > Perhaps the fix can be there (simply always execute the "if" block). Ignore that last line. I just thought it was interesting that Bugzilla doesn't wrap lines that begin with ">". Maybe people already knew that. 219362 6 54781 cjerdonek 2010-04-29 21:41:27 -0700 Created attachment 54781 Proposed patch I'm not 100% sure that increasing the COMMENT_COLS constant won't affect other forms on the site that I might be less familiar with. Nevertheless, I wanted to get a candidate patch out there. 219363 7 cjerdonek 2010-04-29 21:51:51 -0700 (In reply to comment #3) > My thought is that maybe the comments field can be just white-space: pre-wrap > instead of white-space: pre, and therefore wrap to the window width. That way > we shouldn't need hard line breaks at all. By the way, note that the comments field is already "white-space: pre-wrap": .bz_comment_text, .uneditable_textarea { font-family: monospace; /* Note that these must all be on separate lines or they stop working in Konqueror. */ white-space: pre-wrap; /* CSS 3 & 2.1 */ white-space: -moz-pre-wrap; /* Gecko */ white-space: -pre-wrap; /* Opera 4-6 */ white-space: -o-pre-wrap; /* Opera 7 */ } It seems to be the width styling and the quoted lines' "white-space: pre"-- span.quote { color: #65379c; /* Make quoted text not wrap. */ white-space: pre; } that are both preventing the pre-wrap style from taking effect: 220290 8 cjerdonek 2010-05-03 14:32:08 -0700 Any takers? I'm assuming this change will go live when it lands. Assuming that, I will be online when it lands to check for any unusual or undesired behavior, etc. 220687 9 54781 ddkilzer 2010-05-04 11:39:05 -0700 Comment on attachment 54781 Proposed patch > diff --git a/BugsSite/Bugzilla/Constants.pm b/BugsSite/Bugzilla/Constants.pm > # The column length for displayed (and wrapped) bug comments. > -use constant COMMENT_COLS => 80; > +# > +# We choose a large value to prevent Text::Wrap::wrap() from inserting > +# hard line breaks. This allows us to use "white-space: pre-wrap" > +# in the CSS for line-wrapping instead. > +use constant COMMENT_COLS => 160; Isn't this going to cause funny wrapping if someone types more than 160 characters in a single "paragraph"? Is there a way to disable the wrapping altogether (e.g., setting COMMENT_COLS to 0 or -1 or modifying code elsewhere)? > diff --git a/BugsSite/skins/standard/global.css b/BugsSite/skins/standard/global.css > index aca0ab5..1ef62e9 100644 > --- a/BugsSite/skins/standard/global.css > +++ b/BugsSite/skins/standard/global.css > @@ -260,7 +260,8 @@ div#docslinks { > } > > .bz_comment_text { > - width: 50em; > + /* Do not specify a width. Otherwise, comment lines will "pre-wrap" > + to the specified width rather than to the window width. */ > } > > .bz_first_comment { > @@ -275,6 +276,14 @@ div#docslinks { > padding: 1em 0; > } > > +.bz_comment_text > span.quote { > + /* Prevent "white-space: pre" from styling quoted lines inside comments. > + Otherwise, a single quoted line that extends beyond the window > + width will cause all non-quoted long lines to extend beyond the > + window width as well. */ > + white-space: inherit; > +} > + > span.quote { > color: #65379c; > /* Make quoted text not wrap. */ All of these changes need to be made to skins/custom/global.css, not skins/standard/global.css, since the custom version overrides the standard version. (It's how Bugzilla rolls.) 220720 10 cjerdonek 2010-05-04 12:53:55 -0700 (In reply to comment #9) Thanks, David. > > +use constant COMMENT_COLS => 160; > > Isn't this going to cause funny wrapping if someone types more than 160 > characters in a single "paragraph"? Is there a way to disable the wrapping > altogether (e.g., setting COMMENT_COLS to 0 or -1 or modifying code elsewhere)? Oops. Yes, of course. We're using this for text and not just code. I experimented with this a bit and found that Perl's $Text::Wrap::wrap() function automatically increases values of -1 and 0 to a minimum of 2. The maximum supported value seems to be 32766, so another approach could be to set the value high. It looks like the code enforces a maximum comment length that is roughly double that: > # The column length for displayed (and wrapped) bug comments. > use constant COMMENT_COLS => 80; > # Used in _check_comment(). Gives the max length allowed for a comment. > use constant MAX_COMMENT_LENGTH => 65535; In code seems like it may be the cleanest approach. BugsSite/Bugzilla/Util.pm contains a wrap_comment() subroutine (which uses COMMENT_COLS) which suggests that no other code will be affected by a change there. 220873 11 ddkilzer 2010-05-04 16:47:51 -0700 (In reply to comment #10) > The maximum supported value seems to be 32766, so another approach could be to > set the value high. It looks like the code enforces a maximum comment length > that is roughly double that: > > > # The column length for displayed (and wrapped) bug comments. > > use constant COMMENT_COLS => 80; > > # Used in _check_comment(). Gives the max length allowed for a comment. > > use constant MAX_COMMENT_LENGTH => 65535; > > In code seems like it may be the cleanest approach. BugsSite/Bugzilla/Util.pm > contains a wrap_comment() subroutine (which uses COMMENT_COLS) which suggests > that no other code will be affected by a change there. That seems fine (setting the value high). 221708 12 55246 cjerdonek 2010-05-06 08:55:37 -0700 Created attachment 55246 Proposed patch 2 Addressed comments. Do changes to the bugs site go live when they land, or is there a manual step? 221714 13 wsiegrist 2010-05-06 09:05:27 -0700 They should update automatically... if they do not, ping me on irc (_wms) or email me. 221730 14 55246 darin 2010-05-06 09:31:29 -0700 Comment on attachment 55246 Proposed patch 2 Looks good. Lets give this a try. r=me 222116 15 cjerdonek 2010-05-06 19:05:03 -0700 (In reply to comment #6) > I'm not 100% sure that increasing the COMMENT_COLS constant won't affect other > forms on the site that I might be less familiar with. After taking a closer look at this before landing, it looks like changing COMMENT_COLS will affect other areas of the site. Namely, COMMENT_COLS seems to control the width of the textareas used to input comments, and not just the wrapping behavior for comment output. So it seems like we should create a new constant that we know will affect only comment display. Will post patch shortly. 222118 16 55334 cjerdonek 2010-05-06 19:09:26 -0700 Created attachment 55334 Proposed patch 3 This patch is the same as before, but creates COMMENT_COLS_WRAP exclusively for use in wrap_comment(). That way we can leave COMMENT_COLS alone for other parts of the code. 222966 17 55246 eric 2010-05-08 23:11:30 -0700 Comment on attachment 55246 Proposed patch 2 Cleared Darin Adler's review+ from obsolete attachment 55246 so that this bug does not appear in http://webkit.org/pending-commit. 222990 18 55334 mjs 2010-05-08 23:44:57 -0700 Comment on attachment 55334 Proposed patch 3 r=me 222992 19 55334 cjerdonek 2010-05-08 23:50:50 -0700 Comment on attachment 55334 Proposed patch 3 Clearing flags on attachment: 55334 Committed r59047: <http://trac.webkit.org/changeset/59047> 222993 20 cjerdonek 2010-05-08 23:50:59 -0700 All reviewed patches have been landed. Closing bug. 222994 21 cjerdonek 2010-05-08 23:53:18 -0700 Test: 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 > 34567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 222995 22 cjerdonek 2010-05-09 00:13:25 -0700 (In reply to comment #10) Test: > I experimented with this a bit and found that Perl's $Text::Wrap::wrap() function automatically increases values of -1 and 0 to a minimum of 2. > > The maximum supported value seems to be 32766, so another approach could be to set the value high. It looks like the code enforces a maximum comment length that is roughly double that: > > > # The column length for displayed (and wrapped) bug comments. > > use constant COMMENT_COLS => 80; > > # Used in _check_comment(). Gives the max length allowed for a comment. > > use constant MAX_COMMENT_LENGTH => 65535; > > In code seems like it may be the cleanest approach. BugsSite/Bugzilla/Util.pm contains a wrap_comment() subroutine (which uses COMMENT_COLS) which suggests that no other code will be affected by a change there. 54781 2010-04-29 21:41:27 -0700 2010-05-06 08:55:37 -0700 Proposed patch _patch-37792-1.diff text/plain 2718 cjerdonek ZGlmZiAtLWdpdCBhL0J1Z3NTaXRlL0J1Z3ppbGxhL0NvbnN0YW50cy5wbSBiL0J1Z3NTaXRlL0J1 Z3ppbGxhL0NvbnN0YW50cy5wbQppbmRleCAwMTZlMWZhLi5iMzQ5YjMxIDEwMDY0NAotLS0gYS9C dWdzU2l0ZS9CdWd6aWxsYS9Db25zdGFudHMucG0KKysrIGIvQnVnc1NpdGUvQnVnemlsbGEvQ29u c3RhbnRzLnBtCkBAIC0yNjEsNyArMjYxLDExIEBAIHVzZSBjb25zdGFudCBRVUVSWV9MSVNUID0+ IDA7CiB1c2UgY29uc3RhbnQgTElTVF9PRl9CVUdTID0+IDE7CiAKICMgVGhlIGNvbHVtbiBsZW5n dGggZm9yIGRpc3BsYXllZCAoYW5kIHdyYXBwZWQpIGJ1ZyBjb21tZW50cy4KLXVzZSBjb25zdGFu dCBDT01NRU5UX0NPTFMgPT4gODA7CisjCisjIFdlIGNob29zZSBhIGxhcmdlIHZhbHVlIHRvIHBy ZXZlbnQgVGV4dDo6V3JhcDo6d3JhcCgpIGZyb20gaW5zZXJ0aW5nCisjIGhhcmQgbGluZSBicmVh a3MuICBUaGlzIGFsbG93cyB1cyB0byB1c2UgIndoaXRlLXNwYWNlOiBwcmUtd3JhcCIKKyMgaW4g dGhlIENTUyBmb3IgbGluZS13cmFwcGluZyBpbnN0ZWFkLgordXNlIGNvbnN0YW50IENPTU1FTlRf Q09MUyA9PiAxNjA7CiAjIFVzZWQgaW4gX2NoZWNrX2NvbW1lbnQoKS4gR2l2ZXMgdGhlIG1heCBs ZW5ndGggYWxsb3dlZCBmb3IgYSBjb21tZW50LgogdXNlIGNvbnN0YW50IE1BWF9DT01NRU5UX0xF TkdUSCA9PiA2NTUzNTsKIApkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvQ2hhbmdlTG9nIGIvQnVnc1Np dGUvQ2hhbmdlTG9nCmluZGV4IDU1ODE5MTcuLjFkZmFlOTMgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRl L0NoYW5nZUxvZworKysgYi9CdWdzU2l0ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAx MC0wNC0yOSAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBsb25nIGNvbW1l bnQgbGluZXMgdG8gd3JhcCB0byB0aGUgd2luZG93IHdpZHRoIGluc3RlYWQKKyAgICAgICAgb2Yg dG8gODAgY2hhcmFjdGVycy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mzc3OTIKKworICAgICAgICAqIEJ1Z3ppbGxhL0NvbnN0YW50cy5wbToKKyAg ICAgICAgICAtIFJlbGF4IHRoZSBDT01NRU5UX0NPTFMgY29uc3RhbnQgZnJvbSA4MCBjaGFyYWN0 ZXJzIHRvIDE2MC4KKyAgICAgICAgICAgIFRoaXMgY29uc3RhbnQgY29udHJvbHMgd2hlcmUgdGhl IHNpdGUgaW5zZXJ0cyBoYXJkIGxpbmUgYnJlYWtzCisgICAgICAgICAgICB0byBzaG9ydGVuIG5v bi1xdW90ZWQgbGluZXMuCisgICAgICAgICogc2tpbnMvc3RhbmRhcmQvZ2xvYmFsLmNzczoKKyAg ICAgICAgKC5iel9jb21tZW50X3RleHQpOgorICAgICAgICAgIC0gRWxpbWluYXRlIHRoZSB3aWR0 aCBzdHlsaW5nIG9uIGNvbW1lbnRzIHRvIGFsbG93IGxvbmcgbGluZXMKKyAgICAgICAgICAgIHRv IHdyYXAgYXQgdGhlIHdpbmRvdyB3aWR0aC4KKyAgICAgICAgKC5iel9jb21tZW50X3RleHQgPiBz cGFuLnF1b3RlKToKKyAgICAgICAgICAtIEluaGVyaXQgdGhlICJ3aGl0ZS1zcGFjZSIgcHJvcGVy dHkuICBUaGlzIHByZXZlbnRzIGxvbmcgcXVvdGVkCisgICAgICAgICAgICBsaW5lcyBpbiBjb21t ZW50cyBmcm9tIGNhdXNpbmcgbm9uLXF1b3RlZCBsaW5lcyB0byBleHRlbmQgYmV5b25kCisgICAg ICAgICAgICB0aGUgd2luZG93IHdpZHRoLgorCiAyMDEwLTA0LTIyICBBZGFtIEJhcnRoICA8YWJh cnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYg LS1naXQgYS9CdWdzU2l0ZS9za2lucy9zdGFuZGFyZC9nbG9iYWwuY3NzIGIvQnVnc1NpdGUvc2tp bnMvc3RhbmRhcmQvZ2xvYmFsLmNzcwppbmRleCBhY2EwYWI1Li4xZWY2MmU5IDEwMDY0NAotLS0g YS9CdWdzU2l0ZS9za2lucy9zdGFuZGFyZC9nbG9iYWwuY3NzCisrKyBiL0J1Z3NTaXRlL3NraW5z L3N0YW5kYXJkL2dsb2JhbC5jc3MKQEAgLTI2MCw3ICsyNjAsOCBAQCBkaXYjZG9jc2xpbmtzIHsK IH0KIAogLmJ6X2NvbW1lbnRfdGV4dCB7Ci0gICAgIHdpZHRoOiA1MGVtOworICAgIC8qIERvIG5v dCBzcGVjaWZ5IGEgd2lkdGguICBPdGhlcndpc2UsIGNvbW1lbnQgbGluZXMgd2lsbCAicHJlLXdy YXAiCisgICAgICAgdG8gdGhlIHNwZWNpZmllZCB3aWR0aCByYXRoZXIgdGhhbiB0byB0aGUgd2lu ZG93IHdpZHRoLiAqLwogfQogCiAuYnpfZmlyc3RfY29tbWVudCB7CkBAIC0yNzUsNiArMjc2LDE0 IEBAIGRpdiNkb2NzbGlua3MgewogICAgIHBhZGRpbmc6IDFlbSAwOwogfQogCisuYnpfY29tbWVu dF90ZXh0ID4gc3Bhbi5xdW90ZSB7CisgICAgLyogUHJldmVudCAid2hpdGUtc3BhY2U6IHByZSIg ZnJvbSBzdHlsaW5nIHF1b3RlZCBsaW5lcyBpbnNpZGUgY29tbWVudHMuCisgICAgICAgT3RoZXJ3 aXNlLCBhIHNpbmdsZSBxdW90ZWQgbGluZSB0aGF0IGV4dGVuZHMgYmV5b25kIHRoZSB3aW5kb3cK KyAgICAgICB3aWR0aCB3aWxsIGNhdXNlIGFsbCBub24tcXVvdGVkIGxvbmcgbGluZXMgdG8gZXh0 ZW5kIGJleW9uZCB0aGUKKyAgICAgICB3aW5kb3cgd2lkdGggYXMgd2VsbC4gKi8KKyAgICB3aGl0 ZS1zcGFjZTogaW5oZXJpdDsKK30KKwogc3Bhbi5xdW90ZSB7CiAgICAgY29sb3I6ICM2NTM3OWM7 CiAgICAgLyogTWFrZSBxdW90ZWQgdGV4dCBub3Qgd3JhcC4gKi8K 55246 2010-05-06 08:55:37 -0700 2010-05-08 23:11:30 -0700 Proposed patch 2 _patch-37792-2.diff text/plain 2892 cjerdonek ZGlmZiAtLWdpdCBhL0J1Z3NTaXRlL0J1Z3ppbGxhL0NvbnN0YW50cy5wbSBiL0J1Z3NTaXRlL0J1 Z3ppbGxhL0NvbnN0YW50cy5wbQppbmRleCAwMTZlMWZhLi4yYjFlOGYzIDEwMDY0NAotLS0gYS9C dWdzU2l0ZS9CdWd6aWxsYS9Db25zdGFudHMucG0KKysrIGIvQnVnc1NpdGUvQnVnemlsbGEvQ29u c3RhbnRzLnBtCkBAIC0yNjEsNyArMjYxLDE0IEBAIHVzZSBjb25zdGFudCBRVUVSWV9MSVNUID0+ IDA7CiB1c2UgY29uc3RhbnQgTElTVF9PRl9CVUdTID0+IDE7CiAKICMgVGhlIGNvbHVtbiBsZW5n dGggZm9yIGRpc3BsYXllZCAoYW5kIHdyYXBwZWQpIGJ1ZyBjb21tZW50cy4KLXVzZSBjb25zdGFu dCBDT01NRU5UX0NPTFMgPT4gODA7CisjCisjIEVtcGlyaWNhbCB0ZXN0aW5nIHNob3dlZCB0aGF0 ICRUZXh0OjpXcmFwOjpjb2x1bW5zIG11c3QgYmUgYSB2YWx1ZQorIyBiZXR3ZWVuIDIgYW5kIDMy NzY2LCBpbmNsdXNpdmUuICBXZSBjaG9vc2UgYSBsYXJnZSB2YWx1ZSB0byBwcmV2ZW50CisjIFRl eHQ6OldyYXA6OndyYXAoKSBmcm9tIGluc2VydGluZyBhbnkgaGFyZCBsaW5lIGJyZWFrcyBhdCBh bGwuICBUaGlzCisjIGxldHMgdXMgdXNlICJ3aGl0ZS1zcGFjZTogcHJlLXdyYXAiIGluIHRoZSBD U1MgdG8gZG8gbGluZS13cmFwcGluZworIyBpbnN0ZWFkLiAgV2UgYXJiaXRyYXJpbHkgY2hvb3Nl IDgwMDAsIHdoaWNoIGlzIGVub3VnaCBmb3IgYSAxMDAtbGluZQorIyBwYXJhZ3JhcGguCit1c2Ug Y29uc3RhbnQgQ09NTUVOVF9DT0xTID0+IDgwMDA7CiAjIFVzZWQgaW4gX2NoZWNrX2NvbW1lbnQo KS4gR2l2ZXMgdGhlIG1heCBsZW5ndGggYWxsb3dlZCBmb3IgYSBjb21tZW50LgogdXNlIGNvbnN0 YW50IE1BWF9DT01NRU5UX0xFTkdUSCA9PiA2NTUzNTsKIApkaWZmIC0tZ2l0IGEvQnVnc1NpdGUv Q2hhbmdlTG9nIGIvQnVnc1NpdGUvQ2hhbmdlTG9nCmluZGV4IDU1ODE5MTcuLjUxOGFiNTIgMTAw NjQ0Ci0tLSBhL0J1Z3NTaXRlL0NoYW5nZUxvZworKysgYi9CdWdzU2l0ZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNSBAQAorMjAxMC0wNS0wNiAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Vi a2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBbGxvdyBsb25nIGNvbW1lbnQgbGluZXMgdG8gd3JhcCB0byB0aGUgd2luZG93IHdpZHRoIGlu c3RlYWQKKyAgICAgICAgb2YgdG8gODAgY2hhcmFjdGVycy4KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzc3OTIKKworICAgICAgICAqIEJ1Z3ppbGxh L0NvbnN0YW50cy5wbToKKyAgICAgICAgICAtIEluY3JlYXNlIHRoZSBDT01NRU5UX0NPTFMgY29u c3RhbnQgZnJvbSA4MCBjaGFyYWN0ZXJzIHRvIGEgdmVyeQorICAgICAgICAgICAgbGFyZ2UgdmFs dWUgKDgwMDApLiAgVGhpcyBjb25zdGFudCBjb250cm9scyB3aGVyZSB0aGUgc2l0ZSBpbnNlcnRz CisgICAgICAgICAgICBoYXJkIGxpbmUgYnJlYWtzIHRvIHNob3J0ZW4gbm9uLXF1b3RlZCBsaW5l cy4KKyAgICAgICAgKiBza2lucy9jdXN0b20vZ2xvYmFsLmNzczoKKyAgICAgICAgKC5iel9jb21t ZW50X3RleHQpOgorICAgICAgICAgIC0gRWxpbWluYXRlIHRoZSB3aWR0aCBzdHlsaW5nIG9uIGNv bW1lbnRzIHRvIGFsbG93IGxvbmcgbGluZXMKKyAgICAgICAgICAgIHRvIHdyYXAgYXQgdGhlIHdp bmRvdyB3aWR0aC4KKyAgICAgICAgKC5iel9jb21tZW50X3RleHQgPiBzcGFuLnF1b3RlKToKKyAg ICAgICAgICAtIEluaGVyaXQgdGhlICJ3aGl0ZS1zcGFjZSIgcHJvcGVydHkuICBUaGlzIHByZXZl bnRzIGxvbmcgcXVvdGVkCisgICAgICAgICAgICBsaW5lcyBpbiBjb21tZW50cyBmcm9tIGNhdXNp bmcgbm9uLXF1b3RlZCBsaW5lcyB0byBleHRlbmQgYmV5b25kCisgICAgICAgICAgICB0aGUgd2lu ZG93IHdpZHRoLgorCiAyMDEwLTA0LTIyICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9CdWdzU2l0 ZS9za2lucy9jdXN0b20vZ2xvYmFsLmNzcyBiL0J1Z3NTaXRlL3NraW5zL2N1c3RvbS9nbG9iYWwu Y3NzCmluZGV4IDk3YTA3ZTAuLjYyMzMwOGMgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL3NraW5zL2N1 c3RvbS9nbG9iYWwuY3NzCisrKyBiL0J1Z3NTaXRlL3NraW5zL2N1c3RvbS9nbG9iYWwuY3NzCkBA IC0xMjUsNiArMTI1LDIwIEBAIHNwYW4uYnpfY29tbWVudCB7CiAJcGFkZGluZzogMnB4IDAgMnB4 IDA7CiB9CiAKKy5iel9jb21tZW50X3RleHQgeworICAgIC8qIERvIG5vdCBzcGVjaWZ5IGEgaGFy ZCB3aWR0aC4gIE90aGVyd2lzZSwgY29tbWVudCBsaW5lcyB3aWxsICJwcmUtd3JhcCIKKyAgICAg ICB0byB0aGUgc3BlY2lmaWVkIHdpZHRoIHJhdGhlciB0aGFuIHRvIHRoZSB3aW5kb3cgd2lkdGgu ICovCisgICAgd2lkdGg6IGF1dG87Cit9CisKKy5iel9jb21tZW50X3RleHQgPiBzcGFuLnF1b3Rl IHsKKyAgICAvKiBQcmV2ZW50IHNwYW4ucXVvdGUncyAid2hpdGUtc3BhY2U6IHByZSIgZnJvbSBz dHlsaW5nIHF1b3RlZCBsaW5lcworICAgICAgIGluc2lkZSBjb21tZW50cy4gIE90aGVyd2lzZSwg YSBzaW5nbGUgcXVvdGVkIGxpbmUgdGhhdCBleHRlbmRzCisgICAgICAgYmV5b25kIHRoZSB3aW5k b3cgd2lkdGggd2lsbCBjYXVzZSBhbGwgbm9uLXF1b3RlZCBsb25nIGxpbmVzIHRvCisgICAgICAg ZXh0ZW5kIGJleW9uZCB0aGUgd2luZG93IHdpZHRoIGFzIHdlbGwuICovCisgICAgd2hpdGUtc3Bh Y2U6IGluaGVyaXQ7Cit9CisKICNmb290ZXIgZm9ybSB7CiAJYm9yZGVyLXRvcDogMXB4IGRvdHRl ZCAjYWFhOwogCWJvcmRlci1ib3R0b206IDFweCBkb3R0ZWQgI2FhYTsK 55334 2010-05-06 19:09:26 -0700 2010-05-08 23:50:50 -0700 Proposed patch 3 _patch-37792-3.diff text/plain 4648 cjerdonek ZGlmZiAtLWdpdCBhL0J1Z3NTaXRlL0J1Z3ppbGxhL0NvbnN0YW50cy5wbSBiL0J1Z3NTaXRlL0J1 Z3ppbGxhL0NvbnN0YW50cy5wbQppbmRleCAwMTZlMWZhLi4wNDk2MzBmIDEwMDY0NAotLS0gYS9C dWdzU2l0ZS9CdWd6aWxsYS9Db25zdGFudHMucG0KKysrIGIvQnVnc1NpdGUvQnVnemlsbGEvQ29u c3RhbnRzLnBtCkBAIC04NCw2ICs4NCw3IEBAIHVzZSBGaWxlOjpCYXNlbmFtZTsKICAgICBMSVNU X09GX0JVR1MKIAogICAgIENPTU1FTlRfQ09MUworICAgIENPTU1FTlRfQ09MU19XUkFQCiAgICAg TUFYX0NPTU1FTlRfTEVOR1RICiAKICAgICBDTVRfTk9STUFMCkBAIC0yNjAsOCArMjYxLDE4IEBA IHVzZSBjb25zdGFudCBERUZBVUxUX1FVRVJZX05BTUUgPT4gJyhEZWZhdWx0IHF1ZXJ5KSc7CiB1 c2UgY29uc3RhbnQgUVVFUllfTElTVCA9PiAwOwogdXNlIGNvbnN0YW50IExJU1RfT0ZfQlVHUyA9 PiAxOwogCi0jIFRoZSBjb2x1bW4gbGVuZ3RoIGZvciBkaXNwbGF5ZWQgKGFuZCB3cmFwcGVkKSBi dWcgY29tbWVudHMuCisjIFRoZSBjb2x1bW4gd2lkdGggKGNvbHMgYXR0cmlidXRlKSBvZiBIVE1M IHRleHRhcmVhcyBmb3IgaW5wdXR0aW5nIGNvbW1lbnRzLgogdXNlIGNvbnN0YW50IENPTU1FTlRf Q09MUyA9PiA4MDsKKyMgVGhlIGNvbHVtbiB3aWR0aCBhdCB3aGljaCB0byB3cmFwIGNvbW1lbnRz IHByaW9yIHRvIGRpc3BsYXkgLS0gdXNpbmcKKyMgUGVybCdzIFRleHQ6OldyYXA6OndyYXAoKS4g IE9ubHkgQnVnemlsbGEvVXRpbC5wbSdzIHdyYXBfY29tbWVudCgpIG1ldGhvZAorIyB1c2VzIHRo aXMgY29uc3RhbnQuCisjCisjIEVtcGlyaWNhbCB0ZXN0aW5nIHNob3dlZCB0aGF0ICRUZXh0OjpX cmFwOjpjb2x1bW5zIG11c3QgYmUgYSB2YWx1ZQorIyBiZXR3ZWVuIDIgYW5kIDMyNzY2LCBpbmNs dXNpdmUuICBXZSBjaG9vc2UgYSBsYXJnZSB2YWx1ZSB0byBwcmV2ZW50CisjIHdyYXAoKSBmcm9t IGluc2VydGluZyBhbnkgaGFyZCBsaW5lIGJyZWFrcyBhdCBhbGwuICBUaGlzIGxldHMgdXMgdXNl CisjICJ3aGl0ZS1zcGFjZTogcHJlLXdyYXAiIGluIHRoZSBDU1MgdG8gZG8gbGluZS13cmFwcGlu ZyBpbnN0ZWFkLiAgV2UKKyMgYXJiaXRyYXJpbHkgY2hvb3NlIDgwMDAsIHdoaWNoIGlzIGVub3Vn aCBmb3IgYSAxMDAtbGluZSBwYXJhZ3JhcGguCit1c2UgY29uc3RhbnQgQ09NTUVOVF9DT0xTX1dS QVAgPT4gODAwMDsKICMgVXNlZCBpbiBfY2hlY2tfY29tbWVudCgpLiBHaXZlcyB0aGUgbWF4IGxl bmd0aCBhbGxvd2VkIGZvciBhIGNvbW1lbnQuCiB1c2UgY29uc3RhbnQgTUFYX0NPTU1FTlRfTEVO R1RIID0+IDY1NTM1OwogCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9CdWd6aWxsYS9VdGlsLnBtIGIv QnVnc1NpdGUvQnVnemlsbGEvVXRpbC5wbQppbmRleCBkYmVhYWE1Li5hODcyZWIyIDEwMDY0NAot LS0gYS9CdWdzU2l0ZS9CdWd6aWxsYS9VdGlsLnBtCisrKyBiL0J1Z3NTaXRlL0J1Z3ppbGxhL1V0 aWwucG0KQEAgLTM1OCw4ICszNTgsOCBAQCBzdWIgd3JhcF9jb21tZW50IHsKICAgICBteSAkd3Jh cHBlZGNvbW1lbnQgPSAiIjsKIAogICAgICMgVXNlICdsb2NhbCcsIGFzIHJlY29tbWVuZGVkIGJ5 IFRleHQ6OldyYXAncyBwZXJsZG9jLgotICAgIGxvY2FsICRUZXh0OjpXcmFwOjpjb2x1bW5zID0g JGNvbHMgfHwgQ09NTUVOVF9DT0xTOwotICAgICMgTWFrZSB3b3JkcyB0aGF0IGFyZSBsb25nZXIg dGhhbiBDT01NRU5UX0NPTFMgbm90IHdyYXAuCisgICAgbG9jYWwgJFRleHQ6OldyYXA6OmNvbHVt bnMgPSAkY29scyB8fCBDT01NRU5UX0NPTFNfV1JBUDsKKyAgICAjIE1ha2Ugd29yZHMgdGhhdCBh cmUgbG9uZ2VyIHRoYW4gQ09NTUVOVF9DT0xTX1dSQVAgbm90IHdyYXAuCiAgICAgbG9jYWwgJFRl eHQ6OldyYXA6Omh1Z2UgICAgPSAnb3ZlcmZsb3cnOwogICAgICMgRG9uJ3QgbWVzcyB3aXRoIHRh YnMuCiAgICAgbG9jYWwgJFRleHQ6OldyYXA6OnVuZXhwYW5kID0gMDsKQEAgLTgzNyw3ICs4Mzcs NyBAQCBSZXR1cm5zIHRoZSBzdHJpbmcsIHdyYXBwZWQuCiA9aXRlbSBDPHdyYXBfY29tbWVudCgk Y29tbWVudCk+CiAKIFRha2VzIGEgYnVnIGNvbW1lbnQsIGFuZCB3cmFwcyBpdCB0byB0aGUgYXBw cm9wcmlhdGUgbGVuZ3RoLiBUaGUgbGVuZ3RoIGlzCi1jdXJyZW50bHkgc3BlY2lmaWVkIGluIEM8 QnVnemlsbGE6OkNvbnN0YW50czo6Q09NTUVOVF9DT0xTPi4gTGluZXMgYmVnaW5uaW5nCitjdXJy ZW50bHkgc3BlY2lmaWVkIGluIEM8QnVnemlsbGE6OkNvbnN0YW50czo6Q09NTUVOVF9DT0xTX1dS QVA+LiBMaW5lcyBiZWdpbm5pbmcKIHdpdGggIj4iIGFyZSBhc3N1bWVkIHRvIGJlIHF1b3Rlcywg YW5kIHRoZXkgd2lsbCBub3QgYmUgd3JhcHBlZC4KIAogVGhlIGludGVuZGVkIHVzZSBvZiB0aGlz IGZ1bmN0aW9uIGlzIHRvIHdyYXAgY29tbWVudHMgdGhhdCBhcmUgYWJvdXQgdG8gYmUKZGlmZiAt LWdpdCBhL0J1Z3NTaXRlL0NoYW5nZUxvZyBiL0J1Z3NTaXRlL0NoYW5nZUxvZwppbmRleCA1NTgx OTE3Li41NjRmOTI0IDEwMDY0NAotLS0gYS9CdWdzU2l0ZS9DaGFuZ2VMb2cKKysrIGIvQnVnc1Np dGUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTAtMDUtMDYgIENocmlzIEplcmRvbmVr ICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWxsb3cgbG9uZyBjb21tZW50IGxpbmVzIHRvIHdyYXAgdG8gdGhl IHdpbmRvdyB3aWR0aCBpbnN0ZWFkCisgICAgICAgIG9mIHRvIDgwIGNoYXJhY3RlcnMuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NzkyCisKKyAg ICAgICAgKiBCdWd6aWxsYS9Db25zdGFudHMucG06CisgICAgICAgICAgLSBJbnRyb2R1Y2VkIGEg bmV3IGNvbnN0YW50IENPTU1FTlRfQ09MU19XUkFQIHRvIHJlcGxhY2UgQ09NTUVOVF9DT0xTCisg ICAgICAgICAgICBpbnNpZGUgdGhlIHdyYXBfY29tbWVudCgpIHN1YnJvdXRpbmUuICBUaGUgbmV3 IGNvbnN0YW50IGVmZmVjdGl2ZWx5CisgICAgICAgICAgICBkaXNhYmxlcyB0ZXh0IHdyYXBwaW5n IGJ5IGluY3JlYXNpbmcgdGhlIHZhbHVlIHVzZWQgaW4gd3JhcF9jb21tZW50KCkKKyAgICAgICAg ICAgIGZyb20gODAgY2hhcmFjdGVycyB0byBhIHZlcnkgbGFyZ2UgdmFsdWUgKDgwMDApLgorICAg ICAgICAqIEJ1Z3ppbGxhL1V0aWwucG06CisgICAgICAgICAgLSBSZXBsYWNlZCBDT01NRU5UX0NP TFMgd2l0aCBDT01NRU5UX0NPTFNfV1JBUCBpbnNpZGUgd3JhcF9jb21tZW50KCkuCisgICAgICAg ICogc2tpbnMvY3VzdG9tL2dsb2JhbC5jc3M6CisgICAgICAgICguYnpfY29tbWVudF90ZXh0KToK KyAgICAgICAgICAtIEVsaW1pbmF0ZSB0aGUgd2lkdGggc3R5bGluZyBvbiBjb21tZW50cyB0byBh bGxvdyBsb25nIGxpbmVzCisgICAgICAgICAgICB0byB3cmFwIGF0IHRoZSB3aW5kb3cgd2lkdGgu CisgICAgICAgICguYnpfY29tbWVudF90ZXh0ID4gc3Bhbi5xdW90ZSk6CisgICAgICAgICAgLSBJ bmhlcml0IHRoZSAid2hpdGUtc3BhY2UiIHByb3BlcnR5LiAgVGhpcyBwcmV2ZW50cyBsb25nIHF1 b3RlZAorICAgICAgICAgICAgbGluZXMgaW4gY29tbWVudHMgZnJvbSBjYXVzaW5nIG5vbi1xdW90 ZWQgbGluZXMgdG8gZXh0ZW5kIGJleW9uZAorICAgICAgICAgICAgdGhlIHdpbmRvdyB3aWR0aC4K KwogMjAxMC0wNC0yMiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvc2tpbnMvY3Vz dG9tL2dsb2JhbC5jc3MgYi9CdWdzU2l0ZS9za2lucy9jdXN0b20vZ2xvYmFsLmNzcwppbmRleCA5 N2EwN2UwLi42MjMzMDhjIDEwMDY0NAotLS0gYS9CdWdzU2l0ZS9za2lucy9jdXN0b20vZ2xvYmFs LmNzcworKysgYi9CdWdzU2l0ZS9za2lucy9jdXN0b20vZ2xvYmFsLmNzcwpAQCAtMTI1LDYgKzEy NSwyMCBAQCBzcGFuLmJ6X2NvbW1lbnQgewogCXBhZGRpbmc6IDJweCAwIDJweCAwOwogfQogCisu YnpfY29tbWVudF90ZXh0IHsKKyAgICAvKiBEbyBub3Qgc3BlY2lmeSBhIGhhcmQgd2lkdGguICBP dGhlcndpc2UsIGNvbW1lbnQgbGluZXMgd2lsbCAicHJlLXdyYXAiCisgICAgICAgdG8gdGhlIHNw ZWNpZmllZCB3aWR0aCByYXRoZXIgdGhhbiB0byB0aGUgd2luZG93IHdpZHRoLiAqLworICAgIHdp ZHRoOiBhdXRvOworfQorCisuYnpfY29tbWVudF90ZXh0ID4gc3Bhbi5xdW90ZSB7CisgICAgLyog UHJldmVudCBzcGFuLnF1b3RlJ3MgIndoaXRlLXNwYWNlOiBwcmUiIGZyb20gc3R5bGluZyBxdW90 ZWQgbGluZXMKKyAgICAgICBpbnNpZGUgY29tbWVudHMuICBPdGhlcndpc2UsIGEgc2luZ2xlIHF1 b3RlZCBsaW5lIHRoYXQgZXh0ZW5kcworICAgICAgIGJleW9uZCB0aGUgd2luZG93IHdpZHRoIHdp bGwgY2F1c2UgYWxsIG5vbi1xdW90ZWQgbG9uZyBsaW5lcyB0bworICAgICAgIGV4dGVuZCBiZXlv bmQgdGhlIHdpbmRvdyB3aWR0aCBhcyB3ZWxsLiAqLworICAgIHdoaXRlLXNwYWNlOiBpbmhlcml0 OworfQorCiAjZm9vdGVyIGZvcm0gewogCWJvcmRlci10b3A6IDFweCBkb3R0ZWQgI2FhYTsKIAli b3JkZXItYm90dG9tOiAxcHggZG90dGVkICNhYWE7Cg==