63781 2011-06-30 21:48:30 -0700 [text-overflow: ellipsis] WebKit should ignore the ellipsis for the purpose of dispatching mouse events 2022-07-12 14:56:06 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED CONFIGURATION CHANGED http://dev.w3.org/csswg/css3-ui/#text-overflow InRadar P2 Normal --- 233770 109277 1 phiw2 davidbarr aestes bdakin bfulgham darin davidbarr eric hyatt igor.oliveira jchaffraix kennyluck mikelawther mitz playmobil rniwa shanestephens simon.fraser syoichi tonikitoo tony webkit-bug-importer webkit.review.bot oldest_to_newest 430972 0 phiw2 2011-06-30 21:48:30 -0700 The editor draft recently changed and clarified what should happen when the pointer is over the ellipsis. [quote] Ellipsing only affects rendering and must not affect layout nor dispatching of pointer events. [/quote] http://dev.w3.org/csswg/css3-ui/#text-overflow In the testcase: mousing over the ellipsis (covering the link) should show the :hover color/background, clicking on it should follow the link (as it is 'part of the link'). This is what recent Firefox nightly builds and Opera 11.10+ do. related discussion thread http://lists.w3.org/Archives/Public/www-style/2011Jun/0633.html 430973 1 99425 phiw2 2011-06-30 21:49:07 -0700 Created attachment 99425 test case 589418 2 134161 davidbarr 2012-03-27 16:32:25 -0700 Created attachment 134161 Patch 589591 3 134161 buildbot 2012-03-27 19:10:16 -0700 Comment on attachment 134161 Patch Attachment 134161 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12146777 590853 4 davidbarr 2012-03-28 22:38:19 -0700 *** Bug 23678 has been marked as a duplicate of this bug. *** 590866 5 134504 davidbarr 2012-03-28 23:05:47 -0700 Created attachment 134504 Patch 591725 6 134697 davidbarr 2012-03-29 17:08:01 -0700 Created attachment 134697 Patch 593122 7 135017 davidbarr 2012-04-01 19:01:18 -0700 Created attachment 135017 Patch 593155 8 135023 davidbarr 2012-04-01 20:55:58 -0700 Created attachment 135023 Patch 593184 9 135023 darin 2012-04-01 22:50:54 -0700 Comment on attachment 135023 Patch It’s good to match the spec, but since this is an 8 year old feature in WebKit we also need to test existing content that uses text-overflow: ellipsis to make it does not depend on this. 593216 10 mikelawther 2012-04-02 00:21:34 -0700 Hi Darin - did you mean that we try and figure out if there are any websites that would be broken by this change? Or were you thinking about Apple properties using WebKit? What's the usual plan of attack in cases like this? 596105 11 davidbarr 2012-04-04 16:56:55 -0700 The discussion leading up to the spec change (pasted below): http://lists.w3.org/Archives/Public/www-style/2011Jul/0007.html On Tue, Jun 28, 2011 at 11:29, Tab Atkins Jr. <jackalmage@gmail.com> wrote: > On Sun, Jun 26, 2011 at 3:45 PM, Robert O'Callahan <robert@ocallahan.org> wrote: >> On Sun, Jun 26, 2011 at 3:29 PM, Philippe Wittenbergh >> <ph.wittenbergh@l-c-n.com> wrote: >>> What should happen when the user hovers over the ellipsis when the clipped >>> string is part of a link ? IOW, does the ellipsis become part of the link or >>> does the 'box' generated by the ellipsis cover the link (and blocks hit >>> testing on said link) ? >>> >>> Implementations disagree with WebKit and IE (tested IE 8) on one side, >>> Opera and Firefox nightly on the other. >> >> More accurately, Firefox simply ignores the ellipsis for the purpose of >> dispatching mouse events. > > This is the best behavior imo, as the ellipsis is "generated content", > and generated content generally doesn't participate in mouse events > beyond the interaction pseudoclasses that CSS defines. Thanks RoC and Tab, I have updated the spec accordingly to explicitly note that ellipsing must not affect dispatching of pointer events. http://dev.w3.org/csswg/css3-ui/#text-overflow Tantek 598834 12 davidbarr 2012-04-09 18:24:05 -0700 Hi Darin - have you found any specific content that depends on the current behavior? For the record, the current behavior is that the EllipsisBox is a black-hole for cursor events. 602809 13 davidbarr 2012-04-15 16:42:42 -0700 Any update on this issue? The only adverse feedback so far has been a concern regarding content dependent on the former behavior. 629600 14 135023 eric 2012-05-21 15:30:04 -0700 Comment on attachment 135023 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135023&action=review I don't think you need any of this setTimeout stuff. This can just be an inline <script>. Do you need eventSender.fastForward()? > LayoutTests/fast/css/text-overflow-ellipsis-hit-test.html:30 > + setTimeout('release()', 0); Why the setTimeout? > LayoutTests/fast/css/text-overflow-ellipsis-hit-test.html:33 > +window.onload = runTest; You don't actualy have to wait for onload here. 629848 15 143168 davidbarr 2012-05-21 18:57:33 -0700 Created attachment 143168 Patch Addressed Eric's comments regarding setTimeout(). Neatened the test a little. 635640 16 eric 2012-05-28 23:52:52 -0700 It appears hyatt added ellipsis boxes in http://trac.webkit.org/changeset/6877, including this hittesting code. The current behavior seems a bit odd. That we only seem to hittest the height of the elipses in that example. I guess after this change we won't hit (thus :hover) anywhere near the elipsis, only on the "li". 636515 17 mikelawther 2012-05-29 16:08:03 -0700 So if the current behaviour is a bit odd, and this patch updates that behaviour to be to spec and matching Firefox and Opera - can we land the patch? 636520 18 143168 eric 2012-05-29 16:10:53 -0700 Comment on attachment 143168 Patch It seems fine. 636530 19 143168 webkit.review.bot 2012-05-29 16:21:13 -0700 Comment on attachment 143168 Patch Clearing flags on attachment: 143168 Committed r118852: <http://trac.webkit.org/changeset/118852> 636531 20 webkit.review.bot 2012-05-29 16:21:19 -0700 All reviewed patches have been landed. Closing bug. 755563 21 simon.fraser 2012-10-31 12:54:14 -0700 This fix is incorrect. EllipsisBox is also used when the -webkit-line-clamp property is applied, and in those cases we need hit testing on links to work. You can see the damage caused by trying to hover over the links in LayoutTests/fast/overflow/line-clamp.html Please revert this change and do a correct fix. 775742 22 simon.fraser 2012-11-26 11:55:09 -0800 David, please address the issues raised in comment 21. 776145 23 davidbarr 2012-11-26 17:55:49 -0800 Simon, I was on vacation at the time of comment 21, but I'm back and will look at this bug today. 776249 24 davidbarr 2012-11-26 20:19:20 -0800 A quick note that this revert is non-trivial as the interface for nodeAtPoint() has changed since. 795649 25 simon.fraser 2012-12-20 12:12:32 -0800 Another ping. 817132 26 rniwa 2013-01-25 22:25:55 -0800 What's happening with this bug? 817810 27 tony 2013-01-28 09:31:23 -0800 I think this is fine to rollout if someone knows how to resolve the merge conflicts. FWIW, David hasn't worked at Google since sometime in August of last year. 818498 28 davidbarr 2013-01-28 21:45:49 -0800 Apologies for the delayed response, it was a national holiday weekend and a regional state of emergency - I've been offline for several days. As previously stated, the revert is non-trivial due to subsequent interface changes. My commitment to WebKit is no longer full-time so I have to decide where best to spend my time. I am willing to come back to this bug but I have already spent 3 days full-time chasing down the dependency chain for this revert. 828319 29 aestes 2013-02-08 01:18:09 -0800 To add to the importance of rolling this out, this change broke content in the Mac App Store, which uses -webkit-line-clamp in the Updates tab. Apple can't ship a new version of WebKit with this in the tree. 828370 30 aestes 2013-02-08 02:55:29 -0800 I started the rollout process in <https://bugs.webkit.org/show_bug.cgi?id=109277>. I verified that the change fixes the Mac App Store, but I'd like to add a test that verifies the original behavior since it sounds like we don't have one. We can probably just take LayoutTests/fast/overflow/line-clamp.html and have it dispatch a mouse click on one of the links. Layout experts should take a look to see if what I did makes sense. 1882632 31 bfulgham 2022-07-12 14:55:01 -0700 Safari, Chrome, and Firefox all agree on rendering for this test case. I don't believe there is any remaining compatibility issue. 1882635 32 webkit-bug-importer 2022-07-12 14:56:06 -0700 <rdar://problem/96912212> 99425 2011-06-30 21:49:07 -0700 2011-06-30 21:49:07 -0700 test case text-overflow-ellipsis.html text/html 567 phiw2 PCFET0NUWVBFIEhUTUw+CjxodG1sPgo8aGVhZD4KPHRpdGxlPnRleHQtb3ZlcmZsb3c6IGVsbGlw c2lzIHRlc3QgY2FzZTwvdGl0bGU+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cmh0bWwgewoJYmFj a2dyb3VuZDogcmdiKDI1MCwyNTAsMjUwKTsKCWNvbG9yOiByZ2IoMTAsMTAsMTApOwoJZm9udDog NDAwIDEwMCUvMS40MiAnSGVsdmV0aWNhIE5ldWUnLCAnYXJpYWwnLCBzYW5zLXNlcmlmOwoJCn0K ZGl2IHsKCXdpZHRoOiA1ZW07Cglib3JkZXI6IHRoaW4gc29saWQgYmx1ZTsKCW92ZXJmbG93OiBo aWRkZW47Cgl3aGl0ZS1zcGFjZTogbm93cmFwOwoJdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7IAoJ Zm9udC1zaXplOiAyZW07CgltYXJnaW46IDFlbSA1JTsKCXBhZGRpbmc6IDEwcHg7CglvdmVyZmxv dzogaGlkZGVuOwoJfQoKYTpob3ZlciB7IGJhY2tncm91bmQ6IHllbGxvdztjb2xvcjogYmx1ZTsg fQo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5PgoKPGRpdj5JIGRpZG4ndCA8YSBocmVmPSJodHRwOi8v Z29vZ2xlLmNvbS8iPmxpa2UgdGhlIHBsYXk8L2E+LjwvZGl2PgoKPC9ib2R5Pgo8L2h0bWw+ 134161 2012-03-27 16:32:25 -0700 2012-03-28 23:05:39 -0700 Patch bug-63781-20120328103223.patch text/plain 2742 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzY2YTU4Y2MzOGVjOWQ2 ODBjNDlhN2JmY2Y1Y2Y0ZDZiNmNiMzI3OS4uMTE0NGIwZjE5NDIxNzAxZWQ2ZmVjMWRlMjgxYTk0 ZWIzYzY3ZDJlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTI2ICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbdGV4dC1vdmVyZmxv dzogZWxsaXBzaXNdIFdlYktpdCBzaG91bGQgaWdub3JlIHRoZSBlbGxpcHNpcyBmb3IgdGhlIHB1 cnBvc2Ugb2YgZGlzcGF0Y2hpbmcgbW91c2UgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mzc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICJFbGxpcHNpbmcgb25seSBhZmZlY3RzIHJlbmRlcmlu ZyBhbmQgbXVzdCBub3QgYWZmZWN0IGxheW91dCBub3IgZGlzcGF0Y2hpbmcgb2YgcG9pbnRlciBl dmVudHMuIgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDEyL1dELWNzczMtdWktMjAx MjAxMTcvI3RleHQtb3ZlcmZsb3cKKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGx1Y2sgd2l0 aCBoaXQtdGVzdGluZyBpbiBEdW1wUmVuZGVyVHJlZS4KKworICAgICAgICAqIHJlbmRlcmluZy9F bGxpcHNpc0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGxpcHNpc0JveDo6bm9kZUF0UG9p bnQpOiBBbHdheXMgcmV0dXJuIGZhbHNlLgorCiAyMDEyLTAzLTIxICBNYXJrIFBpbGdyaW0gIDxw aWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZWFscGhhYmV0aXplIGFib3V0IHdlYmF1 ZGlvIG1vdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0Jv eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwCmluZGV4IGU0 MDNmZTY2N2VhMDI0NDc2OWQxMTJmMTBiOWY1YmI3NGM5ZDU1MjguLjA5ZTVhZmRlZWY4MGYxYjg4 NTlkNGZiOTBjZDViMzA2NGEyZTMwMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9FbGxpcHNpc0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlw c2lzQm94LmNwcApAQCAtMTA0LDI2ICsxMDQsNiBAQCB2b2lkIEVsbGlwc2lzQm94OjpwYWludFNl bGVjdGlvbihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheW91dFBvaW50JiBwYQog CiBib29sIEVsbGlwc2lzQm94Ojpub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVx dWVzdCwgSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBMYXlvdXRQb2ludCYgcG9pbnRJbkNv bnRhaW5lciwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBMYXlvdXRVbml0 IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUJvdHRvbSkKIHsKLSAgICBMYXlvdXRQb2ludCBhZGp1 c3RlZExvY2F0aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyByb3VuZGVkTGF5b3V0UG9pbnQodG9w TGVmdCgpKTsKLQotICAgIC8vIEhpdCB0ZXN0IHRoZSBtYXJrdXAgYm94LgotICAgIGlmIChtX21h cmt1cEJveCkgewotICAgICAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSBtX3JlbmRlcmVyLT5zdHls ZShtX2ZpcnN0TGluZSk7Ci0gICAgICAgIExheW91dFVuaXQgbXR4ID0gYWRqdXN0ZWRMb2NhdGlv bi54KCkgKyBtX2xvZ2ljYWxXaWR0aCAtIG1fbWFya3VwQm94LT54KCk7Ci0gICAgICAgIExheW91 dFVuaXQgbXR5ID0gYWRqdXN0ZWRMb2NhdGlvbi55KCkgKyBzdHlsZS0+Zm9udE1ldHJpY3MoKS5h c2NlbnQoKSAtIChtX21hcmt1cEJveC0+eSgpICsgbV9tYXJrdXBCb3gtPnJlbmRlcmVyKCktPnN0 eWxlKG1fZmlyc3RMaW5lKS0+Zm9udE1ldHJpY3MoKS5hc2NlbnQoKSk7Ci0gICAgICAgIGlmICht X21hcmt1cEJveC0+bm9kZUF0UG9pbnQocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVy LCBMYXlvdXRQb2ludChtdHgsIG10eSksIGxpbmVUb3AsIGxpbmVCb3R0b20pKSB7Ci0gICAgICAg ICAgICByZW5kZXJlcigpLT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9pbnRJbkNvbnRh aW5lciAtIExheW91dFNpemUobXR4LCBtdHkpKTsKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwot ICAgICAgICB9Ci0gICAgfQotCi0gICAgTGF5b3V0UmVjdCBib3VuZHNSZWN0KGFkanVzdGVkTG9j YXRpb24sIExheW91dFNpemUobV9sb2dpY2FsV2lkdGgsIG1faGVpZ2h0KSk7Ci0gICAgaWYgKHZp c2libGVUb0hpdFRlc3RpbmcoKSAmJiBib3VuZHNSZWN0LmludGVyc2VjdHMocmVzdWx0LnJlY3RG b3JQb2ludChwb2ludEluQ29udGFpbmVyKSkpIHsKLSAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRl SGl0VGVzdFJlc3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSB0b0xheW91dFNpemUoYWRq dXN0ZWRMb2NhdGlvbikpOwotICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRU ZXN0UmVzdWx0KHJlbmRlcmVyKCktPm5vZGUoKSwgcG9pbnRJbkNvbnRhaW5lciwgYm91bmRzUmVj dCkpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KICAgICByZXR1cm4gZmFsc2U7 CiB9CiAK 134504 2012-03-28 23:05:47 -0700 2012-03-29 17:07:48 -0700 Patch bug-63781-20120329170545.patch text/plain 2932 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzY2YTU4Y2MzOGVjOWQ2 ODBjNDlhN2JmY2Y1Y2Y0ZDZiNmNiMzI3OS4uNWJhMTBmYTk4MzQ1NDYxM2E3MTljODE3Y2VjZDhm ZGVkMjQ0N2UwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTI5ICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbdGV4dC1vdmVyZmxv dzogZWxsaXBzaXNdIFdlYktpdCBzaG91bGQgaWdub3JlIHRoZSBlbGxpcHNpcyBmb3IgdGhlIHB1 cnBvc2Ugb2YgZGlzcGF0Y2hpbmcgbW91c2UgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mzc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICJFbGxpcHNpbmcgb25seSBhZmZlY3RzIHJlbmRlcmlu ZyBhbmQgbXVzdCBub3QgYWZmZWN0IGxheW91dCBub3IgZGlzcGF0Y2hpbmcgb2YgcG9pbnRlciBl dmVudHMuIgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDEyL1dELWNzczMtdWktMjAx MjAxMTcvI3RleHQtb3ZlcmZsb3cKKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGx1Y2sgd2l0 aCBoaXQtdGVzdGluZyBpbiBEdW1wUmVuZGVyVHJlZS4KKworICAgICAgICAqIHJlbmRlcmluZy9F bGxpcHNpc0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGxpcHNpc0JveDo6bm9kZUF0UG9p bnQpOiBBbHdheXMgcmV0dXJuIGZhbHNlLgorCiAyMDEyLTAzLTIxICBNYXJrIFBpbGdyaW0gIDxw aWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZWFscGhhYmV0aXplIGFib3V0IHdlYmF1 ZGlvIG1vdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0Jv eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwCmluZGV4IGU0 MDNmZTY2N2VhMDI0NDc2OWQxMTJmMTBiOWY1YmI3NGM5ZDU1MjguLjYwY2UxMDg1NTM3MjgwZDQw MWJjNDIyYTRiOTdhYmM0MTQ1OTQyODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9FbGxpcHNpc0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlw c2lzQm94LmNwcApAQCAtMTA0LDI2ICsxMDQsMTIgQEAgdm9pZCBFbGxpcHNpc0JveDo6cGFpbnRT ZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXlvdXRQb2ludCYgcGEK IAogYm9vbCBFbGxpcHNpc0JveDo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJl cXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50SW5D b250YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgTGF5b3V0VW5p dCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVCb3R0b20pCiB7Ci0gICAgTGF5b3V0UG9pbnQgYWRq dXN0ZWRMb2NhdGlvbiA9IGFjY3VtdWxhdGVkT2Zmc2V0ICsgcm91bmRlZExheW91dFBvaW50KHRv cExlZnQoKSk7Ci0KLSAgICAvLyBIaXQgdGVzdCB0aGUgbWFya3VwIGJveC4KLSAgICBpZiAobV9t YXJrdXBCb3gpIHsKLSAgICAgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gbV9yZW5kZXJlci0+c3R5 bGUobV9maXJzdExpbmUpOwotICAgICAgICBMYXlvdXRVbml0IG10eCA9IGFkanVzdGVkTG9jYXRp b24ueCgpICsgbV9sb2dpY2FsV2lkdGggLSBtX21hcmt1cEJveC0+eCgpOwotICAgICAgICBMYXlv dXRVbml0IG10eSA9IGFkanVzdGVkTG9jYXRpb24ueSgpICsgc3R5bGUtPmZvbnRNZXRyaWNzKCku YXNjZW50KCkgLSAobV9tYXJrdXBCb3gtPnkoKSArIG1fbWFya3VwQm94LT5yZW5kZXJlcigpLT5z dHlsZShtX2ZpcnN0TGluZSktPmZvbnRNZXRyaWNzKCkuYXNjZW50KCkpOwotICAgICAgICBpZiAo bV9tYXJrdXBCb3gtPm5vZGVBdFBvaW50KHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5l ciwgTGF5b3V0UG9pbnQobXR4LCBtdHkpLCBsaW5lVG9wLCBsaW5lQm90dG9tKSkgewotICAgICAg ICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlSGl0VGVzdFJlc3VsdChyZXN1bHQsIHBvaW50SW5Db250 YWluZXIgLSBMYXlvdXRTaXplKG10eCwgbXR5KSk7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICAgICAgfQotICAgIH0KLQotICAgIExheW91dFJlY3QgYm91bmRzUmVjdChhZGp1c3RlZExv Y2F0aW9uLCBMYXlvdXRTaXplKG1fbG9naWNhbFdpZHRoLCBtX2hlaWdodCkpOwotICAgIGlmICh2 aXNpYmxlVG9IaXRUZXN0aW5nKCkgJiYgYm91bmRzUmVjdC5pbnRlcnNlY3RzKHJlc3VsdC5yZWN0 Rm9yUG9pbnQocG9pbnRJbkNvbnRhaW5lcikpKSB7Ci0gICAgICAgIHJlbmRlcmVyKCktPnVwZGF0 ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCBwb2ludEluQ29udGFpbmVyIC0gdG9MYXlvdXRTaXplKGFk anVzdGVkTG9jYXRpb24pKTsKLSAgICAgICAgaWYgKCFyZXN1bHQuYWRkTm9kZVRvUmVjdEJhc2Vk VGVzdFJlc3VsdChyZW5kZXJlcigpLT5ub2RlKCksIHBvaW50SW5Db250YWluZXIsIGJvdW5kc1Jl Y3QpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCisgICAgVU5VU0VEX1BBUkFN KHJlcXVlc3QpOworICAgIFVOVVNFRF9QQVJBTShyZXN1bHQpOworICAgIFVOVVNFRF9QQVJBTShw b2ludEluQ29udGFpbmVyKTsKKyAgICBVTlVTRURfUEFSQU0oYWNjdW11bGF0ZWRPZmZzZXQpOwor ICAgIFVOVVNFRF9QQVJBTShsaW5lVG9wKTsKKyAgICBVTlVTRURfUEFSQU0obGluZUJvdHRvbSk7 CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCg== 134697 2012-03-29 17:08:01 -0700 2012-04-01 19:01:10 -0700 Patch bug-63781-20120330110759.patch text/plain 2973 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTA5ZDM5ODYwYThiOWI2 Y2VkNmM3MWYyNGQ0NDc4NDUwYzI0NzM0Ny4uNDcyZmJmMWRhNTE0ZmYxOGZiYjQ4YTdkZGI4YmY0 Mzk2MDMwMzM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTI5ICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbdGV4dC1vdmVyZmxv dzogZWxsaXBzaXNdIFdlYktpdCBzaG91bGQgaWdub3JlIHRoZSBlbGxpcHNpcyBmb3IgdGhlIHB1 cnBvc2Ugb2YgZGlzcGF0Y2hpbmcgbW91c2UgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mzc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICJFbGxpcHNpbmcgb25seSBhZmZlY3RzIHJlbmRlcmlu ZyBhbmQgbXVzdCBub3QgYWZmZWN0IGxheW91dCBub3IgZGlzcGF0Y2hpbmcgb2YgcG9pbnRlciBl dmVudHMuIgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDEyL1dELWNzczMtdWktMjAx MjAxMTcvI3RleHQtb3ZlcmZsb3cKKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGx1Y2sgd2l0 aCBoaXQtdGVzdGluZyBpbiBEdW1wUmVuZGVyVHJlZS4KKworICAgICAgICAqIHJlbmRlcmluZy9F bGxpcHNpc0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGxpcHNpc0JveDo6bm9kZUF0UG9p bnQpOiBBbHdheXMgcmV0dXJuIGZhbHNlLgorCiAyMDEyLTAzLTI5ICBOYXRlIENoYXBpbiAgPGph cGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgU2ltcGxpZnkgcmVwb3J0aW5nIGEgbWFpbiBy ZXNvdXJjZSBlcnJvciB0byBEb2N1bWVudExvYWRlciBhbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvRWxsaXBzaXNCb3guY3BwCmluZGV4IGI3NGE5NWIyZGZjZDM0MTNiMWFhNDA0NmVkYjRlYzM3 ZjY5ZDUzZDkuLjUyODc3MmI1MDk4YjA0ZDJiZjcxMWEyZTQ2YThkMzZiYWIzNjA4ZjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNwcApAQCAtMTA0LDI2ICsxMDQsMTIg QEAgdm9pZCBFbGxpcHNpc0JveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBMYXlvdXRQb2ludCYgcGEKIAogYm9vbCBFbGxpcHNpc0JveDo6bm9kZUF0UG9p bnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwg Y29uc3QgTGF5b3V0UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBh Y2N1bXVsYXRlZE9mZnNldCwgTGF5b3V0VW5pdCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVCb3R0 b20pCiB7Ci0gICAgTGF5b3V0UG9pbnQgYWRqdXN0ZWRMb2NhdGlvbiA9IGFjY3VtdWxhdGVkT2Zm c2V0ICsgcm91bmRlZExheW91dFBvaW50KHRvcExlZnQoKSk7Ci0KLSAgICAvLyBIaXQgdGVzdCB0 aGUgbWFya3VwIGJveC4KLSAgICBpZiAobV9tYXJrdXBCb3gpIHsKLSAgICAgICAgUmVuZGVyU3R5 bGUqIHN0eWxlID0gbV9yZW5kZXJlci0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKTsKLSAgICAg ICAgTGF5b3V0VW5pdCBtdHggPSBhZGp1c3RlZExvY2F0aW9uLngoKSArIG1fbG9naWNhbFdpZHRo IC0gbV9tYXJrdXBCb3gtPngoKTsKLSAgICAgICAgTGF5b3V0VW5pdCBtdHkgPSBhZGp1c3RlZExv Y2F0aW9uLnkoKSArIHN0eWxlLT5mb250TWV0cmljcygpLmFzY2VudCgpIC0gKG1fbWFya3VwQm94 LT55KCkgKyBtX21hcmt1cEJveC0+cmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgp KS0+Zm9udE1ldHJpY3MoKS5hc2NlbnQoKSk7Ci0gICAgICAgIGlmIChtX21hcmt1cEJveC0+bm9k ZUF0UG9pbnQocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBMYXlvdXRQb2ludCht dHgsIG10eSksIGxpbmVUb3AsIGxpbmVCb3R0b20pKSB7Ci0gICAgICAgICAgICByZW5kZXJlcigp LT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciAtIExheW91dFNp emUobXR4LCBtdHkpKTsKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICB9Ci0gICAg fQotCi0gICAgTGF5b3V0UmVjdCBib3VuZHNSZWN0KGFkanVzdGVkTG9jYXRpb24sIExheW91dFNp emUobV9sb2dpY2FsV2lkdGgsIG1faGVpZ2h0KSk7Ci0gICAgaWYgKHZpc2libGVUb0hpdFRlc3Rp bmcoKSAmJiBib3VuZHNSZWN0LmludGVyc2VjdHMocmVzdWx0LnJlY3RGb3JQb2ludChwb2ludElu Q29udGFpbmVyKSkpIHsKLSAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlSGl0VGVzdFJlc3VsdChy ZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSB0b0xheW91dFNpemUoYWRqdXN0ZWRMb2NhdGlvbikp OwotICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KHJlbmRl cmVyKCktPm5vZGUoKSwgcG9pbnRJbkNvbnRhaW5lciwgYm91bmRzUmVjdCkpCi0gICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KKyAgICBVTlVTRURfUEFSQU0ocmVxdWVzdCk7CisgICAg VU5VU0VEX1BBUkFNKHJlc3VsdCk7CisgICAgVU5VU0VEX1BBUkFNKHBvaW50SW5Db250YWluZXIp OworICAgIFVOVVNFRF9QQVJBTShhY2N1bXVsYXRlZE9mZnNldCk7CisgICAgVU5VU0VEX1BBUkFN KGxpbmVUb3ApOworICAgIFVOVVNFRF9QQVJBTShsaW5lQm90dG9tKTsKICAgICByZXR1cm4gZmFs c2U7CiB9CiAK 135017 2012-04-01 19:01:18 -0700 2012-04-01 20:55:43 -0700 Patch bug-63781-20120402120116.patch text/plain 5936 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyODIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDdhYWI3YWYxY2E0OTBj MTRmNDRjYTQ2MjUwMGI3YTJhM2M1NDExYS4uZDk1NjAyZWZkNzY1M2M4ZDE0YzQ0MTBlNjMyYjZh ODIxYjZhZDc2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0LTAxICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbdGV4dC1vdmVyZmxv dzogZWxsaXBzaXNdIFdlYktpdCBzaG91bGQgaWdub3JlIHRoZSBlbGxpcHNpcyBmb3IgdGhlIHB1 cnBvc2Ugb2YgZGlzcGF0Y2hpbmcgbW91c2UgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mzc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICJFbGxpcHNpbmcgb25seSBhZmZlY3RzIHJlbmRlcmlu ZyBhbmQgbXVzdCBub3QgYWZmZWN0IGxheW91dCBub3IgZGlzcGF0Y2hpbmcgb2YgcG9pbnRlciBl dmVudHMuIgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDEyL1dELWNzczMtdWktMjAx MjAxMTcvI3RleHQtb3ZlcmZsb3cKKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy90ZXh0LW92ZXJm bG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9FbGxpcHNp c0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGxpcHNpc0JveDo6bm9kZUF0UG9pbnQpOiBB bHdheXMgcmV0dXJuIGZhbHNlLgorCiAyMDEyLTA0LTAxICBKb24gTGVlICA8am9ubGVlQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW5hbWUgbm90aWZpY2F0aW9uIHByb3BlcnRpZXMgYW5kIGZ1bmN0 aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAKaW5kZXggYjc0YTk1 YjJkZmNkMzQxM2IxYWE0MDQ2ZWRiNGVjMzdmNjlkNTNkOS4uNTI4NzcyYjUwOThiMDRkMmJmNzEx YTJlNDZhOGQzNmJhYjM2MDhmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0VsbGlwc2lzQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNC b3guY3BwCkBAIC0xMDQsMjYgKzEwNCwxMiBAQCB2b2lkIEVsbGlwc2lzQm94OjpwYWludFNlbGVj dGlvbihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheW91dFBvaW50JiBwYQogCiBi b29sIEVsbGlwc2lzQm94Ojpub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVz dCwgSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBMYXlvdXRQb2ludCYgcG9pbnRJbkNvbnRh aW5lciwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBMYXlvdXRVbml0IGxp bmVUb3AsIExheW91dFVuaXQgbGluZUJvdHRvbSkKIHsKLSAgICBMYXlvdXRQb2ludCBhZGp1c3Rl ZExvY2F0aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyByb3VuZGVkTGF5b3V0UG9pbnQodG9wTGVm dCgpKTsKLQotICAgIC8vIEhpdCB0ZXN0IHRoZSBtYXJrdXAgYm94LgotICAgIGlmIChtX21hcmt1 cEJveCkgewotICAgICAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSBtX3JlbmRlcmVyLT5zdHlsZShp c0ZpcnN0TGluZVN0eWxlKCkpOwotICAgICAgICBMYXlvdXRVbml0IG10eCA9IGFkanVzdGVkTG9j YXRpb24ueCgpICsgbV9sb2dpY2FsV2lkdGggLSBtX21hcmt1cEJveC0+eCgpOwotICAgICAgICBM YXlvdXRVbml0IG10eSA9IGFkanVzdGVkTG9jYXRpb24ueSgpICsgc3R5bGUtPmZvbnRNZXRyaWNz KCkuYXNjZW50KCkgLSAobV9tYXJrdXBCb3gtPnkoKSArIG1fbWFya3VwQm94LT5yZW5kZXJlcigp LT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5mb250TWV0cmljcygpLmFzY2VudCgpKTsKLSAg ICAgICAgaWYgKG1fbWFya3VwQm94LT5ub2RlQXRQb2ludChyZXF1ZXN0LCByZXN1bHQsIHBvaW50 SW5Db250YWluZXIsIExheW91dFBvaW50KG10eCwgbXR5KSwgbGluZVRvcCwgbGluZUJvdHRvbSkp IHsKLSAgICAgICAgICAgIHJlbmRlcmVyKCktPnVwZGF0ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCBw b2ludEluQ29udGFpbmVyIC0gTGF5b3V0U2l6ZShtdHgsIG10eSkpOwotICAgICAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBMYXlvdXRSZWN0IGJvdW5kc1JlY3Qo YWRqdXN0ZWRMb2NhdGlvbiwgTGF5b3V0U2l6ZShtX2xvZ2ljYWxXaWR0aCwgbV9oZWlnaHQpKTsK LSAgICBpZiAodmlzaWJsZVRvSGl0VGVzdGluZygpICYmIGJvdW5kc1JlY3QuaW50ZXJzZWN0cyhy ZXN1bHQucmVjdEZvclBvaW50KHBvaW50SW5Db250YWluZXIpKSkgewotICAgICAgICByZW5kZXJl cigpLT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciAtIHRvTGF5 b3V0U2l6ZShhZGp1c3RlZExvY2F0aW9uKSk7Ci0gICAgICAgIGlmICghcmVzdWx0LmFkZE5vZGVU b1JlY3RCYXNlZFRlc3RSZXN1bHQocmVuZGVyZXIoKS0+bm9kZSgpLCBwb2ludEluQ29udGFpbmVy LCBib3VuZHNSZWN0KSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQorICAgIFVO VVNFRF9QQVJBTShyZXF1ZXN0KTsKKyAgICBVTlVTRURfUEFSQU0ocmVzdWx0KTsKKyAgICBVTlVT RURfUEFSQU0ocG9pbnRJbkNvbnRhaW5lcik7CisgICAgVU5VU0VEX1BBUkFNKGFjY3VtdWxhdGVk T2Zmc2V0KTsKKyAgICBVTlVTRURfUEFSQU0obGluZVRvcCk7CisgICAgVU5VU0VEX1BBUkFNKGxp bmVCb3R0b20pOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGE3NzIzMjQ5NDVjNGQ4 ZGQ5MTI3ZjhkZGNmMzRlMGQ1MGFhZGJjNzAuLjAwNTYwN2VlODllZDEwNWJmNDk0MzhkZWE3YjZh MDgzNTY1NDljNGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNC0wMSAgRGF2aWQgQmFy ciAgPGRhdmlkYmFyckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW3RleHQtb3ZlcmZsb3c6IGVs bGlwc2lzXSBXZWJLaXQgc2hvdWxkIGlnbm9yZSB0aGUgZWxsaXBzaXMgZm9yIHRoZSBwdXJwb3Nl IG9mIGRpc3BhdGNoaW5nIG1vdXNlIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM3ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBzaXMtaGl0 LXRlc3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy90ZXh0LW92ZXJm bG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTA0LTAxICBFcmljIFNl aWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91 dCByMTEyNzYwLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvdGV4dC1vdmVyZmxv dy1lbGxpcHNpcy1oaXQtdGVzdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy90 ZXh0LW92ZXJmbG93LWVsbGlwc2lzLWhpdC10ZXN0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43 ZDU4ZDlhMTg3YmI5NmQzZTg4MDkyMmM1YzQ2MWY1OGI1NjEyZTk0Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvdGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVzdC1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitQQVNTIHRlc3QuZmlyc3RFbGVtZW50Q2hpbGQu dGV4dENvbnRlbnQgaXMgImNsaWNrZWQiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKK1RoaXMgdGVzdHMgdGhlIGhpdC10ZXN0aW5nIG9mIHRleHQtb3Zl cmZsb3c6ZWxsaXBzaXMuIENsaWNrIGFuZCBob3ZlciBldmVudHMgc2hvdWxkIGJlIHVuYWZmZWN0 ZWQgYnkgdGhlIGVsbGlwc2lzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvdGV4 dC1vdmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVzdC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv dGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVzdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM0ZTUzY2Y1 ODA1ZjQzZGZkNWIzOTViZDM1MTVkYWU5YTJjMmQ1ZDgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy90ZXh0LW92ZXJmbG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWwKQEAg LTAsMCArMSw2MyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHN0eWxlPgorI3Rlc3QgewordGV4dC1vdmVy ZmxvdzogZWxsaXBzaXM7Cit3aWR0aDogM2VtOworb3ZlcmZsb3c6IGhpZGRlbjsKK3doaXRlLXNw YWNlOiBub3dyYXA7Citwb3NpdGlvbjogYWJzb2x1dGU7CitsZWZ0OiAxMHB4OwordG9wOiAxMHB4 OworZm9udC1zaXplOiAyMHB4OworZm9udC1mYW1pbHk6IGFoZW07Cit9Cis8L3N0eWxlPgorPC9o ZWFkPgorPGJvZHk+Cis8cCBpZD0iZGVzY3JpcHRpb24iPlRoaXMgdGVzdHMgdGhlIGhpdC10ZXN0 aW5nIG9mIHRleHQtb3ZlcmZsb3c6ZWxsaXBzaXMuIENsaWNrIGFuZCBob3ZlciBldmVudHMgc2hv dWxkIGJlIHVuYWZmZWN0ZWQgYnkgdGhlIGVsbGlwc2lzLjwvcD4KKzxkaXYgaWQ9InRlc3QiPgor PGEgaHJlZj0iIyIgb25jbGljaz0idGhpcy50ZXh0Q29udGVudD0nY2xpY2tlZCciPnVuY2xpY2tl ZDwvYT4KKzwvZGl2PgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIp IHsKKyAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworfQorCit2YXIgdGVz dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0Iik7CisKK2Z1bmN0aW9uIHJ1blRlc3Qo KQoreworICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgZXZlbnRTZW5kZXIubW91c2VN b3ZlVG8oNDAsIDIwKTsKKyAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgfQorICBzZXRU aW1lb3V0KCdyZWxlYXNlKCknLCAwKTsKK30KKworZnVuY3Rpb24gcmVsZWFzZSgpCit7CisgIGlm ICh3aW5kb3cuZXZlbnRTZW5kZXIpCisgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworICBzZXRU aW1lb3V0KCd2ZXJpZnkoKScsIDApOworfQorCitmdW5jdGlvbiB2ZXJpZnkoKSB7CisgIHNob3Vs ZEJlRXF1YWxUb1N0cmluZygidGVzdC5maXJzdEVsZW1lbnRDaGlsZC50ZXh0Q29udGVudCIsICJj bGlja2VkIik7CisgIHRlc3RDb21wbGV0ZWQoKTsKK30KKworZnVuY3Rpb24gdGVzdENvbXBsZXRl ZCgpCit7CisgIC8vIENsZWFuIHVwIGFmdGVyIG91cnNlbHZlcworICB0ZXN0LnBhcmVudE5vZGUu cmVtb3ZlQ2hpbGQodGVzdCk7CisKKyAgdmFyIHNjcmlwdEVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJzY3JpcHQiKQorICBzY3JpcHRFbGVtZW50LnNyYyA9ICcuLi9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LWFzeW5jLmpzJworICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHNj cmlwdEVsZW1lbnQpOworfQorCit3aW5kb3cub25sb2FkID0gcnVuVGVzdDsKKzwvc2NyaXB0Pgor PC9ib2R5Pgo= 135023 2012-04-01 20:55:58 -0700 2012-05-21 18:57:23 -0700 Patch bug-63781-20120402135556.patch text/plain 6064 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyODIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDdhYWI3YWYxY2E0OTBj MTRmNDRjYTQ2MjUwMGI3YTJhM2M1NDExYS4uZDk1NjAyZWZkNzY1M2M4ZDE0YzQ0MTBlNjMyYjZh ODIxYjZhZDc2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0LTAxICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbdGV4dC1vdmVyZmxv dzogZWxsaXBzaXNdIFdlYktpdCBzaG91bGQgaWdub3JlIHRoZSBlbGxpcHNpcyBmb3IgdGhlIHB1 cnBvc2Ugb2YgZGlzcGF0Y2hpbmcgbW91c2UgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mzc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICJFbGxpcHNpbmcgb25seSBhZmZlY3RzIHJlbmRlcmlu ZyBhbmQgbXVzdCBub3QgYWZmZWN0IGxheW91dCBub3IgZGlzcGF0Y2hpbmcgb2YgcG9pbnRlciBl dmVudHMuIgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDEyL1dELWNzczMtdWktMjAx MjAxMTcvI3RleHQtb3ZlcmZsb3cKKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy90ZXh0LW92ZXJm bG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9FbGxpcHNp c0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGxpcHNpc0JveDo6bm9kZUF0UG9pbnQpOiBB bHdheXMgcmV0dXJuIGZhbHNlLgorCiAyMDEyLTA0LTAxICBKb24gTGVlICA8am9ubGVlQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW5hbWUgbm90aWZpY2F0aW9uIHByb3BlcnRpZXMgYW5kIGZ1bmN0 aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAKaW5kZXggYjc0YTk1 YjJkZmNkMzQxM2IxYWE0MDQ2ZWRiNGVjMzdmNjlkNTNkOS4uODE1YmU3Nzk1YzQ2Mzk1Y2E1MDhh OGRhMjJmMTI1OTk3MGRhMTEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0VsbGlwc2lzQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNC b3guY3BwCkBAIC0xMDIsMjggKzEwMiw4IEBAIHZvaWQgRWxsaXBzaXNCb3g6OnBhaW50U2VsZWN0 aW9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UG9pbnQmIHBhCiAgICAg Y29udGV4dC0+ZHJhd0hpZ2hsaWdodEZvclRleHQoZm9udCwgUmVuZGVyQmxvY2s6OmNvbnN0cnVj dFRleHRSdW4ocmVuZGVyZXIoKSwgZm9udCwgbV9zdHIsIHN0eWxlLCBUZXh0UnVuOjpBbGxvd1Ry YWlsaW5nRXhwYW5zaW9uKSwgSW50UG9pbnQoeCgpICsgcGFpbnRPZmZzZXQueCgpLCB5KCkgKyBw YWludE9mZnNldC55KCkgKyB0b3ApLCBoLCBjLCBzdHlsZS0+Y29sb3JTcGFjZSgpKTsKIH0KIAot Ym9vbCBFbGxpcHNpc0JveDo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVl c3QsIEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50SW5Db250 YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgTGF5b3V0VW5pdCBs aW5lVG9wLCBMYXlvdXRVbml0IGxpbmVCb3R0b20pCitib29sIEVsbGlwc2lzQm94Ojpub2RlQXRQ b2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBMYXlvdXRQ b2ludCYsIGNvbnN0IExheW91dFBvaW50JiwgTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCkKIHsKLSAg ICBMYXlvdXRQb2ludCBhZGp1c3RlZExvY2F0aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyByb3Vu ZGVkTGF5b3V0UG9pbnQodG9wTGVmdCgpKTsKLQotICAgIC8vIEhpdCB0ZXN0IHRoZSBtYXJrdXAg Ym94LgotICAgIGlmIChtX21hcmt1cEJveCkgewotICAgICAgICBSZW5kZXJTdHlsZSogc3R5bGUg PSBtX3JlbmRlcmVyLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpOwotICAgICAgICBMYXlvdXRV bml0IG10eCA9IGFkanVzdGVkTG9jYXRpb24ueCgpICsgbV9sb2dpY2FsV2lkdGggLSBtX21hcmt1 cEJveC0+eCgpOwotICAgICAgICBMYXlvdXRVbml0IG10eSA9IGFkanVzdGVkTG9jYXRpb24ueSgp ICsgc3R5bGUtPmZvbnRNZXRyaWNzKCkuYXNjZW50KCkgLSAobV9tYXJrdXBCb3gtPnkoKSArIG1f bWFya3VwQm94LT5yZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5mb250TWV0 cmljcygpLmFzY2VudCgpKTsKLSAgICAgICAgaWYgKG1fbWFya3VwQm94LT5ub2RlQXRQb2ludChy ZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIExheW91dFBvaW50KG10eCwgbXR5KSwg bGluZVRvcCwgbGluZUJvdHRvbSkpIHsKLSAgICAgICAgICAgIHJlbmRlcmVyKCktPnVwZGF0ZUhp dFRlc3RSZXN1bHQocmVzdWx0LCBwb2ludEluQ29udGFpbmVyIC0gTGF5b3V0U2l6ZShtdHgsIG10 eSkpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBM YXlvdXRSZWN0IGJvdW5kc1JlY3QoYWRqdXN0ZWRMb2NhdGlvbiwgTGF5b3V0U2l6ZShtX2xvZ2lj YWxXaWR0aCwgbV9oZWlnaHQpKTsKLSAgICBpZiAodmlzaWJsZVRvSGl0VGVzdGluZygpICYmIGJv dW5kc1JlY3QuaW50ZXJzZWN0cyhyZXN1bHQucmVjdEZvclBvaW50KHBvaW50SW5Db250YWluZXIp KSkgewotICAgICAgICByZW5kZXJlcigpLT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9p bnRJbkNvbnRhaW5lciAtIHRvTGF5b3V0U2l6ZShhZGp1c3RlZExvY2F0aW9uKSk7Ci0gICAgICAg IGlmICghcmVzdWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQocmVuZGVyZXIoKS0+bm9k ZSgpLCBwb2ludEluQ29udGFpbmVyLCBib3VuZHNSZWN0KSkKLSAgICAgICAgICAgIHJldHVybiB0 cnVlOwotICAgIH0KLQogICAgIHJldHVybiBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGE3NzIzMjQ5NDVj NGQ4ZGQ5MTI3ZjhkZGNmMzRlMGQ1MGFhZGJjNzAuLjAwNTYwN2VlODllZDEwNWJmNDk0MzhkZWE3 YjZhMDgzNTY1NDljNGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNC0wMSAgRGF2aWQg QmFyciAgPGRhdmlkYmFyckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW3RleHQtb3ZlcmZsb3c6 IGVsbGlwc2lzXSBXZWJLaXQgc2hvdWxkIGlnbm9yZSB0aGUgZWxsaXBzaXMgZm9yIHRoZSBwdXJw b3NlIG9mIGRpc3BhdGNoaW5nIG1vdXNlIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM3ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBzaXMt aGl0LXRlc3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy90ZXh0LW92 ZXJmbG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTA0LTAxICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTEyNzYwLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvdGV4dC1vdmVy Zmxvdy1lbGxpcHNpcy1oaXQtdGVzdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy90ZXh0LW92ZXJmbG93LWVsbGlwc2lzLWhpdC10ZXN0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li43ZDU4ZDlhMTg3YmI5NmQzZTg4MDkyMmM1YzQ2MWY1OGI1NjEyZTk0Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvdGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVz dC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitQQVNTIHRlc3QuZmlyc3RFbGVtZW50Q2hp bGQudGV4dENvbnRlbnQgaXMgImNsaWNrZWQiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKK1RoaXMgdGVzdHMgdGhlIGhpdC10ZXN0aW5nIG9mIHRleHQt b3ZlcmZsb3c6ZWxsaXBzaXMuIENsaWNrIGFuZCBob3ZlciBldmVudHMgc2hvdWxkIGJlIHVuYWZm ZWN0ZWQgYnkgdGhlIGVsbGlwc2lzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv dGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVzdC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MvdGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVzdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU1ZThh N2RmZThiNTJlYTFiM2YyYzczZmM1OTk4ZWQ0YjliMjNkYTQKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2Nzcy90ZXh0LW92ZXJmbG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWwK QEAgLTAsMCArMSw1NiBAQAorPHN0eWxlPgorI3Rlc3QgewordGV4dC1vdmVyZmxvdzogZWxsaXBz aXM7Cit3aWR0aDogM2VtOworb3ZlcmZsb3c6IGhpZGRlbjsKK3doaXRlLXNwYWNlOiBub3dyYXA7 Citwb3NpdGlvbjogYWJzb2x1dGU7CitsZWZ0OiAxMHB4OwordG9wOiAxMHB4OworZm9udC1zaXpl OiAyMHB4OworZm9udC1mYW1pbHk6IGFoZW07Cit9Cis8L3N0eWxlPgorPHAgaWQ9ImRlc2NyaXB0 aW9uIj5UaGlzIHRlc3RzIHRoZSBoaXQtdGVzdGluZyBvZiB0ZXh0LW92ZXJmbG93OmVsbGlwc2lz LiBDbGljayBhbmQgaG92ZXIgZXZlbnRzIHNob3VsZCBiZSB1bmFmZmVjdGVkIGJ5IHRoZSBlbGxp cHNpcy48L3A+Cis8ZGl2IGlkPSJ0ZXN0Ij48YSBocmVmPSIjIiBvbmNsaWNrPSJ0aGlzLnRleHRD b250ZW50PSdjbGlja2VkJyI+dW5jbGlja2VkPC9hPjwvZGl2PgorPHNjcmlwdCBzcmM9Ii4uL2pz L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgordmFyIHRlc3Qg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdCIpOworCitpZiAod2luZG93LmxheW91dFRl c3RDb250cm9sbGVyKSB7CisgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsK K30KKworZnVuY3Rpb24gcnVuVGVzdCgpCit7CisgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsK KyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyg0MCwgMjApOworICAgIGV2ZW50U2VuZGVyLm1v dXNlRG93bigpOworICB9CisgIHNldFRpbWVvdXQoJ3JlbGVhc2UoKScsIDApOworfQorCit3aW5k b3cub25sb2FkID0gcnVuVGVzdDsKKworZnVuY3Rpb24gcmVsZWFzZSgpCit7CisgIGlmICh3aW5k b3cuZXZlbnRTZW5kZXIpCisgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworICBzZXRUaW1lb3V0 KCd2ZXJpZnkoKScsIDApOworfQorCitmdW5jdGlvbiB2ZXJpZnkoKSB7CisgIHNob3VsZEJlRXF1 YWxUb1N0cmluZygidGVzdC5maXJzdEVsZW1lbnRDaGlsZC50ZXh0Q29udGVudCIsICJjbGlja2Vk Iik7CisgIHRlc3RDb21wbGV0ZWQoKTsKK30KKworZnVuY3Rpb24gdGVzdENvbXBsZXRlZCgpCit7 CisgIC8vIENsZWFuIHVwIGFmdGVyIG91cnNlbHZlcworICB0ZXN0LnBhcmVudE5vZGUucmVtb3Zl Q2hpbGQodGVzdCk7CisKKyAgdmFyIHNjcmlwdEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJzY3JpcHQiKQorICBzY3JpcHRFbGVtZW50LnNyYyA9ICcuLi9qcy9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LWFzeW5jLmpzJworICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHNjcmlwdEVs ZW1lbnQpOworfQorPC9zY3JpcHQ+Cg== 143168 2012-05-21 18:57:33 -0700 2012-05-29 16:21:12 -0700 Patch bug-63781-20120522115729.patch text/plain 5875 davidbarr U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWZhNGY1NGNiMTc0MjQ4 ZTA4NWViNGViZjFlMDExYWI0ZjJiMWZiMS4uY2UxOTA4ZjViMGM1OWM2OTdjODNjNDI0OGU5ZTkx ZmMyOTM4MDZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA1LTIyICBEYXZp ZCBCYXJyICA8ZGF2aWRiYXJyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbdGV4dC1vdmVyZmxv dzogZWxsaXBzaXNdIFdlYktpdCBzaG91bGQgaWdub3JlIHRoZSBlbGxpcHNpcyBmb3IgdGhlIHB1 cnBvc2Ugb2YgZGlzcGF0Y2hpbmcgbW91c2UgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mzc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICJFbGxpcHNpbmcgb25seSBhZmZlY3RzIHJlbmRlcmlu ZyBhbmQgbXVzdCBub3QgYWZmZWN0IGxheW91dCBub3IgZGlzcGF0Y2hpbmcgb2YgcG9pbnRlciBl dmVudHMuIgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDEyL1dELWNzczMtdWktMjAx MjAxMTcvI3RleHQtb3ZlcmZsb3cKKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy90ZXh0LW92ZXJm bG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9FbGxpcHNp c0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGxpcHNpc0JveDo6bm9kZUF0UG9pbnQpOiBB bHdheXMgcmV0dXJuIGZhbHNlLgorCiAyMDEyLTA1LTIxICBKb3NodWEgQmVsbCAgPGpzYmVsbEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5kZXhlZERCOiBJbmRleCBrZXkgcGF0aHMgdGhhdCB5 aWVsZCBpbnZhbGlkIGtleXMgc2hvdWxkIG5vdCBmYWlsIGFuIGFkZC9wdXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwCmluZGV4IDJjY2QxYzBkM2Q4M2NlNzQ0Y2M3OTFj YjQyZTgyODE4MTM0YjJkYmYuLjEzMDEwM2NmZTI3ZTJjNjE2YmJkMTIxMzMxNTg3NTExZmIyNDIw NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNwcApAQCAtMTA0LDI4 ICsxMDQsOCBAQCB2b2lkIEVsbGlwc2lzQm94OjpwYWludFNlbGVjdGlvbihHcmFwaGljc0NvbnRl eHQqIGNvbnRleHQsIGNvbnN0IExheW91dFBvaW50JiBwYQogICAgIGNvbnRleHQtPmRyYXdIaWdo bGlnaHRGb3JUZXh0KGZvbnQsIFJlbmRlckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHJlbmRlcmVy KCksIGZvbnQsIG1fc3RyLCBzdHlsZSwgVGV4dFJ1bjo6QWxsb3dUcmFpbGluZ0V4cGFuc2lvbiks IHJvdW5kZWRJbnRQb2ludChMYXlvdXRQb2ludCh4KCkgKyBwYWludE9mZnNldC54KCksIHkoKSAr IHBhaW50T2Zmc2V0LnkoKSArIHRvcCkpLCBoLCBjLCBzdHlsZS0+Y29sb3JTcGFjZSgpKTsKIH0K IAotYm9vbCBFbGxpcHNpc0JveDo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJl cXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50SW5D b250YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgTGF5b3V0VW5p dCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVCb3R0b20pCitib29sIEVsbGlwc2lzQm94Ojpub2Rl QXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBMYXlv dXRQb2ludCYsIGNvbnN0IExheW91dFBvaW50JiwgTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCkKIHsK LSAgICBMYXlvdXRQb2ludCBhZGp1c3RlZExvY2F0aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyBy b3VuZGVkTGF5b3V0UG9pbnQodG9wTGVmdCgpKTsKLQotICAgIC8vIEhpdCB0ZXN0IHRoZSBtYXJr dXAgYm94LgotICAgIGlmIChtX21hcmt1cEJveCkgewotICAgICAgICBSZW5kZXJTdHlsZSogc3R5 bGUgPSBtX3JlbmRlcmVyLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpOwotICAgICAgICBMYXlv dXRVbml0IG10eCA9IGFkanVzdGVkTG9jYXRpb24ueCgpICsgbV9sb2dpY2FsV2lkdGggLSBtX21h cmt1cEJveC0+eCgpOwotICAgICAgICBMYXlvdXRVbml0IG10eSA9IGFkanVzdGVkTG9jYXRpb24u eSgpICsgc3R5bGUtPmZvbnRNZXRyaWNzKCkuYXNjZW50KCkgLSAobV9tYXJrdXBCb3gtPnkoKSAr IG1fbWFya3VwQm94LT5yZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5mb250 TWV0cmljcygpLmFzY2VudCgpKTsKLSAgICAgICAgaWYgKG1fbWFya3VwQm94LT5ub2RlQXRQb2lu dChyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIExheW91dFBvaW50KG10eCwgbXR5 KSwgbGluZVRvcCwgbGluZUJvdHRvbSkpIHsKLSAgICAgICAgICAgIHJlbmRlcmVyKCktPnVwZGF0 ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCBwb2ludEluQ29udGFpbmVyIC0gTGF5b3V0U2l6ZShtdHgs IG10eSkpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAg ICBMYXlvdXRSZWN0IGJvdW5kc1JlY3QoYWRqdXN0ZWRMb2NhdGlvbiwgTGF5b3V0U2l6ZShtX2xv Z2ljYWxXaWR0aCwgbV9oZWlnaHQpKTsKLSAgICBpZiAodmlzaWJsZVRvSGl0VGVzdGluZygpICYm IGJvdW5kc1JlY3QuaW50ZXJzZWN0cyhyZXN1bHQucmVjdEZvclBvaW50KHBvaW50SW5Db250YWlu ZXIpKSkgewotICAgICAgICByZW5kZXJlcigpLT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwg cG9pbnRJbkNvbnRhaW5lciAtIHRvTGF5b3V0U2l6ZShhZGp1c3RlZExvY2F0aW9uKSk7Ci0gICAg ICAgIGlmICghcmVzdWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQocmVuZGVyZXIoKS0+ bm9kZSgpLCBwb2ludEluQ29udGFpbmVyLCBib3VuZHNSZWN0KSkKLSAgICAgICAgICAgIHJldHVy biB0cnVlOwotICAgIH0KLQogICAgIHJldHVybiBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJhYjZhNzQ4 YThkMmQxYzk4OTMzMTFiZmVhMjZkN2MyZDJkMjQwOGIuLjQyMzQwNzRlMWJkNTQ3YTkzN2YzMTdj NThjMmI5Y2FjYzA0M2Y5MzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNS0yMiAgRGF2 aWQgQmFyciAgPGRhdmlkYmFyckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW3RleHQtb3ZlcmZs b3c6IGVsbGlwc2lzXSBXZWJLaXQgc2hvdWxkIGlnbm9yZSB0aGUgZWxsaXBzaXMgZm9yIHRoZSBw dXJwb3NlIG9mIGRpc3BhdGNoaW5nIG1vdXNlIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM3ODEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBz aXMtaGl0LXRlc3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy90ZXh0 LW92ZXJmbG93LWVsbGlwc2lzLWhpdC10ZXN0Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTA1LTIxICBK b3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5kZXhlZERCOiBJ bmRleCBrZXkgcGF0aHMgdGhhdCB5aWVsZCBpbnZhbGlkIGtleXMgc2hvdWxkIG5vdCBmYWlsIGFu IGFkZC9wdXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL3RleHQtb3ZlcmZsb3ct ZWxsaXBzaXMtaGl0LXRlc3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvdGV4 dC1vdmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVzdC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTM5 YTA5ZTZmMTFjNzhlNzU4NjE1NTEyZDgwYjNlYWY1YWUxNGQ2NQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBzaXMtaGl0LXRlc3QtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTAgQEAKK1RoaXMgdGVzdHMgdGhlIGhpdC10ZXN0aW5nIG9m IHRleHQtb3ZlcmZsb3c6ZWxsaXBzaXMuIENsaWNrIGFuZCBob3ZlciBldmVudHMgc2hvdWxkIGJl IHVuYWZmZWN0ZWQgYnkgdGhlIGVsbGlwc2lzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CisKKworUEFTUyB0ZXN0LmZpcnN0RWxlbWVudENoaWxkLnRleHRDb250ZW50IGlzICJjbGlja2Vk IgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBzaXMtaGl0 LXRlc3QuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBzaXMt aGl0LXRlc3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hMTc3ZWFjOTQxMDE5MzFjZGVlYTI3M2RjNDEzMTcy M2VlZjUwZGM0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvdGV4dC1v dmVyZmxvdy1lbGxpcHNpcy1oaXQtdGVzdC5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKyN0ZXN0IHsKK3RleHQtb3ZlcmZsb3c6 IGVsbGlwc2lzOword2lkdGg6IDNlbTsKK292ZXJmbG93OiBoaWRkZW47Cit3aGl0ZS1zcGFjZTog bm93cmFwOworcG9zaXRpb246IGFic29sdXRlOworbGVmdDogMTBweDsKK3RvcDogMTBweDsKK2Zv bnQtc2l6ZTogMjBweDsKK2ZvbnQtZmFtaWx5OiBhaGVtOworfQorPC9zdHlsZT4KKzxzY3JpcHQg c3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHk+Cis8ZGl2IGlkPSJ0ZXN0Ij48YSBocmVmPSIjIiBvbmNsaWNrPSJ0aGlzLnRleHRDb250 ZW50PSdjbGlja2VkJyI+dW5jbGlja2VkPC9hPjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9u KCdUaGlzIHRlc3RzIHRoZSBoaXQtdGVzdGluZyBvZiB0ZXh0LW92ZXJmbG93OmVsbGlwc2lzLiBD bGljayBhbmQgaG92ZXIgZXZlbnRzIHNob3VsZCBiZSB1bmFmZmVjdGVkIGJ5IHRoZSBlbGxpcHNp cy4nKTsKKwordmFyIHRlc3QgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdCIpOworCitp ZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDQwLCAy MCk7CisgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICBldmVudFNlbmRlci5tb3VzZVVwKCk7 Cit9CisKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygidGVzdC5maXJzdEVsZW1lbnRDaGlsZC50ZXh0 Q29udGVudCIsICJjbGlja2VkIik7CisKKy8vIENsZWFuIHVwIGFmdGVyIG91cnNlbHZlcwordGVz dC5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHRlc3QpOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i Li4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+Cg==