12340 2007-01-19 22:31:19 -0800 XPathEvaluator behavior does not match Firefox - name() and attribute nodes 2007-01-29 10:16:42 -0800 1 1 1 Unclassified WebKit XML 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 10489 1 jesse ap oldest_to_newest 34164 0 jesse 2007-01-19 22:31:19 -0800 // #2 // function name() does not work with attribute nodes var strXML = '<data><record id="-a-" a="v">???</record><record id="a-a">{abc}</record></data>'; var doc = (new DOMParser()).parseFromString(strXML, "text/xml"); var xpe = new XPathEvaluator(); var objResult = xpe.evaluate("//@*[name()='id']", doc, null, 0, null); var itm = null; var objNodes = []; while (itm = objResult.iterateNext()) objNodes.push(itm); assertEquals(2, objNodes.length); // Safari yields 0 31669 1 12715 ap 2007-01-27 12:37:20 -0800 Created attachment 12715 proposed fix 31506 2 12723 ap 2007-01-28 04:55:11 -0800 Created attachment 12723 proposed fix Changed the wording of comments in the test a bit - the way name() works with a document that didn't have namespace normalization applied to it may be actually correct (at least, I couldn't find any indication that XPathEvaluator is supposed to normalize the document itself). 31281 3 12723 darin 2007-01-28 18:19:53 -0800 Comment on attachment 12723 proposed fix r=me Should that be prefix.isEmpty() instead of prefix.isNull()? Is it possible to construct a test that would behave differently depending on which you used? In general, I recommend taking advantage of the null value as distinct from empty only when it's necessary, so if either would work the same I'd prefer isEmpty. 31018 4 ap 2007-01-29 10:16:42 -0800 Committed revision 19226. (In reply to comment #3) > Should that be prefix.isEmpty() instead of prefix.isNull()? Is it possible to > construct a test that would behave differently depending on which you used? I don't know how to make such a test; changed to isEmpty(). 12715 2007-01-27 12:37:20 -0800 2007-01-28 04:55:11 -0800 proposed fix 12340r1_patch.txt text/plain 7866 ap SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE5MTg5KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDctMDEtMjcgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQw CisgICAgICAgIFhQYXRoRXZhbHVhdG9yIGJlaGF2aW9yIGRvZXMgbm90IG1hdGNoIEZpcmVmb3gg LSBuYW1lKCkgYW5kIGF0dHJpYnV0ZSBub2RlcworCisgICAgICAgICogZmFzdC94cGF0aC9uYW1l LW51bGwtbmFtZXNwYWNlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC94cGF0 aC9uYW1lLW51bGwtbmFtZXNwYWNlLmh0bWw6IEFkZGVkLgorICAgICAgICBUZXN0IGZvciB0aGUg YnVnLiBQbGVhc2Ugbm90ZSB0aGF0IG9uZSBvZiB0aGUgY2FzZXMgaXMgcHJldHR5IHF1ZXN0aW9u YWJsZSAtIGJ1dCB3ZSBkbyBtYXRjaCBGaXJlZm94LgorCisgICAgICAgICogZmFzdC9kb20veHBh dGgtZW1wdHktc3RyaW5nLWV4cGVjdGVkLnR4dDogUmVtb3ZlZC4KKyAgICAgICAgKiBmYXN0L2Rv bS94cGF0aC1lbXB0eS1zdHJpbmcuaHRtbDogUmVtb3ZlZC4KKyAgICAgICAgTW92ZWQgdGhlc2Ug dG8gZmFzdC94cGF0aC4KKworICAgICAgICAqIGZhc3QveHBhdGgveHBhdGgtbmFtZXNwYWNlcy5o dG1sOiBGaXhlZCBhbiBpbmxpbmUgZG9jdW1lbnQgdG8gYmUgd2VsbC1mb3JtZWQsIHNvIHRoZSB0 ZXN0IG5vdyBwYXNzZXMgaW4gRmlyZWZveC4KKyAgICAgICAgVGhpcyBpcyByZWFsbHkgYSBxdWly ayBvZiBvdXIgRE9NUGFyc2VyIHRoYXQgdGhlIHRlc3QgcGFzc2VkIGluIFdlYktpdDogb24gZXJy b3IsIGEgZGVzY3JpcHRpdmUgbWVzc2FnZSBpcyBhcHBlbmRlZCB0bworICAgICAgICB0aGUgcGFy dGlhbGx5IHBhcnNlZCBkb2N1bWVudCwgaW5zdGVhZCBvZiByZXBsYWNpbmcgaXQuCisKIDIwMDct MDEtMjcgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20veHBhdGgtZW1wdHkt c3RyaW5nLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2RvbS94 cGF0aC1lbXB0eS1zdHJpbmctZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxOTE4NCkKKysrIExheW91 dFRlc3RzL2Zhc3QvZG9tL3hwYXRoLWVtcHR5LXN0cmluZy1leHBlY3RlZC50eHQJKHdvcmtpbmcg Y29weSkKQEAgLTEsMiArMCwwIEBACi1UaGlzIHRlc3RzIHRoYXQgcGFyc2luZyBhbiBYUGF0aCBl eHByZXNzaW9uIHRoYXQgY29udGFpbnMgYW4gZW1wdHkgc3RyaW5nIGxpdGVyYWwgZG9lc24ndCBz ZWdmYXVsdC4KLVNVQ0NFU1M6IERpZG4ndCBjcmFzaCEKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv ZG9tL3hwYXRoLWVtcHR5LXN0cmluZy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zh c3QvZG9tL3hwYXRoLWVtcHR5LXN0cmluZy5odG1sCShyZXZpc2lvbiAxOTE4NCkKKysrIExheW91 dFRlc3RzL2Zhc3QvZG9tL3hwYXRoLWVtcHR5LXN0cmluZy5odG1sCSh3b3JraW5nIGNvcHkpCkBA IC0xLDE3ICswLDAgQEAKLTxodG1sPgotPGhlYWQ+Ci0gICAgPHNjcmlwdD4KLSAgICAgICAgZnVu Y3Rpb24gcnVuVGVzdHMoKSB7Ci0gICAgICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250 cm9sbGVyKQotICAgICAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQo KTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgIGRvY3VtZW50LmV2YWx1YXRlKCIvL2Fb QGlkPScnXSIsZG9jdW1lbnQpCi0gICAgICAgIH0KLSAgICA8L3NjcmlwdD4KLTwvaGVhZD4KLTxi b2R5IG9ubG9hZD0icnVuVGVzdHMoKSI+Ci0gICAgVGhpcyB0ZXN0cyB0aGF0IHBhcnNpbmcgYW4g WFBhdGggZXhwcmVzc2lvbiB0aGF0IGNvbnRhaW5zIGFuIGVtcHR5IHN0cmluZyBsaXRlcmFsIGRv ZXNuJ3Qgc2VnZmF1bHQuPGJyPgotICAgIFNVQ0NFU1M6IERpZG4ndCBjcmFzaCEKLSAgICAKLTwv Ym9keT4KLTwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L3hwYXRoL25hbWUtbnVsbC1uYW1lc3BhY2UtZXhwZWN0ZWQudHh0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBhdGgvbmFtZS1udWxsLW5hbWVzcGFjZS1leHBlY3Rl ZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL25hbWUtbnVsbC1u YW1lc3BhY2UtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAKK1Rlc3Qg Zm9yIGJ1ZyAxMjM0MDogWFBhdGggbmFtZSgpIGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayB3aXRoIG5v ZGVzIGFuZCBhdHRyaWJ1dGVzIGluIG51bGwgbmFtZXNwYWNlLgorCitTVUNDRVNTCgpQcm9wZXJ0 eSBjaGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL25hbWUtbnVsbC1uYW1lc3BhY2Ut ZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KTmFtZTogc3ZuOm1pbWUtdHlwZQogICArIHRleHQvcGxh aW4KTmFtZTogc3ZuOmVvbC1zdHlsZQogICArIG5hdGl2ZQoKSW5kZXg6IExheW91dFRlc3RzL2Zh c3QveHBhdGgvbmFtZS1udWxsLW5hbWVzcGFjZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2Zhc3QveHBhdGgvbmFtZS1udWxsLW5hbWVzcGFjZS5odG1sCShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1lLW51bGwtbmFtZXNwYWNlLmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMzYgQEAKKzxwPlRlc3QgZm9yIDxhIGhyZWY9Imh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQwIj5idWcgMTIzNDA8L2E+OgorWFBhdGggbmFt ZSgpIGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayB3aXRoIG5vZGVzIGFuZCBhdHRyaWJ1dGVzIGluIG51 bGwgbmFtZXNwYWNlLgorPC9wPgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpCisgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKwordmFyIHN0clhN TCA9ICc8ZG9jPjxyZWNvcmQvPjxyZWNvcmQvPjxyZWNvcmQvPjxyZWNvcmQvPjxyZWNvcmQgZm9v PSJhLWEiLz48L2RvYz4nOwordmFyIGRvYyA9IChuZXcgRE9NUGFyc2VyKCkpLnBhcnNlRnJvbVN0 cmluZyhzdHJYTUwsICJ0ZXh0L3htbCIpOworCisvLyBUaGlzIG1hdGNoZXMgaW4gYm90aCBGaXJl Zm94IGFuZCBXZWJLaXQsIHdoaWNoIGxvb2tzIGxpa2UgYSBidWcgLSAKKy8vIHRoZSBuYW1lIHNo b3VsZCBpbmNsdWRlIGEgZ2VuZXJhdGVkIHByZWZpeC4KK2RvYy5maXJzdENoaWxkLmNoaWxkTm9k ZXNbMF0uc2V0QXR0cmlidXRlTlMoImJhciIsICJmb28iLCAiLWEtIik7CisKKy8vIFRoaXMgZG9l c24ndCBtYXRjaC4KK2RvYy5maXJzdENoaWxkLmNoaWxkTm9kZXNbMV0uc2V0QXR0cmlidXRlTlMo ImJhciIsICJiOmZvbyIsICItYS0iKTsKKworLy8gVGhlc2UgYm90aCBtYXRjaCwgdG9vLgorZG9j LmZpcnN0Q2hpbGQuY2hpbGROb2Rlc1syXS5zZXRBdHRyaWJ1dGVOUygiIiwgImZvbyIsICItYS0i KTsKK2RvYy5maXJzdENoaWxkLmNoaWxkTm9kZXNbM10uc2V0QXR0cmlidXRlTlMobnVsbCwgImZv byIsICItYS0iKTsKKworLy8gVGhlIGxhc3QgKHN0YXRpYykgcmVjb3JkIG1hdGNoZXMsIG9mIGNv dXJzZS4KKworCit2YXIgeHBlID0gbmV3IFhQYXRoRXZhbHVhdG9yKCk7Cit2YXIgb2JqUmVzdWx0 ID0geHBlLmV2YWx1YXRlKCIvL0AqW25hbWUoKT0nZm9vJ10iLCBkb2MsIG51bGwsIDAsIG51bGwp OwordmFyIGl0bSA9IG51bGw7Cit2YXIgb2JqTm9kZXMgPSBbXTsKK3doaWxlIChpdG0gPSBvYmpS ZXN1bHQuaXRlcmF0ZU5leHQoKSkKKwlvYmpOb2Rlcy5wdXNoKGl0bSk7CisKK2lmIChvYmpOb2Rl cy5sZW5ndGggPT0gNCkKKyAgZG9jdW1lbnQud3JpdGUoIlNVQ0NFU1MiKTsKK2Vsc2UKKyAgZG9j dW1lbnQud3JpdGUoIkZBSUxVUkU6IG1hdGNoZWQgIiArIG9iak5vZGVzLmxlbmd0aCArICIgbm9k ZXMuIik7Cis8L3NjcmlwdD4KClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2Zhc3Qv eHBhdGgvbmFtZS1udWxsLW5hbWVzcGFjZS5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTmFtZTogc3ZuOm1pbWUt dHlwZQogICArIHRleHQvaHRtbAoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgt ZW1wdHktc3RyaW5nLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L3hwYXRoL3hwYXRoLWVtcHR5LXN0cmluZy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE5MTg0KQko ZnJvbSBMYXlvdXRUZXN0cy9mYXN0L2RvbS94cGF0aC1lbXB0eS1zdHJpbmctZXhwZWN0ZWQudHh0 OjE5MTg0KQorKysgTGF5b3V0VGVzdHMvZmFzdC94cGF0aC94cGF0aC1lbXB0eS1zdHJpbmctZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMiBAQAorVGhpcyB0ZXN0cyB0aGF0 IHBhcnNpbmcgYW4gWFBhdGggZXhwcmVzc2lvbiB0aGF0IGNvbnRhaW5zIGFuIGVtcHR5IHN0cmlu ZyBsaXRlcmFsIGRvZXNuJ3Qgc2VnZmF1bHQuCitTVUNDRVNTOiBEaWRuJ3QgY3Jhc2ghCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL3hwYXRoLWVtcHR5LXN0cmluZy5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtZW1wdHktc3RyaW5nLmh0bWwJKHJl dmlzaW9uIDE5MTg0KQkoZnJvbSBMYXlvdXRUZXN0cy9mYXN0L2RvbS94cGF0aC1lbXB0eS1zdHJp bmcuaHRtbDoxOTE4NCkKKysrIExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtZW1wdHktc3Ry aW5nLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxNyBAQAorPGh0bWw+Cis8aGVhZD4K KyAgICA8c2NyaXB0PgorICAgICAgICBmdW5jdGlvbiBydW5UZXN0cygpIHsKKyAgICAgICAgICAg IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgICAgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgICAgIAorICAgICAgICAg ICAgZG9jdW1lbnQuZXZhbHVhdGUoIi8vYVtAaWQ9JyddIixkb2N1bWVudCkKKyAgICAgICAgfQor ICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0cygpIj4KKyAgICBU aGlzIHRlc3RzIHRoYXQgcGFyc2luZyBhbiBYUGF0aCBleHByZXNzaW9uIHRoYXQgY29udGFpbnMg YW4gZW1wdHkgc3RyaW5nIGxpdGVyYWwgZG9lc24ndCBzZWdmYXVsdC48YnI+CisgICAgU1VDQ0VT UzogRGlkbid0IGNyYXNoIQorICAgIAorPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQg ZW5kIG9mIGZpbGUKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtbmFtZXNwYWNl cy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtbmFtZXNw YWNlcy5odG1sCShyZXZpc2lvbiAxOTE4NCkKKysrIExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBh dGgtbmFtZXNwYWNlcy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMCw3ICsxMCw3IEBAIGZ1bmN0 aW9uIHJ1blRlc3RzICgpIHsKICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQog ICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CiAgICAgICAgIAotICAg IHZhciB4bWxTdHJpbmcgPSAnPG5zOmZvbyB4bWxuczpucz0iaHR0cDovL3d3dy5leGFtcGxlLm9y ZyI+JzsKKyAgICB2YXIgeG1sU3RyaW5nID0gJzxuczpmb28geG1sbnM6bnM9Imh0dHA6Ly93d3cu ZXhhbXBsZS5vcmciLz4nOwogCiAgICAgdmFyIGRvYyA9IChuZXcgRE9NUGFyc2VyKCkpLnBhcnNl RnJvbVN0cmluZyh4bWxTdHJpbmcsICJ0ZXh0L3htbCIpOwogICAgIHZhciBjb250ZXh0Tm9kZSA9 IGRvYy5kb2N1bWVudEVsZW1lbnQ7CkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkxODkpCisrKyBXZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDA3LTAxLTI3ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjM0MAorICAgICAgICBYUGF0aEV2YWx1YXRvciBiZWhhdmlvciBkb2VzIG5vdCBtYXRj aCBGaXJlZm94IC0gbmFtZSgpIGFuZCBhdHRyaWJ1dGUgbm9kZXMKKworICAgICAgICAqIHhtbC9Y UGF0aEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYUGF0aDo6RnVuTmFtZTo6ZG9F dmFsdWF0ZSk6IERvIG5vdCB0cnkgdG8gYXBwZW5kIGEgcHJlZml4IGlmIGl0IGRvZXNuJ3QgZXhp c3QuCisKIDIwMDctMDEtMjcgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHplci5uZXQ+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChidWlsZGJvdCBidWlsZCBmaXgpLgpJbmRleDog V2ViQ29yZS94bWwvWFBhdGhGdW5jdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUveG1s L1hQYXRoRnVuY3Rpb25zLmNwcAkocmV2aXNpb24gMTkxODQpCisrKyBXZWJDb3JlL3htbC9YUGF0 aEZ1bmN0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1MSw3ICszNTEsOCBAQCBWYWx1ZSBG dW5OYW1lOjpkb0V2YWx1YXRlKCkgY29uc3QKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIG5vZGUg PSBldmFsdWF0aW9uQ29udGV4dCgpLm5vZGUuZ2V0KCk7CiAKLSAgICByZXR1cm4gbm9kZS0+cHJl Zml4KCkgKyAiOiIgKyBub2RlLT5sb2NhbE5hbWUoKTsKKyAgICBjb25zdCBBdG9taWNTdHJpbmcm IHByZWZpeCA9IG5vZGUtPnByZWZpeCgpOworICAgIHJldHVybiBwcmVmaXguaXNOdWxsKCkgPyBu b2RlLT5sb2NhbE5hbWUoKS5kb21TdHJpbmcoKSA6IG5vZGUtPnByZWZpeCgpICsgIjoiICsgbm9k ZS0+bG9jYWxOYW1lKCk7CiB9CiAKIFZhbHVlIEZ1bkNvdW50Ojpkb0V2YWx1YXRlKCkgY29uc3QK 12723 2007-01-28 04:55:11 -0800 2007-01-28 18:19:53 -0800 proposed fix 12340r2_patch.txt text/plain 7782 ap SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE5MTg5KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDctMDEtMjcgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQw CisgICAgICAgIFhQYXRoRXZhbHVhdG9yIGJlaGF2aW9yIGRvZXMgbm90IG1hdGNoIEZpcmVmb3gg LSBuYW1lKCkgYW5kIGF0dHJpYnV0ZSBub2RlcworCisgICAgICAgICogZmFzdC94cGF0aC9uYW1l LW51bGwtbmFtZXNwYWNlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC94cGF0 aC9uYW1lLW51bGwtbmFtZXNwYWNlLmh0bWw6IEFkZGVkLgorICAgICAgICBUZXN0IGZvciB0aGUg YnVnLgorCisgICAgICAgICogZmFzdC9kb20veHBhdGgtZW1wdHktc3RyaW5nLWV4cGVjdGVkLnR4 dDogUmVtb3ZlZC4KKyAgICAgICAgKiBmYXN0L2RvbS94cGF0aC1lbXB0eS1zdHJpbmcuaHRtbDog UmVtb3ZlZC4KKyAgICAgICAgTW92ZWQgdGhlc2UgdG8gZmFzdC94cGF0aC4KKworICAgICAgICAq IGZhc3QveHBhdGgveHBhdGgtbmFtZXNwYWNlcy5odG1sOiBGaXhlZCBhbiBpbmxpbmUgZG9jdW1l bnQgdG8gYmUgd2VsbC1mb3JtZWQsIHNvIHRoZSB0ZXN0IG5vdyBwYXNzZXMgaW4gRmlyZWZveC4K KyAgICAgICAgVGhpcyBpcyByZWFsbHkgYSBxdWlyayBvZiBvdXIgRE9NUGFyc2VyIHRoYXQgdGhl IHRlc3QgcGFzc2VkIGluIFdlYktpdDogb24gZXJyb3IsIGEgZGVzY3JpcHRpdmUgbWVzc2FnZSBp cyBhcHBlbmRlZCB0bworICAgICAgICB0aGUgcGFydGlhbGx5IHBhcnNlZCBkb2N1bWVudCwgaW5z dGVhZCBvZiByZXBsYWNpbmcgaXQuCisKIDIwMDctMDEtMjcgIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluLgpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9kb20veHBhdGgtZW1wdHktc3RyaW5nLWV4cGVjdGVkLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2RvbS94cGF0aC1lbXB0eS1zdHJpbmctZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAxOTE4NCkKKysrIExheW91dFRlc3RzL2Zhc3QvZG9tL3hwYXRoLWVtcHR5 LXN0cmluZy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTEsMiArMCwwIEBACi1UaGlz IHRlc3RzIHRoYXQgcGFyc2luZyBhbiBYUGF0aCBleHByZXNzaW9uIHRoYXQgY29udGFpbnMgYW4g ZW1wdHkgc3RyaW5nIGxpdGVyYWwgZG9lc24ndCBzZWdmYXVsdC4KLVNVQ0NFU1M6IERpZG4ndCBj cmFzaCEKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZG9tL3hwYXRoLWVtcHR5LXN0cmluZy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL3hwYXRoLWVtcHR5LXN0cmluZy5o dG1sCShyZXZpc2lvbiAxOTE4NCkKKysrIExheW91dFRlc3RzL2Zhc3QvZG9tL3hwYXRoLWVtcHR5 LXN0cmluZy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xLDE3ICswLDAgQEAKLTxodG1sPgotPGhl YWQ+Ci0gICAgPHNjcmlwdD4KLSAgICAgICAgZnVuY3Rpb24gcnVuVGVzdHMoKSB7Ci0gICAgICAg ICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQotICAgICAgICAgICAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKLSAgICAgICAgICAgICAgICAKLSAgICAg ICAgICAgIGRvY3VtZW50LmV2YWx1YXRlKCIvL2FbQGlkPScnXSIsZG9jdW1lbnQpCi0gICAgICAg IH0KLSAgICA8L3NjcmlwdD4KLTwvaGVhZD4KLTxib2R5IG9ubG9hZD0icnVuVGVzdHMoKSI+Ci0g ICAgVGhpcyB0ZXN0cyB0aGF0IHBhcnNpbmcgYW4gWFBhdGggZXhwcmVzc2lvbiB0aGF0IGNvbnRh aW5zIGFuIGVtcHR5IHN0cmluZyBsaXRlcmFsIGRvZXNuJ3Qgc2VnZmF1bHQuPGJyPgotICAgIFNV Q0NFU1M6IERpZG4ndCBjcmFzaCEKLSAgICAKLTwvYm9keT4KLTwvaHRtbD4KXCBObyBuZXdsaW5l IGF0IGVuZCBvZiBmaWxlCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL25hbWUtbnVsbC1u YW1lc3BhY2UtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBh dGgvbmFtZS1udWxsLW5hbWVzcGFjZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9mYXN0L3hwYXRoL25hbWUtbnVsbC1uYW1lc3BhY2UtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDMgQEAKK1Rlc3QgZm9yIGJ1ZyAxMjM0MDogWFBhdGggbmFtZSgp IGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayB3aXRoIG5vZGVzIGFuZCBhdHRyaWJ1dGVzIGluIG51bGwg bmFtZXNwYWNlLgorCitTVUNDRVNTCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9m YXN0L3hwYXRoL25hbWUtbnVsbC1uYW1lc3BhY2UtZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTmFt ZTogc3ZuOm1pbWUtdHlwZQogICArIHRleHQvcGxhaW4KTmFtZTogc3ZuOmVvbC1zdHlsZQogICAr IG5hdGl2ZQoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QveHBhdGgvbmFtZS1udWxsLW5hbWVzcGFj ZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBhdGgvbmFtZS1udWxsLW5h bWVzcGFjZS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC94cGF0aC9uYW1l LW51bGwtbmFtZXNwYWNlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzYgQEAKKzxwPlRl c3QgZm9yIDxhIGhyZWY9Imh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy MzQwIj5idWcgMTIzNDA8L2E+OgorWFBhdGggbmFtZSgpIGZ1bmN0aW9uIGRvZXNuJ3Qgd29yayB3 aXRoIG5vZGVzIGFuZCBhdHRyaWJ1dGVzIGluIG51bGwgbmFtZXNwYWNlLgorPC9wPgorPHNjcmlw dD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgIGxheW91dFRlc3RDb250cm9s bGVyLmR1bXBBc1RleHQoKTsKKwordmFyIHN0clhNTCA9ICc8ZG9jPjxyZWNvcmQvPjxyZWNvcmQv PjxyZWNvcmQvPjxyZWNvcmQvPjxyZWNvcmQgZm9vPSJhLWEiLz48L2RvYz4nOwordmFyIGRvYyA9 IChuZXcgRE9NUGFyc2VyKCkpLnBhcnNlRnJvbVN0cmluZyhzdHJYTUwsICJ0ZXh0L3htbCIpOwor CisvLyBUaGlzIG1hdGNoZXMgaW4gYm90aCBGaXJlZm94IGFuZCBXZWJLaXQsIHdoaWNoIGluZGlj YXRlcyB0aGF0IAorLy8gWFBhdGhFdmFsdWF0b3IgZG9lcyBub3Qgbm9ybWFsaXplIHRoZSBkb2N1 bWVudC4KK2RvYy5maXJzdENoaWxkLmNoaWxkTm9kZXNbMF0uc2V0QXR0cmlidXRlTlMoImJhciIs ICJmb28iLCAiLWEtIik7CisKKy8vIFRoaXMgZG9lc24ndCBtYXRjaC4KK2RvYy5maXJzdENoaWxk LmNoaWxkTm9kZXNbMV0uc2V0QXR0cmlidXRlTlMoImJhciIsICJiOmZvbyIsICItYS0iKTsKKwor Ly8gVGhlc2UgYm90aCBtYXRjaCwgdG9vLgorZG9jLmZpcnN0Q2hpbGQuY2hpbGROb2Rlc1syXS5z ZXRBdHRyaWJ1dGVOUygiIiwgImZvbyIsICItYS0iKTsKK2RvYy5maXJzdENoaWxkLmNoaWxkTm9k ZXNbM10uc2V0QXR0cmlidXRlTlMobnVsbCwgImZvbyIsICItYS0iKTsKKworLy8gVGhlIGxhc3Qg KHN0YXRpYykgcmVjb3JkIG1hdGNoZXMsIG9mIGNvdXJzZS4KKworCit2YXIgeHBlID0gbmV3IFhQ YXRoRXZhbHVhdG9yKCk7Cit2YXIgb2JqUmVzdWx0ID0geHBlLmV2YWx1YXRlKCIvL0AqW25hbWUo KT0nZm9vJ10iLCBkb2MsIG51bGwsIDAsIG51bGwpOwordmFyIGl0bSA9IG51bGw7Cit2YXIgb2Jq Tm9kZXMgPSBbXTsKK3doaWxlIChpdG0gPSBvYmpSZXN1bHQuaXRlcmF0ZU5leHQoKSkKKwlvYmpO b2Rlcy5wdXNoKGl0bSk7CisKK2lmIChvYmpOb2Rlcy5sZW5ndGggPT0gNCkKKyAgZG9jdW1lbnQu d3JpdGUoIlNVQ0NFU1MiKTsKK2Vsc2UKKyAgZG9jdW1lbnQud3JpdGUoIkZBSUxVUkU6IG1hdGNo ZWQgIiArIG9iak5vZGVzLmxlbmd0aCArICIgbm9kZXMuIik7Cis8L3NjcmlwdD4KClByb3BlcnR5 IGNoYW5nZXMgb246IExheW91dFRlc3RzL2Zhc3QveHBhdGgvbmFtZS1udWxsLW5hbWVzcGFjZS5o dG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KTmFtZTogc3ZuOm1pbWUtdHlwZQogICArIHRleHQvaHRtbAoKSW5kZXg6 IExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtZW1wdHktc3RyaW5nLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL3hwYXRoLWVtcHR5LXN0cmluZy1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDE5MTg0KQkoZnJvbSBMYXlvdXRUZXN0cy9mYXN0L2RvbS94 cGF0aC1lbXB0eS1zdHJpbmctZXhwZWN0ZWQudHh0OjE5MTg0KQorKysgTGF5b3V0VGVzdHMvZmFz dC94cGF0aC94cGF0aC1lbXB0eS1zdHJpbmctZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBA IC0wLDAgKzEsMiBAQAorVGhpcyB0ZXN0cyB0aGF0IHBhcnNpbmcgYW4gWFBhdGggZXhwcmVzc2lv biB0aGF0IGNvbnRhaW5zIGFuIGVtcHR5IHN0cmluZyBsaXRlcmFsIGRvZXNuJ3Qgc2VnZmF1bHQu CitTVUNDRVNTOiBEaWRuJ3QgY3Jhc2ghCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3hwYXRoL3hw YXRoLWVtcHR5LXN0cmluZy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QveHBh dGgveHBhdGgtZW1wdHktc3RyaW5nLmh0bWwJKHJldmlzaW9uIDE5MTg0KQkoZnJvbSBMYXlvdXRU ZXN0cy9mYXN0L2RvbS94cGF0aC1lbXB0eS1zdHJpbmcuaHRtbDoxOTE4NCkKKysrIExheW91dFRl c3RzL2Zhc3QveHBhdGgveHBhdGgtZW1wdHktc3RyaW5nLmh0bWwJKHdvcmtpbmcgY29weSkKQEAg LTAsMCArMSwxNyBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8c2NyaXB0PgorICAgICAgICBmdW5j dGlvbiBydW5UZXN0cygpIHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpCisgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgp OworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgZG9jdW1lbnQuZXZhbHVhdGUoIi8vYVtA aWQ9JyddIixkb2N1bWVudCkKKyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJv ZHkgb25sb2FkPSJydW5UZXN0cygpIj4KKyAgICBUaGlzIHRlc3RzIHRoYXQgcGFyc2luZyBhbiBY UGF0aCBleHByZXNzaW9uIHRoYXQgY29udGFpbnMgYW4gZW1wdHkgc3RyaW5nIGxpdGVyYWwgZG9l c24ndCBzZWdmYXVsdC48YnI+CisgICAgU1VDQ0VTUzogRGlkbid0IGNyYXNoIQorICAgIAorPC9i b2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKSW5kZXg6IExheW91dFRl c3RzL2Zhc3QveHBhdGgveHBhdGgtbmFtZXNwYWNlcy5odG1sCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtbmFtZXNwYWNlcy5odG1sCShyZXZpc2lvbiAxOTE4NCkK KysrIExheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtbmFtZXNwYWNlcy5odG1sCSh3b3JraW5n IGNvcHkpCkBAIC0xMCw3ICsxMCw3IEBAIGZ1bmN0aW9uIHJ1blRlc3RzICgpIHsKICAgICBpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQogICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxl ci5kdW1wQXNUZXh0KCk7CiAgICAgICAgIAotICAgIHZhciB4bWxTdHJpbmcgPSAnPG5zOmZvbyB4 bWxuczpucz0iaHR0cDovL3d3dy5leGFtcGxlLm9yZyI+JzsKKyAgICB2YXIgeG1sU3RyaW5nID0g Jzxuczpmb28geG1sbnM6bnM9Imh0dHA6Ly93d3cuZXhhbXBsZS5vcmciLz4nOwogCiAgICAgdmFy IGRvYyA9IChuZXcgRE9NUGFyc2VyKCkpLnBhcnNlRnJvbVN0cmluZyh4bWxTdHJpbmcsICJ0ZXh0 L3htbCIpOwogICAgIHZhciBjb250ZXh0Tm9kZSA9IGRvYy5kb2N1bWVudEVsZW1lbnQ7CkluZGV4 OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2 aXNpb24gMTkxODkpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDA3LTAxLTI3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRw Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM0MAorICAgICAgICBYUGF0aEV2 YWx1YXRvciBiZWhhdmlvciBkb2VzIG5vdCBtYXRjaCBGaXJlZm94IC0gbmFtZSgpIGFuZCBhdHRy aWJ1dGUgbm9kZXMKKworICAgICAgICAqIHhtbC9YUGF0aEZ1bmN0aW9ucy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpYUGF0aDo6RnVuTmFtZTo6ZG9FdmFsdWF0ZSk6IERvIG5vdCB0cnkgdG8gYXBw ZW5kIGEgcHJlZml4IGlmIGl0IGRvZXNuJ3QgZXhpc3QuCisKIDIwMDctMDEtMjcgIERhdmlkIEtp bHplciAgPGRka2lsemVyQGtpbHplci5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChidWlsZGJvdCBidWlsZCBmaXgpLgpJbmRleDogV2ViQ29yZS94bWwvWFBhdGhGdW5jdGlvbnMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUveG1sL1hQYXRoRnVuY3Rpb25zLmNwcAkocmV2aXNp b24gMTkxODQpCisrKyBXZWJDb3JlL3htbC9YUGF0aEZ1bmN0aW9ucy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM1MSw3ICszNTEsOCBAQCBWYWx1ZSBGdW5OYW1lOjpkb0V2YWx1YXRlKCkgY29uc3QK ICAgICBpZiAoIW5vZGUpCiAgICAgICAgIG5vZGUgPSBldmFsdWF0aW9uQ29udGV4dCgpLm5vZGUu Z2V0KCk7CiAKLSAgICByZXR1cm4gbm9kZS0+cHJlZml4KCkgKyAiOiIgKyBub2RlLT5sb2NhbE5h bWUoKTsKKyAgICBjb25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCA9IG5vZGUtPnByZWZpeCgpOwor ICAgIHJldHVybiBwcmVmaXguaXNOdWxsKCkgPyBub2RlLT5sb2NhbE5hbWUoKS5kb21TdHJpbmco KSA6IG5vZGUtPnByZWZpeCgpICsgIjoiICsgbm9kZS0+bG9jYWxOYW1lKCk7CiB9CiAKIFZhbHVl IEZ1bkNvdW50Ojpkb0V2YWx1YXRlKCkgY29uc3QK