47971 2010-10-20 00:18:38 -0700 css combinator "+" in combination with NAV tag is buggy 2011-06-27 09:55:56 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Major --- 1 lukasz.wiacek webkit-unassigned achicu martin.jansson mikelawther noel.gordon ojan phiw2 webkit.review.bot oldest_to_newest 296669 0 lukasz.wiacek 2010-10-20 00:18:38 -0700 when the white space between "+" and nav tag is removed on file compression selectors like "div+nav" stop working. while the uncompressed version "div + nav" works without problems. 296905 1 ap 2010-10-20 12:01:40 -0700 Do you have a test case that you could attach to the bug, or a link to an actual Web site that's affected by this problem? 297128 2 71360 phiw2 2010-10-20 16:42:30 -0700 Created attachment 71360 testcase (In reply to comment #1) > Do you have a test case that you could attach to the bug, or a link to an actual Web site that's affected by this problem? testcase: the nav element (blue text - 'a list of links') should also have a blue border. It does in Gecko 1.9.2 but not WebKit latest nightly and Safari 5. nav {display: block;} div + nav { color: blue; } div+nav {border: 1px solid;} 297134 3 phiw2 2010-10-20 16:47:19 -0700 This seems very specific to the '+' combinator and the html5 'nav' element. div~nav {} works fine div+footer {} works fine (and repeat for other elements) 370285 4 86296 noel.gordon 2011-03-20 22:50:18 -0700 Created attachment 86296 test-case-section-element 370286 5 86297 noel.gordon 2011-03-20 22:51:10 -0700 Created attachment 86297 test-case-nav-element.html 370287 6 noel.gordon 2011-03-20 22:55:03 -0700 (In reply to comment #3) > This seems very specific to the '+' combinator and the html5 'nav' element. Agree after testing webkit nightly A + nav {} OK A+nav {} FAIL 417955 7 achicu 2011-06-09 05:26:16 -0700 The problem is in tokenizer.flex. There's a rule called "nth" that matches "+n" nth [\+-]?{intnum}*n([\t\r\n ]*[\+-][\t\r\n ]*{intnum})? So the tokens for "#div+nav {}" are: IDSEL "div" nth "+n" IDENT "av" 418004 8 96584 achicu 2011-06-09 07:26:30 -0700 Created attachment 96584 Patch 418517 9 noel.gordon 2011-06-09 22:53:44 -0700 +ojan + mike.lawther since you two have recently modified the flex tokenizer. 418519 10 noel.gordon 2011-06-09 22:59:08 -0700 http://crbug.com/57981 419396 11 dominicc 2011-06-12 19:50:08 -0700 *** Bug 62437 has been marked as a duplicate of this bug. *** 424303 12 96584 mikelawther 2011-06-20 23:54:03 -0700 Comment on attachment 96584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96584&action=review Hi Alex - thanks for the patch. I'm not a reviewer, but I've done a shadow review of the test case (mostly just nits). The actual fix in the flex looks OK to me. > LayoutTests/fast/css/div_plus_nav_bug47971.html:5 > +<style type="text/css"> nit: no need for the type, it's assumed > LayoutTests/fast/css/div_plus_nav_bug47971.html:6 > +#one + nav { color: green; } Can you also put in a test for a case not involving the ID selector? eg "label+nav". > LayoutTests/fast/css/div_plus_nav_bug47971.html:7 > + #two+nav { color: green; } nit: extra space on the beginning of this line > LayoutTests/fast/css/div_plus_nav_bug47971.html:9 > +<script> nit: put this down in the <script> section below - no need for a separate one > LayoutTests/fast/css/div_plus_nav_bug47971.html:16 > +<div> Do you need this outer div? > LayoutTests/fast/css/div_plus_nav_bug47971.html:17 > + <div id="one">DIV1</div> Nit: "one" and "two" ids, and DIV1 and DIV2 text is not needed. It distracts a bit when reading the test and looking at the results. > LayoutTests/fast/css/div_plus_nav_bug47971.html:21 > +<div> ditto: is this div needed? > LayoutTests/fast/css/div_plus_nav_bug47971.html:26 > +<script type="text/javascript"> nit: no need for the type, it's assumed > LayoutTests/fast/css/div_plus_nav_bug47971.html:27 > +function ArrayContains(array, value, ci) You may not need this function - see below > LayoutTests/fast/css/div_plus_nav_bug47971.html:29 > + ci = ci == true ? true : false; Should this line be here? > LayoutTests/fast/css/div_plus_nav_bug47971.html:33 > + { No braces for single lines. > LayoutTests/fast/css/div_plus_nav_bug47971.html:52 > + if (ArrayContains(greenValues, val, false)) Can you lowercase val on line 51, and say here "if (greenValues.indexOf(val) != -1)" ? > LayoutTests/fast/css/div_plus_nav_bug47971.html:57 > + }catch(e){} I don't think you want to swallow exceptions in test code like this. > Source/WebCore/ChangeLog:10 > + like "#div+nav" as: "#div" "+n" "av". Is the id selector necessary? The bug only mentions "div+nav", but the id selector doesn't seem to be involved. 424533 13 96584 ojan 2011-06-21 10:32:30 -0700 Comment on attachment 96584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96584&action=review The code change looks good to me. Please address Mike's and my comments on the test then post a new patch for review. > LayoutTests/fast/css/div_plus_nav_bug47971.html:1 > +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Strict//EN"> These days we usually use the HTML5 doctype in tests. <!DOCTYPE HTML> > LayoutTests/fast/css/div_plus_nav_bug47971.html:4 > +<html> > +<head> > +<title>CSS Test: #div+nav</title> No need to include these elements. The more sparse the test, the easier it is to see what it's testing. >> LayoutTests/fast/css/div_plus_nav_bug47971.html:17 >> + <div id="one">DIV1</div> > > Nit: "one" and "two" ids, and DIV1 and DIV2 text is not needed. It distracts a bit when reading the test and looking at the results. If you're doing this just so that the div will be visible, you could give the div a width/height with CSS. > LayoutTests/fast/css/div_plus_nav_bug47971.html:44 > +function TestCase(element, resultElement) This isn't really a class, but more of a method. Other tests will typically call this "runTest". >> LayoutTests/fast/css/div_plus_nav_bug47971.html:52 >> + if (ArrayContains(greenValues, val, false)) > > Can you lowercase val on line 51, and say here "if (greenValues.indexOf(val) != -1)" ? More importantly, why do you need to compare to a list of values? Won't the results of getComputedStyle be the same string for all of these cases? 425072 14 98129 achicu 2011-06-22 00:47:00 -0700 Created attachment 98129 Patch Thank you for reviewing the patch. I've simplified the test and addressed all the issues. - You're right about #div+nav. It doesn't matter what's before "+nav" in the selector. Just to make sure, I've also added another test for label+nav. - I've kept "one" and "two" IDs, because I need them in the selectors. - I kept only two values in greenValues array. It looks like most of the latest browsers return "rgb(0, 128, 0)" while Opera returns "#008000". It is easier to compare the results with other browsers this way. 425441 15 98129 ojan 2011-06-22 11:56:24 -0700 Comment on attachment 98129 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98129&action=review Patch looks good. Please consider addressing my two comments before committing (or if you're not a committer, you can post a new patch and I can cq+ it for you). > LayoutTests/fast/css/div_plus_nav_bug47971.html:6 > +#one + nav { color: green; } > +#two+nav { color: green; } > +label+nav { color: green; } For thoroughness sake, maybe add the following cases as well: #foo +nav #bar+ nav > LayoutTests/fast/css/div_plus_nav_bug47971.html:42 > + } catch(e) { > + document.writeln("Fail: " + element + ": Exception \"" + e + "\".<br />"); > + } When would you ever hit this exception? Do you need the try/catch at all? It's fine for the test to throw an error if there is a JS error. It's worth having less extra cruft in the test. 425999 16 98319 achicu 2011-06-23 00:47:25 -0700 Created attachment 98319 Patch Added #foo +nav and #bar+ nav selectors in the testcase. Removed try/catch. 428017 17 98319 webkit.review.bot 2011-06-27 09:55:50 -0700 Comment on attachment 98319 Patch Clearing flags on attachment: 98319 Committed r89826: <http://trac.webkit.org/changeset/89826> 428018 18 webkit.review.bot 2011-06-27 09:55:56 -0700 All reviewed patches have been landed. Closing bug. 71360 2010-10-20 16:42:30 -0700 2010-10-20 16:42:30 -0700 testcase tx_wk-b47971.html text/html 674 phiw2 PCFkb2N0eXBlIGh0bWw+CjxodG1sIGxhbmc9ImVuIj4KPGhlYWQ+CjxtZXRhIGNoYXJzZXQ9InV0 Zi04Ij4KPHRpdGxlPnRlc3Q6IHdlYmtpdCBidWcgNDc5NzE8L3RpdGxlPgo8c3R5bGUgdHlwZT0i dGV4dC9jc3MiPgpodG1sIHsKCWNvbG9yOiByZ2IoMTAsMTAsMTApOwoJYmFja2dyb3VuZDogcmdi KDI1MCwyNTAsMjUwKTsKCWZvbnQ6IDMwMCAxMDAlLzEuNSAnSGVsdmV0aWNhIE5ldWUnLCBzYW5z LXNlcmlmOwoJbWFyZ2luOiAwOwoJfQpuYXYge2Rpc3BsYXk6IGJsb2NrO30KZGl2ICsgbmF2IHsg Y29sb3I6IGJsdWU7IH0KZGl2K25hdiB7Ym9yZGVyOiAxcHggc29saWQ7fQo8L3N0eWxlPgoKPC9o ZWFkPgoKPGJvZHk+CjxkaXY+CjxoMz5BIGhlYWRsaW5lPC9oMz4KPHA+TG9yZW0gaXBzdW0gZG9s b3Igc2l0IGFtZXQsIGNvbnNlY3RldHVlciBhZGlwaXNjaW5nIGVsaXQuIE51bGxhIGVnZXN0YXMu IEludGVnZXIgdWxsYW1jb3JwZXIuIE51bmMgcG9ydGEgY29uc2VjdGV0dWVyIHNlbS4gUXVpc3F1 ZSB2YXJpdXMgc2FnaXR0aXMgbGliZXJvLiBFdGlhbSBpcHN1bSBhbnRlLCBpbXBlcmRpZXQgYWMs IHVsbGFtY29ycGVyIGluLCB0ZW1wdXMgc2l0IGFtZXQsIHJpc3VzLjwvcD4KCjwvZGl2PgoKPG5h dj48cD5hIGxpc3Qgb2YgbGlua3M8L3A+PC9uYXY+Cgo8L2JvZHk+CjwvaHRtbD4= 86296 2011-03-20 22:50:18 -0700 2011-03-20 22:50:18 -0700 test-case-section-element test-case-section-element.html text/html 1078 noel.gordon PHN0eWxlPg0KIGRpdiB7IHdpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsgYm9yZGVyOiBzb2xp ZCBibGFjazsgcGFkZGluZzogMCAxMHB4OyB9DQogc2VjdGlvbiB7IHdpZHRoOiA1MHB4OyBoZWln aHQ6IDUwcHg7IG1hcmdpbjogNXB4OyBkaXNwbGF5OiBibG9jazsgfQ0KDQogLyogdGVzdDE6IEEg KyBCIHt9IHNlbGVjdG9yIHdoZXJlIEEgaXMgYW4gI2lkIHNlbGVjdG9yLCBCIGlzIHNlY3Rpb24g ZWxlbWVudCAqLw0KICNvbmUgKyBzZWN0aW9uIHsgYmFja2dyb3VuZDogeWVsbG93OyB9DQogI29u ZTpob3ZlciArIHNlY3Rpb24geyBiYWNrZ3JvdW5kOiByZWQ7IH0NCg0KIC8qIHRlc3QyOiBBK0Ig e30gc2VsZWN0b3Igd2hlcmUgQSBpcyBhbiAjaWQgc2VsZWN0b3IsIEIgaXMgYSBzZWN0aW9uIGVs ZW1lbnQgKi8NCiAjdHdvK3NlY3Rpb24geyBiYWNrZ3JvdW5kOiB5ZWxsb3c7IH0NCiAjdHdvOmhv dmVyK3NlY3Rpb24geyBiYWNrZ3JvdW5kOiByZWQ7IH0NCjwvc3R5bGU+DQo8Ym9keT4NCjxoMz4g I2lkICsgc2VjdGlvbiB7fSB0ZXN0OjwvaDM+DQp0YXJnZXQtMSBzaG91bGQgaGF2ZSBhIHllbGxv dyBiYWNrZ3JvdW5kIGJ5IGRlZmF1bHQuIElmIHlvdSBob3ZlciBvdmVyPGJyPg0KdGhlIGJveCBi ZWxvdywgdGFyZ2V0LTEgc2hvdWxkIGhhdmUgYSByZWQgYmFja2dyb3VuZC48cD4NCiA8ZGl2IGlk PSJvbmUiIGNsYXNzPSJib3giPmhvdmVyIGhlcmU8L2Rpdj4NCiA8c2VjdGlvbj50YXJnZXQtMTwv c2VjdGlvbj4NCiA8c2VjdGlvbj50YXJnZXQtMjwvc2VjdGlvbj4NCjxicj4NCg0KPGgzPiNpZCtz ZWN0aW9uIHt9IHRlc3Q6PC9oMz4NCnRhcmdldC00IHNob3VsZCBoYXZlIGEgeWVsbG93IGJhY2tn cm91bmQgYnkgZGVmYXVsdC4gSWYgeW91IGhvdmVyIG92ZXI8YnI+DQp0aGUgYm94IGJlbG93LCB0 YXJnZXQtMSBzaG91bGQgaGF2ZSBhIHJlZCBiYWNrZ3JvdW5kLg0KPHA+DQogPGRpdiBpZD0idHdv IiBjbGFzcz0iYm94Ij5ob3ZlciBoZXJlPC9kaXY+DQogPHNlY3Rpb24+dGFyZ2V0LTE8L3NlY3Rp b24+DQogPHNlY3Rpb24+dGFyZ2V0LTI8L3NlY3Rpb24+DQo8YnI+DQoNCjwvYm9keT4NCg== 86297 2011-03-20 22:51:10 -0700 2011-03-20 22:51:10 -0700 test-case-nav-element.html test-case-nav-element.html text/html 1009 noel.gordon PHN0eWxlPg0KIGRpdiB7IHdpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsgYm9yZGVyOiBzb2xp ZCBibGFjazsgcGFkZGluZzogMCAxMHB4OyB9DQogbmF2IHsgd2lkdGg6IDUwcHg7IGhlaWdodDog NTBweDsgbWFyZ2luOiA1cHg7IGRpc3BsYXkgYmxvY2s7IH0NCg0KIC8qIHRlc3QxOiBBICsgQiB7 fSBzZWxlY3RvciB3aGVyZSBBIGlzIGFuICNpZCBzZWxlY3RvciwgQiBpcyBuYXYgZWxlbWVudCAq Lw0KICNvbmUgKyBuYXYgeyBiYWNrZ3JvdW5kOiB5ZWxsb3c7IH0NCiAjb25lOmhvdmVyICsgbmF2 IHsgYmFja2dyb3VuZDogcmVkOyB9DQoNCiAvKiB0ZXN0MjogQStCIHt9IHNlbGVjdG9yIHdoZXJl IEEgaXMgYW4gI2lkIHNlbGVjdG9yLCBCIGlzIGEgbmF2IGVsZW1lbnQgKi8NCiAjdHdvK25hdiB7 IGJhY2tncm91bmQ6IHllbGxvdzsgfQ0KICN0d286aG92ZXIrbmF2IHsgYmFja2dyb3VuZDogcmVk OyB9DQo8L3N0eWxlPg0KPGJvZHk+DQo8aDM+ICNpZCArIG5hdiB7fSB0ZXN0OjwvaDM+DQp0YXJn ZXQtMSBzaG91bGQgaGF2ZSBhIHllbGxvdyBiYWNrZ3JvdW5kIGJ5IGRlZmF1bHQuIElmIHlvdSBo b3ZlciBvdmVyPGJyPg0KdGhlIGJveCBiZWxvdywgdGFyZ2V0LTEgc2hvdWxkIGhhdmUgYSByZWQg YmFja2dyb3VuZC48cD4NCiA8ZGl2IGlkPSJvbmUiIGNsYXNzPSJib3giPmhvdmVyIGhlcmU8L2Rp dj4NCiA8bmF2PnRhcmdldC0xPC9uYXY+DQogPG5hdj50YXJnZXQtMjwvbmF2Pg0KPGJyPg0KDQo8 aDM+I2lkK25hdiB7fSB0ZXN0OjwvaDM+DQp0YXJnZXQtNCBzaG91bGQgaGF2ZSBhIHllbGxvdyBi YWNrZ3JvdW5kIGJ5IGRlZmF1bHQuIElmIHlvdSBob3ZlciBvdmVyPGJyPg0KdGhlIGJveCBiZWxv dywgdGFyZ2V0LTIgc2hvdWxkIGhhdmUgYSByZWQgYmFja2dyb3VuZC4NCjxwPg0KIDxkaXYgaWQ9 InR3byIgY2xhc3M9ImJveCI+aG92ZXIgaGVyZTwvZGl2Pg0KIDxuYXY+dGFyZ2V0LTE8L25hdj4N CiA8bmF2PnRhcmdldC0yPC9uYXY+DQo8YnI+DQoNCjwvYm9keT4NCg== 96584 2011-06-09 07:26:30 -0700 2011-06-22 00:47:00 -0700 Patch bug47971.patch text/plain 5600 achicu ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ZTA5NDIwLi42ZjEwNmZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MDkgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNzcyBjb21iaW5hdG9yICIrIiBp biBjb21iaW5hdGlvbiB3aXRoIE5BViB0YWcgaXMgYnVnZ3kKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTcxCisKKyAgICAgICAgKiBmYXN0L2Nzcy9k aXZfcGx1c19uYXZfYnVnNDc5NzEtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2Nzcy9kaXZfcGx1c19uYXZfYnVnNDc5NzEuaHRtbDogQWRkZWQuCisKIDIwMTEtMDYtMDkgIEtl bnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gTGVv cGFyZCByZWJhc2VsaW5lIGZvciB0aHVtYnNsaWRlci1uby1wYXJlbnQtc2xpZGVyLmh0bWwuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9kaXZfcGx1c19uYXZfYnVnNDc5NzEtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yNWU0Mjc0Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3 OTcxLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDggQEAKK1RoZSB0ZXN0IHBhc3NlcyBpZiBhbGwg TkFWcyBhcmUgZ3JlZW4uCisKK0RJVjEKK05BVjEKK1Bhc3MKK0RJVjIKK05BVjIKK1Bhc3MKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2Rpdl9wbHVzX25hdl9idWc0Nzk3MS5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uY2EwZGM0OQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvY3NzL2Rpdl9wbHVzX25hdl9idWc0Nzk3MS5odG1sCkBAIC0wLDAg KzEsNjQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAgU3Ry aWN0Ly9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPkNTUyBUZXN0OiAjZGl2K25hdjwvdGl0 bGU+Cis8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgorI29uZSArIG5hdiB7IGNvbG9yOiBncmVlbjsg fQorICN0d28rbmF2IHsgY29sb3I6IGdyZWVuOyB9Cis8L3N0eWxlPgorPHNjcmlwdD4KK2lmICh3 aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl ci5kdW1wQXNUZXh0KCkKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGUgdGVzdCBw YXNzZXMgaWYgYWxsIE5BVnMgYXJlIGdyZWVuLjwvcD4KKzxkaXY+CisgICAgPGRpdiBpZD0ib25l Ij5ESVYxPC9kaXY+CisgICAgPG5hdiBpZD0ibmF2T25lIj5OQVYxPC9uYXY+CisgICAgPC9kaXY+ Cis8ZGl2IGlkPSJyZXN1bHRzT25lIiBzdHlsZT0iY29sb3I6IGJsdWUiPlJ1bm5pbmcgMTwvZGl2 PgorPGRpdj4KKyAgICA8ZGl2IGlkPSJ0d28iPkRJVjI8L2Rpdj4KKyAgICA8bmF2IGlkPSJuYXZU d28iPk5BVjI8L25hdj4KKzwvZGl2PgorPGRpdiBpZD0icmVzdWx0c1R3byIgc3R5bGU9ImNvbG9y OiBibHVlIj5SdW5uaW5nIDI8L2Rpdj4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4K K2Z1bmN0aW9uIEFycmF5Q29udGFpbnMoYXJyYXksIHZhbHVlLCBjaSkKK3sKKyAgY2kgPSBjaSA9 PSB0cnVlID8gdHJ1ZSA6IGZhbHNlOworICBmb3IgKHZhciBpID0gMDsgaSA8IGFycmF5Lmxlbmd0 aDsgaSsrKQorICB7CisgICAgaWYgKGNpICYmIGFycmF5W2ldLnRvTG93ZXJDYXNlKCkgPT0gdmFs dWUudG9Mb3dlckNhc2UoKSkKKyAgICB7CisgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAg ZWxzZSBpZiAoYXJyYXlbaV0gPT0gdmFsdWUpCisgICAgeworICAgICAgcmV0dXJuIHRydWU7Cisg ICAgfQorICB9CisgIHJldHVybiBmYWxzZTsKK30KKworZnVuY3Rpb24gVGVzdENhc2UoZWxlbWVu dCwgcmVzdWx0RWxlbWVudCkKK3sKKyAgdHJ5CisgIHsKKyAgICB2YXIgZ3JlZW5WYWx1ZXMgPSBu ZXcgQXJyYXkoImdyZWVuIiwgIiMwMDgwMDAiLCAicmdiKDAsIDEyOCwgMCkiKTsKKworICAgIHZh ciBlbGVtID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoZWxlbWVudCk7CisgICAgdmFyIHZhbCA9 IGdldENvbXB1dGVkU3R5bGUoZWxlbSwgbnVsbCkuZ2V0UHJvcGVydHlWYWx1ZSgiY29sb3IiKTsK KyAgICBpZiAoQXJyYXlDb250YWlucyhncmVlblZhbHVlcywgdmFsLCBmYWxzZSkpCisgICAgewor ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQocmVzdWx0RWxlbWVudCkuaW5uZXJIVE1MID0g IlBhc3MiOworICAgICAgcmV0dXJuOworICAgIH0KKyAgfWNhdGNoKGUpe30KKyAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQocmVzdWx0RWxlbWVudCkuaW5uZXJIVE1MID0gIkZhaWwiOworfQorVGVz dENhc2UoIm5hdk9uZSIsICJyZXN1bHRzT25lIik7CitUZXN0Q2FzZSgibmF2VHdvIiwgInJlc3Vs dHNUd28iKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5k IG9mIGZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMmQ5YmU2Li5lZjM1OGZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTEtMDYtMDkgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRv YmUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGNzcyBjb21iaW5hdG9yICIrIiBpbiBjb21iaW5hdGlvbiB3aXRoIE5BViB0YWcgaXMgYnVnZ3kK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTcxCisK KyAgICAgICAgQWRkZWQgYSBuZXcgc3RhdGUgaW4gY3NzL3Rva2VuaXplci5mbGV4IGZvciB0aGUg Im50aCIgcnVsZS4gVGhlIHN0YXRlIGJlZ2lucworICAgICAgICBhdCBudGgtKiggZnVuY3Rpb25z IGFuZCBlbmRzIGF0IHRoZSBmaXJzdCAiKSIuIEl0IGF2b2lkcyBwYXJzaW5nIHNlbGVjdG9ycyAK KyAgICAgICAgbGlrZSAiI2RpdituYXYiIGFzOiAiI2RpdiIgIituIiAiYXYiLgorCisgICAgICAg IFRlc3Q6IGZhc3QvY3NzL2Rpdl9wbHVzX25hdl9idWc0Nzk3MS5odG1sCisKKyAgICAgICAgKiBj c3MvbWFrZXRva2VuaXplcjoKKyAgICAgICAgKiBjc3MvdG9rZW5pemVyLmZsZXg6CisKIDIwMTEt MDYtMDkgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtldG9r ZW5pemVyIGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2V0b2tlbml6ZXIKaW5kZXggOTBkNWZjYi4u ZDJhNzg2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL21ha2V0b2tlbml6ZXIKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2V0b2tlbml6ZXIKQEAgLTQ5LDYgKzQ5LDcgQEAgcHJp bnQ8PEVORAogI2RlZmluZSBJTklUSUFMIDAKICNkZWZpbmUgbWVkaWFxdWVyeSAxCiAjZGVmaW5l IGZvcmtleXdvcmQgMgorI2RlZmluZSBudGhjaGlsZCAzCiAKIC8qIEM5OSBzeXN0ZW1zIGhhdmUg PGludHR5cGVzLmg+LiBOb24tQzk5IHN5c3RlbXMgbWF5IG9yIG1heSBub3QuICovCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy90b2tlbml6ZXIuZmxleCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy90b2tlbml6ZXIuZmxleAppbmRleCAzMjg1ZDJmLi4xZTRkMTcxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvdG9rZW5pemVyLmZsZXgKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L3Rva2VuaXplci5mbGV4CkBAIC00LDYgKzQsNyBAQAogJW9wdGlvbiBzdGFjawogJXMgbWVkaWFx dWVyeQogJXMgZm9ya2V5d29yZAorJXMgbnRoY2hpbGQKIAogaCAgICAgICAgICAgICAgIFswLTlh LWZBLUZdCiBub25hc2NpaSAgICAgICAgW1wyMDAtXDM3N10KQEAgLTIzLDYgKzI0LDcgQEAgdyAg ICAgICAgICAgICAgIFsgXHRcclxuXGZdKgogbmwgICAgICAgICAgICAgIFxufFxyXG58XHJ8XGYK IHJhbmdlICAgICAgICAgICBcP3sxLDZ9fHtofShcP3swLDV9fHtofShcP3swLDR9fHtofShcP3sw LDN9fHtofShcP3swLDJ9fHtofShcPz98e2h9KSkpKSkKIG50aCAgICAgICAgICAgICBbXCstXT97 aW50bnVtfSpuKFtcdFxyXG4gXSpbXCstXVtcdFxyXG4gXSp7aW50bnVtfSk/CitudGhmdW5jICAg ICAgICAgIm50aC0iKCJjaGlsZCJ8Im9mLXR5cGUifCJsYXN0LWNoaWxkInwibGFzdC1vZi10eXBl IikKIAogJSUKIApAQCAtNDMsNyArNDUsOCBAQCBudGggICAgICAgICAgICAgW1wrLV0/e2ludG51 bX0qbihbXHRcclxuIF0qW1wrLV1bXHRcclxuIF0qe2ludG51bX0pPwogCiB7c3RyaW5nfSAgICAg ICAgICAgICAgICB7eXlUb2sgPSBTVFJJTkc7IHJldHVybiB5eVRvazt9CiB7aWRlbnR9ICAgICAg ICAgICAgICAgICB7eXlUb2sgPSBJREVOVDsgcmV0dXJuIHl5VG9rO30KLXtudGh9ICAgICAgICAg ICAgICAgICAgIHt5eVRvayA9IE5USDsgcmV0dXJuIHl5VG9rO30KKzxudGhjaGlsZD57bnRofSAg ICAgICAgIHt5eVRvayA9IE5USDsgcmV0dXJuIHl5VG9rO30KKzxudGhjaGlsZD4iKSIgICAgICAg ICAgIHtCRUdJTihJTklUSUFMKTsgeXlUb2sgPSAqeXl0ZXh0OyByZXR1cm4geXlUb2s7fQogCiAi IyJ7aH0rICAgICAgICAgICAgICAgICB7eXlUb2sgPSBIRVg7IHJldHVybiB5eVRvazt9CiAiIyJ7 aWRlbnR9ICAgICAgICAgICAgICB7eXlUb2sgPSBJRFNFTDsgcmV0dXJuIHl5VG9rO30KQEAgLTEx Myw2ICsxMTYsNyBAQCBudGggICAgICAgICAgICAgW1wrLV0/e2ludG51bX0qbihbXHRcclxuIF0q W1wrLV1bXHRcclxuIF0qe2ludG51bX0pPwogIi13ZWJraXQtY2FsYygiICAgICAgICAge3l5VG9r ID0gQ0FMQ0ZVTkNUSU9OOyByZXR1cm4geXlUb2s7fQogIi13ZWJraXQtbWluKCIgICAgICAgICAg e3l5VG9rID0gTUlORlVOQ1RJT047IHJldHVybiB5eVRvazt9CiAiLXdlYmtpdC1tYXgoIiAgICAg ICAgICB7eXlUb2sgPSBNQVhGVU5DVElPTjsgcmV0dXJuIHl5VG9rO30KK3tudGhmdW5jfSIoIiAg ICAgICAgICAgIHtCRUdJTihudGhjaGlsZCk7IHl5VG9rID0gRlVOQ1RJT047IHJldHVybiB5eVRv azt9CiB7aWRlbnR9IigiICAgICAgICAgICAgICB7eXlUb2sgPSBGVU5DVElPTjsgcmV0dXJuIHl5 VG9rO30KIAogVVwre3JhbmdlfSAgICAgICAgICAgICAge3l5VG9rID0gVU5JQ09ERVJBTkdFOyBy ZXR1cm4geXlUb2s7fQo= 98129 2011-06-22 00:47:00 -0700 2011-06-23 00:47:25 -0700 Patch bug47971_1.patch text/plain 5237 achicu ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDgyYzhkLi4wODQ5MDBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MjEgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNzcyBjb21iaW5hdG9yICIrIiBp biBjb21iaW5hdGlvbiB3aXRoIE5BViB0YWcgaXMgYnVnZ3kKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTcxCisKKyAgICAgICAgKiBmYXN0L2Nzcy9k aXZfcGx1c19uYXZfYnVnNDc5NzEtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2Nzcy9kaXZfcGx1c19uYXZfYnVnNDc5NzEuaHRtbDogQWRkZWQuCisKIDIwMTEtMDYtMjEgIEtl bnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtXaW5dW01hY10gQ29y cmVjdCBhbiBhY2NpZGVudGFsIGNoYW5nZSBpbiByODk0MTAuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2Nzcy9kaXZfcGx1c19uYXZfYnVnNDc5NzEtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YjE5NzdjCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDkgQEAKK1Rlc3RpbmcgbGFiZWwrbmF2IHNlbGVjdG9yLiBUaGUgdGVzdCBwYXNz ZXMgaWYgYWxsIE5BVnMgYXJlIGdyZWVuLgorCitOQVYxCitOQVYyCitOQVYzCitQYXNzOiBuYXYx LgorUGFzczogbmF2Mi4KK1Bhc3M6IG5hdjMuCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY3NzL2Rpdl9wbHVzX25hdl9idWc0Nzk3MS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv ZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uZTk3YzBiZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2Rp dl9wbHVzX25hdl9idWc0Nzk3MS5odG1sCkBAIC0wLDAgKzEsNDggQEAKKzwhRE9DVFlQRSBIVE1M PgorCis8c3R5bGU+Cisjb25lICsgbmF2IHsgY29sb3I6IGdyZWVuOyB9CisjdHdvK25hdiB7IGNv bG9yOiBncmVlbjsgfQorbGFiZWwrbmF2IHsgY29sb3I6IGdyZWVuOyB9Cis8L3N0eWxlPgorCis8 cD5UZXN0aW5nIGxhYmVsK25hdiBzZWxlY3Rvci4gVGhlIHRlc3QgcGFzc2VzIGlmIGFsbCBOQVZz IGFyZSBncmVlbi48L3A+CisKKzxkaXYgaWQ9Im9uZSI+PC9kaXY+Cis8bmF2IGlkPSJuYXYxIj5O QVYxPC9uYXY+CisKKzxkaXYgaWQ9InR3byI+PC9kaXY+Cis8bmF2IGlkPSJuYXYyIj5OQVYyPC9u YXY+CisKKzxsYWJlbD48L2xhYmVsPgorPG5hdiBpZD0ibmF2MyI+TkFWMzwvbmF2PgorCis8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9s bGVyKQorICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCitmdW5j dGlvbiBydW5UZXN0KGVsZW1lbnQpCit7CisgICAgdHJ5IHsKKyAgICAgICAgdmFyIGdyZWVuVmFs dWVzID0gWworICAgICAgICAgICAgInJnYigwLCAxMjgsIDApIiwgLy8gV2ViS2l0LCBGaXJlZm94 IDQsIElFOQorICAgICAgICAgICAgIiMwMDgwMDAiIC8vIE9wZXJhIDExLjExCisgICAgICAgIF07 CisKKyAgICAgICAgdmFyIGVsZW0gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChlbGVtZW50KTsK KyAgICAgICAgdmFyIHZhbCA9IGdldENvbXB1dGVkU3R5bGUoZWxlbSwgbnVsbCkuZ2V0UHJvcGVy dHlWYWx1ZSgiY29sb3IiKTsKKyAgICAgICAgCisgICAgICAgIGlmIChncmVlblZhbHVlcy5pbmRl eE9mKHZhbC50b0xvd2VyQ2FzZSgpKSAhPSAtMSkKKyAgICAgICAgICAgZG9jdW1lbnQud3JpdGVs bigiUGFzczogIiArIGVsZW1lbnQgKyAiLjxiciAvPiIpOworICAgICAgICBlbHNlCisgICAgICAg ICAgIGRvY3VtZW50LndyaXRlbG4oIkZhaWw6ICIgKyBlbGVtZW50ICsgIiBhY3R1YWwgY29sb3Ig aXMgXCIiICsgdmFsICsgIlwiLjxiciAvPiIpOworCisgICAgfSBjYXRjaChlKSB7CisgICAgICAg IGRvY3VtZW50LndyaXRlbG4oIkZhaWw6ICIgKyBlbGVtZW50ICsgIjogRXhjZXB0aW9uIFwiIiAr IGUgKyAiXCIuPGJyIC8+Iik7CisgICAgfQorfQorCitydW5UZXN0KCJuYXYxIik7CitydW5UZXN0 KCJuYXYyIik7CitydW5UZXN0KCJuYXYzIik7Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NmJl MmM3Li45MjA1OWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMjEgIEFs ZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNzcyBjb21iaW5hdG9yICIrIiBpbiBjb21i aW5hdGlvbiB3aXRoIE5BViB0YWcgaXMgYnVnZ3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTcxCisKKyAgICAgICAgQWRkZWQgYSBuZXcgc3RhdGUg aW4gY3NzL3Rva2VuaXplci5mbGV4IGZvciB0aGUgIm50aCIgcnVsZS4gVGhlIHN0YXRlIGJlZ2lu cworICAgICAgICBhdCBudGgtKiggZnVuY3Rpb25zIGFuZCBlbmRzIGF0IHRoZSBmaXJzdCAiKSIu IEl0IGF2b2lkcyBwYXJzaW5nIHNlbGVjdG9ycyAKKyAgICAgICAgbGlrZSAiI2RpdituYXYiIGFz OiAiI2RpdiIgIituIiAiYXYiLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3NzL2Rpdl9wbHVzX25h dl9idWc0Nzk3MS5odG1sCisKKyAgICAgICAgKiBjc3MvbWFrZXRva2VuaXplcjoKKyAgICAgICAg KiBjc3MvdG9rZW5pemVyLmZsZXg6CisKIDIwMTEtMDYtMjEgIEtlbnQgVGFtdXJhICA8dGtlbnRA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtldG9rZW5pemVyIGIvU291cmNlL1dlYkNv cmUvY3NzL21ha2V0b2tlbml6ZXIKaW5kZXggOTBkNWZjYi4uZDJhNzg2ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL21ha2V0b2tlbml6ZXIKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L21ha2V0b2tlbml6ZXIKQEAgLTQ5LDYgKzQ5LDcgQEAgcHJpbnQ8PEVORAogI2RlZmluZSBJTklU SUFMIDAKICNkZWZpbmUgbWVkaWFxdWVyeSAxCiAjZGVmaW5lIGZvcmtleXdvcmQgMgorI2RlZmlu ZSBudGhjaGlsZCAzCiAKIC8qIEM5OSBzeXN0ZW1zIGhhdmUgPGludHR5cGVzLmg+LiBOb24tQzk5 IHN5c3RlbXMgbWF5IG9yIG1heSBub3QuICovCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy90b2tlbml6ZXIuZmxleCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy90b2tlbml6ZXIuZmxleApp bmRleCAzMjg1ZDJmLi4xZTRkMTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvdG9r ZW5pemVyLmZsZXgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3Rva2VuaXplci5mbGV4CkBAIC00 LDYgKzQsNyBAQAogJW9wdGlvbiBzdGFjawogJXMgbWVkaWFxdWVyeQogJXMgZm9ya2V5d29yZAor JXMgbnRoY2hpbGQKIAogaCAgICAgICAgICAgICAgIFswLTlhLWZBLUZdCiBub25hc2NpaSAgICAg ICAgW1wyMDAtXDM3N10KQEAgLTIzLDYgKzI0LDcgQEAgdyAgICAgICAgICAgICAgIFsgXHRcclxu XGZdKgogbmwgICAgICAgICAgICAgIFxufFxyXG58XHJ8XGYKIHJhbmdlICAgICAgICAgICBcP3sx LDZ9fHtofShcP3swLDV9fHtofShcP3swLDR9fHtofShcP3swLDN9fHtofShcP3swLDJ9fHtofShc Pz98e2h9KSkpKSkKIG50aCAgICAgICAgICAgICBbXCstXT97aW50bnVtfSpuKFtcdFxyXG4gXSpb XCstXVtcdFxyXG4gXSp7aW50bnVtfSk/CitudGhmdW5jICAgICAgICAgIm50aC0iKCJjaGlsZCJ8 Im9mLXR5cGUifCJsYXN0LWNoaWxkInwibGFzdC1vZi10eXBlIikKIAogJSUKIApAQCAtNDMsNyAr NDUsOCBAQCBudGggICAgICAgICAgICAgW1wrLV0/e2ludG51bX0qbihbXHRcclxuIF0qW1wrLV1b XHRcclxuIF0qe2ludG51bX0pPwogCiB7c3RyaW5nfSAgICAgICAgICAgICAgICB7eXlUb2sgPSBT VFJJTkc7IHJldHVybiB5eVRvazt9CiB7aWRlbnR9ICAgICAgICAgICAgICAgICB7eXlUb2sgPSBJ REVOVDsgcmV0dXJuIHl5VG9rO30KLXtudGh9ICAgICAgICAgICAgICAgICAgIHt5eVRvayA9IE5U SDsgcmV0dXJuIHl5VG9rO30KKzxudGhjaGlsZD57bnRofSAgICAgICAgIHt5eVRvayA9IE5USDsg cmV0dXJuIHl5VG9rO30KKzxudGhjaGlsZD4iKSIgICAgICAgICAgIHtCRUdJTihJTklUSUFMKTsg eXlUb2sgPSAqeXl0ZXh0OyByZXR1cm4geXlUb2s7fQogCiAiIyJ7aH0rICAgICAgICAgICAgICAg ICB7eXlUb2sgPSBIRVg7IHJldHVybiB5eVRvazt9CiAiIyJ7aWRlbnR9ICAgICAgICAgICAgICB7 eXlUb2sgPSBJRFNFTDsgcmV0dXJuIHl5VG9rO30KQEAgLTExMyw2ICsxMTYsNyBAQCBudGggICAg ICAgICAgICAgW1wrLV0/e2ludG51bX0qbihbXHRcclxuIF0qW1wrLV1bXHRcclxuIF0qe2ludG51 bX0pPwogIi13ZWJraXQtY2FsYygiICAgICAgICAge3l5VG9rID0gQ0FMQ0ZVTkNUSU9OOyByZXR1 cm4geXlUb2s7fQogIi13ZWJraXQtbWluKCIgICAgICAgICAge3l5VG9rID0gTUlORlVOQ1RJT047 IHJldHVybiB5eVRvazt9CiAiLXdlYmtpdC1tYXgoIiAgICAgICAgICB7eXlUb2sgPSBNQVhGVU5D VElPTjsgcmV0dXJuIHl5VG9rO30KK3tudGhmdW5jfSIoIiAgICAgICAgICAgIHtCRUdJTihudGhj aGlsZCk7IHl5VG9rID0gRlVOQ1RJT047IHJldHVybiB5eVRvazt9CiB7aWRlbnR9IigiICAgICAg ICAgICAgICB7eXlUb2sgPSBGVU5DVElPTjsgcmV0dXJuIHl5VG9rO30KIAogVVwre3JhbmdlfSAg ICAgICAgICAgICAge3l5VG9rID0gVU5JQ09ERVJBTkdFOyByZXR1cm4geXlUb2s7fQo= 98319 2011-06-23 00:47:25 -0700 2011-06-27 09:55:50 -0700 Patch bug47971_2.patch text/plain 5272 achicu ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3NDAxYzE2Li4xZGMyMjE2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MjIgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNzcyBjb21iaW5hdG9yICIrIiBp biBjb21iaW5hdGlvbiB3aXRoIE5BViB0YWcgaXMgYnVnZ3kKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTcxCisKKyAgICAgICAgKiBmYXN0L2Nzcy9k aXZfcGx1c19uYXZfYnVnNDc5NzEtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2Nzcy9kaXZfcGx1c19uYXZfYnVnNDc5NzEuaHRtbDogQWRkZWQuCisKIDIwMTEtMDYtMjIgIERp cmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBSb2Ig QnVpcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2Rpdl9wbHVzX25hdl9idWc0 Nzk3MS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9kaXZfcGx1c19uYXZfYnVn NDc5NzEtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY3 ZTU2NjcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9kaXZfcGx1c19u YXZfYnVnNDc5NzEtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTMgQEAKK1Rlc3RpbmcgbGFiZWwr bmF2IHNlbGVjdG9yLiBUaGUgdGVzdCBwYXNzZXMgaWYgYWxsIE5BVnMgYXJlIGdyZWVuLgorCitO QVYxCitOQVYyCitOQVY0CitOQVY1CitOQVY2CitQYXNzOiBuYXYxLgorUGFzczogbmF2Mi4KK1Bh c3M6IG5hdjMuCitQYXNzOiBuYXY0LgorUGFzczogbmF2NS4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2Nzcy9kaXZfcGx1c19uYXZfYnVnNDc5NzEuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwLi4zZGUwZjNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLmh0bWwKQEAgLTAsMCArMSw1MyBAQAorPCFET0NU WVBFIEhUTUw+CisKKzxzdHlsZT4KKyNvbmUgKyBuYXYgeyBjb2xvcjogZ3JlZW47IH0KKyN0d28r bmF2IHsgY29sb3I6IGdyZWVuOyB9CisjdGhyZWUgK25hdiB7IGNvbG9yOiBncmVlbjsgfQorI2Zv dXIrIG5hdiB7IGNvbG9yOiBncmVlbjsgfQorbGFiZWwrbmF2IHsgY29sb3I6IGdyZWVuOyB9Cis8 L3N0eWxlPgorCis8cD5UZXN0aW5nIGxhYmVsK25hdiBzZWxlY3Rvci4gVGhlIHRlc3QgcGFzc2Vz IGlmIGFsbCBOQVZzIGFyZSBncmVlbi48L3A+CisKKzxkaXYgaWQ9Im9uZSI+PC9kaXY+Cis8bmF2 IGlkPSJuYXYxIj5OQVYxPC9uYXY+CisKKzxkaXYgaWQ9InR3byI+PC9kaXY+Cis8bmF2IGlkPSJu YXYyIj5OQVYyPC9uYXY+CisKKzxkaXYgaWQ9InRocmVlIj48L2Rpdj4KKzxuYXYgaWQ9Im5hdjMi Pk5BVjQ8L25hdj4KKworPGRpdiBpZD0iZm91ciI+PC9kaXY+Cis8bmF2IGlkPSJuYXY0Ij5OQVY1 PC9uYXY+CisKKzxsYWJlbD48L2xhYmVsPgorPG5hdiBpZD0ibmF2NSI+TkFWNjwvbmF2PgorCis8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CitpZiAod2luZG93LmxheW91dFRlc3RDb250 cm9sbGVyKQorICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCitm dW5jdGlvbiBydW5UZXN0KGVsZW1lbnQpCit7CisgICAgdmFyIGdyZWVuVmFsdWVzID0gWworICAg ICAgICAicmdiKDAsIDEyOCwgMCkiLCAvLyBXZWJLaXQsIEZpcmVmb3ggNCwgSUU5CisgICAgICAg ICIjMDA4MDAwIiAvLyBPcGVyYSAxMS4xMQorICAgIF07CisKKyAgICB2YXIgZWxlbSA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKGVsZW1lbnQpOworICAgIHZhciB2YWwgPSBnZXRDb21wdXRlZFN0 eWxlKGVsZW0sIG51bGwpLmdldFByb3BlcnR5VmFsdWUoImNvbG9yIik7CisgICAgCisgICAgaWYg KGdyZWVuVmFsdWVzLmluZGV4T2YodmFsLnRvTG93ZXJDYXNlKCkpICE9IC0xKQorICAgICAgIGRv Y3VtZW50LndyaXRlbG4oIlBhc3M6ICIgKyBlbGVtZW50ICsgIi48YnIgLz4iKTsKKyAgICBlbHNl CisgICAgICAgZG9jdW1lbnQud3JpdGVsbigiRmFpbDogIiArIGVsZW1lbnQgKyAiIGFjdHVhbCBj b2xvciBpcyBcIiIgKyB2YWwgKyAiXCIuPGJyIC8+Iik7Cit9CisKK3J1blRlc3QoIm5hdjEiKTsK K3J1blRlc3QoIm5hdjIiKTsKK3J1blRlc3QoIm5hdjMiKTsKK3J1blRlc3QoIm5hdjQiKTsKK3J1 blRlc3QoIm5hdjUiKTsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDk3NThmMmQuLmNmNzFjMDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0wNi0yMiAgQWxleGFuZHJ1IENoaWN1 bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgY3NzIGNvbWJpbmF0b3IgIisiIGluIGNvbWJpbmF0aW9uIHdpdGgg TkFWIHRhZyBpcyBidWdneQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDc5NzEKKworICAgICAgICBBZGRlZCBhIG5ldyBzdGF0ZSBpbiBjc3MvdG9rZW5p emVyLmZsZXggZm9yIHRoZSAibnRoIiBydWxlLiBUaGUgc3RhdGUgYmVnaW5zCisgICAgICAgIGF0 IG50aC0qKCBmdW5jdGlvbnMgYW5kIGVuZHMgYXQgdGhlIGZpcnN0ICIpIi4gSXQgYXZvaWRzIHBh cnNpbmcgc2VsZWN0b3JzIAorICAgICAgICBsaWtlICIjZGl2K25hdiIgYXM6ICIjZGl2IiAiK24i ICJhdiIuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvZGl2X3BsdXNfbmF2X2J1ZzQ3OTcxLmh0 bWwKKworICAgICAgICAqIGNzcy9tYWtldG9rZW5pemVyOgorICAgICAgICAqIGNzcy90b2tlbml6 ZXIuZmxleDoKKwogMjAxMS0wNi0yMiAgRGlyayBTY2h1bHplICA8a3JpdEB3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFJvYiBCdWlzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL21ha2V0b2tlbml6ZXIgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXRva2VuaXplcgpp bmRleCA5MGQ1ZmNiLi5kMmE3ODZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFr ZXRva2VuaXplcgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXRva2VuaXplcgpAQCAtNDks NiArNDksNyBAQCBwcmludDw8RU5ECiAjZGVmaW5lIElOSVRJQUwgMAogI2RlZmluZSBtZWRpYXF1 ZXJ5IDEKICNkZWZpbmUgZm9ya2V5d29yZCAyCisjZGVmaW5lIG50aGNoaWxkIDMKIAogLyogQzk5 IHN5c3RlbXMgaGF2ZSA8aW50dHlwZXMuaD4uIE5vbi1DOTkgc3lzdGVtcyBtYXkgb3IgbWF5IG5v dC4gKi8KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3Rva2VuaXplci5mbGV4IGIv U291cmNlL1dlYkNvcmUvY3NzL3Rva2VuaXplci5mbGV4CmluZGV4IDMyODVkMmYuLjFlNGQxNzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy90b2tlbml6ZXIuZmxleAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvdG9rZW5pemVyLmZsZXgKQEAgLTQsNiArNCw3IEBACiAlb3B0aW9uIHN0 YWNrCiAlcyBtZWRpYXF1ZXJ5CiAlcyBmb3JrZXl3b3JkCislcyBudGhjaGlsZAogCiBoICAgICAg ICAgICAgICAgWzAtOWEtZkEtRl0KIG5vbmFzY2lpICAgICAgICBbXDIwMC1cMzc3XQpAQCAtMjMs NiArMjQsNyBAQCB3ICAgICAgICAgICAgICAgWyBcdFxyXG5cZl0qCiBubCAgICAgICAgICAgICAg XG58XHJcbnxccnxcZgogcmFuZ2UgICAgICAgICAgIFw/ezEsNn18e2h9KFw/ezAsNX18e2h9KFw/ ezAsNH18e2h9KFw/ezAsM318e2h9KFw/ezAsMn18e2h9KFw/P3x7aH0pKSkpKQogbnRoICAgICAg ICAgICAgIFtcKy1dP3tpbnRudW19Km4oW1x0XHJcbiBdKltcKy1dW1x0XHJcbiBdKntpbnRudW19 KT8KK250aGZ1bmMgICAgICAgICAibnRoLSIoImNoaWxkInwib2YtdHlwZSJ8Imxhc3QtY2hpbGQi fCJsYXN0LW9mLXR5cGUiKQogCiAlJQogCkBAIC00Myw3ICs0NSw4IEBAIG50aCAgICAgICAgICAg ICBbXCstXT97aW50bnVtfSpuKFtcdFxyXG4gXSpbXCstXVtcdFxyXG4gXSp7aW50bnVtfSk/CiAK IHtzdHJpbmd9ICAgICAgICAgICAgICAgIHt5eVRvayA9IFNUUklORzsgcmV0dXJuIHl5VG9rO30K IHtpZGVudH0gICAgICAgICAgICAgICAgIHt5eVRvayA9IElERU5UOyByZXR1cm4geXlUb2s7fQot e250aH0gICAgICAgICAgICAgICAgICAge3l5VG9rID0gTlRIOyByZXR1cm4geXlUb2s7fQorPG50 aGNoaWxkPntudGh9ICAgICAgICAge3l5VG9rID0gTlRIOyByZXR1cm4geXlUb2s7fQorPG50aGNo aWxkPiIpIiAgICAgICAgICAge0JFR0lOKElOSVRJQUwpOyB5eVRvayA9ICp5eXRleHQ7IHJldHVy biB5eVRvazt9CiAKICIjIntofSsgICAgICAgICAgICAgICAgIHt5eVRvayA9IEhFWDsgcmV0dXJu IHl5VG9rO30KICIjIntpZGVudH0gICAgICAgICAgICAgIHt5eVRvayA9IElEU0VMOyByZXR1cm4g eXlUb2s7fQpAQCAtMTEzLDYgKzExNiw3IEBAIG50aCAgICAgICAgICAgICBbXCstXT97aW50bnVt fSpuKFtcdFxyXG4gXSpbXCstXVtcdFxyXG4gXSp7aW50bnVtfSk/CiAiLXdlYmtpdC1jYWxjKCIg ICAgICAgICB7eXlUb2sgPSBDQUxDRlVOQ1RJT047IHJldHVybiB5eVRvazt9CiAiLXdlYmtpdC1t aW4oIiAgICAgICAgICB7eXlUb2sgPSBNSU5GVU5DVElPTjsgcmV0dXJuIHl5VG9rO30KICItd2Vi a2l0LW1heCgiICAgICAgICAgIHt5eVRvayA9IE1BWEZVTkNUSU9OOyByZXR1cm4geXlUb2s7fQor e250aGZ1bmN9IigiICAgICAgICAgICAge0JFR0lOKG50aGNoaWxkKTsgeXlUb2sgPSBGVU5DVElP TjsgcmV0dXJuIHl5VG9rO30KIHtpZGVudH0iKCIgICAgICAgICAgICAgIHt5eVRvayA9IEZVTkNU SU9OOyByZXR1cm4geXlUb2s7fQogCiBVXCt7cmFuZ2V9ICAgICAgICAgICAgICB7eXlUb2sgPSBV TklDT0RFUkFOR0U7IHJldHVybiB5eVRvazt9Cg==