32288 2009-12-08 14:30:19 -0800 :after selector displays in wrong place with nested div 2010-03-15 21:41:41 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac (Intel) OS X 10.5 RESOLVED FIXED http://dl.dropbox.com/u/87458/webkit-css-after-bug.html P2 Normal --- 0 mariusm webkit-unassigned commit-queue eric vsvabe oldest_to_newest 169796 0 mariusm 2009-12-08 14:30:19 -0800 Consider the following HTML: <style> .t:before { content: '{'; } .t:after { content: '}'; } </style> <div id="t1" class="t">1 <div id="t2" class="t">2</div> <div id="t3" class="t">3</div> </div> Expected behavior: the '}' for the <div id="t1"> should appear after the end of <div id="t3">: {1 {2} {3} } Actual behavior: the '}' for the <div id="t1"> appears between the end of <div id="t2"> and the beginning of <div id="t3">. {1 {2} } {3} I have reproduced this with both Safari 4.0.4 and Google Chrome 4.0.249.30. 180449 1 vsvabe 2010-01-13 16:09:30 -0800 If a block element a) contains more than one child block element, and b) has :after generated content which is inline, then the generated content is displayed at the wrong place. Reason - if :after content is contained in an anonymous RenderBlock, then RenderBlock::addChild doesn't notice it and appends a new child block _after_ the :after-generated content. Proposed patch adds a check for this case. 180453 2 46523 vsvabe 2010-01-13 16:12:13 -0800 Created attachment 46523 The patch. 180460 3 46525 vsvabe 2010-01-13 16:30:42 -0800 Created attachment 46525 fix the changelog 180912 4 46525 hyatt 2010-01-14 14:06:49 -0800 Comment on attachment 46525 fix the changelog afterChild is a very confusing name. Can you just rename it to lastRenderer or something? 180926 5 vsvabe 2010-01-14 14:32:59 -0800 Sure. 180927 6 46605 vsvabe 2010-01-14 14:34:10 -0800 Created attachment 46605 Patch v3 180939 7 46605 hyatt 2010-01-14 14:47:25 -0800 Comment on attachment 46605 Patch v3 r=me 181064 8 46605 commit-queue 2010-01-14 18:27:48 -0800 Comment on attachment 46605 Patch v3 Rejecting patch 46605 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--quiet']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 11934 test cases. fast/css-generated-content/block-after.html -> new (results generated in /Users/eseidel/Projects/CommitQueue/LayoutTests/platform/mac/fast/css-generated-content) Exiting early after 1 failures. 5062 tests run. 74.57s total testing time 5061 test cases (99%) succeeded 1 test case (<1%) was new 1 test case (<1%) had stderr output Full output: http://webkit-commit-queue.appspot.com/results/187789 181073 9 eric 2010-01-14 18:44:18 -0800 Looks like this is missing Mac results. We can't make the bots red while landing, so you'll need to add the new test to the skipped list of every platform which needs results added. It's unclear to me if this really needs platform specific results. an AHEM based test shouldn't need platform specific results. 181465 10 46730 vsvabe 2010-01-15 20:07:51 -0800 Created attachment 46730 Patch v4 Adds test to the skipped list for platforms that need result files added. 181486 11 vsvabe 2010-01-15 23:50:16 -0800 Regarding the comment about the platform specific results of the test.. I'm not sure what an Ahem based, platform independent test for this case should look like.. I can't use plaintext output, because css generated content (as far as I can tell) can't be accessed from javascript and it does not show up in plaintext output. Also, I can't just make all of the text use Ahem font, because I assume that tests are required to be human-readable / easy to inspect visually. The other tests in fast/css-generated-content also seem to be using platform specific rendering tree dumps as results.. 188774 12 46605 eric 2010-02-08 15:09:36 -0800 Comment on attachment 46605 Patch v3 Cleared David Hyatt's review+ from obsolete attachment 46605 so that this bug does not appear in http://webkit.org/pending-commit. 197224 13 46730 abarth 2010-03-08 10:43:25 -0800 Comment on attachment 46730 Patch v4 dhyatt has already r+ed this code change, but the testing here is insufficient. Please either create a platform-independent test or generate baselines for the other platforms. (The baseline requirement is like a tax on having a platform-specific test.) 197772 14 50349 vsvabe 2010-03-09 14:24:57 -0800 Created attachment 50349 Patch v5. Updated patch to make the test platform-independent. The already reviewed code changes stay the same. 197786 15 50349 darin 2010-03-09 14:45:50 -0800 Comment on attachment 50349 Patch v5. > + else if (lastRenderer && lastRenderer->isAnonymousBlock() && isAfterContent(lastRenderer->lastChild())) { > + addChild(newChild, lastRenderer->lastChild()); > + return; > + } Since this is the addChild function, this is a loop written as recursion. Maybe we should instead make the loop explicit? 197810 16 50357 vsvabe 2010-03-09 15:34:46 -0800 Created attachment 50357 Patch v6 Updated patch to address the last comment. 197815 17 50357 darin 2010-03-09 15:36:51 -0800 Comment on attachment 50357 Patch v6 > + if (isAfterContent(lastRenderer)) > + beforeChild = lastRenderer; > + else if (lastRenderer && lastRenderer->isAnonymousBlock() && isAfterContent(lastRenderer->lastChild())) > + beforeChild = lastRenderer->lastChild(); Is there ever a case with more than one level of anonymous block? If so, we might need a loop instead. r=me 197841 18 vsvabe 2010-03-09 17:01:39 -0800 (In reply to comment #17) > (From update of attachment 50357 [details]) > > + if (isAfterContent(lastRenderer)) > > + beforeChild = lastRenderer; > > + else if (lastRenderer && lastRenderer->isAnonymousBlock() && isAfterContent(lastRenderer->lastChild())) > > + beforeChild = lastRenderer->lastChild(); > > Is there ever a case with more than one level of anonymous block? If so, we > might need a loop instead. > > r=me AFAICT there isn't. Anyway, these lines don't cause any further searching down the tree. After beforeChild is set, it is clear where to insert newChild. 199991 19 50357 commit-queue 2010-03-15 21:41:34 -0700 Comment on attachment 50357 Patch v6 Clearing flags on attachment: 50357 Committed r56033: <http://trac.webkit.org/changeset/56033> 199992 20 commit-queue 2010-03-15 21:41:41 -0700 All reviewed patches have been landed. Closing bug. 46523 2010-01-13 16:12:13 -0800 2010-01-13 16:30:42 -0800 The patch. fix-block-after.patch text/plain 4852 vsvabe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzIxMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMTMgIFZhbHRlcnMgxaB2xIFiZSAgPHZzdmFiZUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg OmFmdGVyIHNlbGVjdG9yIGRpc3BsYXlzIGluIHdyb25nIHBsYWNlIHdpdGggbmVzdGVkIGRpdgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIyODgKKwor ICAgICAgICBNYWtlIHN1cmUgd2UgZG9uJ3QgYXBwZW5kIHRoaW5ncyBhZnRlciA6YWZ0ZXItZ2Vu ZXJhdGVkIGNvbnRlbnQsIGlmCisgICAgICAgIGl0J3MgaW5zaWRlIGFuIGFub255bW91cyBibG9j ay4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9jay1hZnRl ci5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFkZENoaWxkKToKKwogMjAxMC0wMS0xMyAgSmVyZW15IE9y bG93ICA8am9ybG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBG aXNoZXIuCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA1MzIxMCkK KysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjYxLDggKzI2MSwxNiBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVCZWZvcmVBZnRlckNvbnRl CiB2b2lkIFJlbmRlckJsb2NrOjphZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBSZW5k ZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIC8vIE1ha2Ugc3VyZSB3ZSBkb24ndCBhcHBl bmQgdGhpbmdzIGFmdGVyIDphZnRlci1nZW5lcmF0ZWQgY29udGVudCBpZiB3ZSBoYXZlIGl0Lgot ICAgIGlmICghYmVmb3JlQ2hpbGQgJiYgaXNBZnRlckNvbnRlbnQobGFzdENoaWxkKCkpKQotICAg ICAgICBiZWZvcmVDaGlsZCA9IGxhc3RDaGlsZCgpOworICAgIGlmICghYmVmb3JlQ2hpbGQpIHsK KyAgICAgICAgUmVuZGVyT2JqZWN0KiBhZnRlckNoaWxkID0gbGFzdENoaWxkKCk7CisKKyAgICAg ICAgaWYgKGlzQWZ0ZXJDb250ZW50KGFmdGVyQ2hpbGQpKQorICAgICAgICAgICAgYmVmb3JlQ2hp bGQgPSBhZnRlckNoaWxkOworICAgICAgICBlbHNlIGlmIChhZnRlckNoaWxkICYmIGFmdGVyQ2hp bGQtPmlzQW5vbnltb3VzQmxvY2soKSAmJiBpc0FmdGVyQ29udGVudChhZnRlckNoaWxkLT5sYXN0 Q2hpbGQoKSkpIHsKKyAgICAgICAgICAgIGFkZENoaWxkKG5ld0NoaWxkLCBhZnRlckNoaWxkLT5s YXN0Q2hpbGQoKSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9CiAKICAg ICBib29sIG1hZGVCb3hlc05vbklubGluZSA9IGZhbHNlOwogCkluZGV4OiBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1 MzIxMCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE3IEBACisyMDEwLTAxLTEzICBWYWx0ZXJzIMWgdsSBYmUgIDx2c3ZhYmVAZ21haWwuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDphZnRlciBz ZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBkaXYKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjg4CisKKyAgICAgICAg TWFrZSBzdXJlIHdlIGRvbid0IGFwcGVuZCB0aGluZ3MgYWZ0ZXIgOmFmdGVyLWdlbmVyYXRlZCBj b250ZW50LCBpZgorICAgICAgICBpdCdzIGluc2lkZSBhbiBhbm9ueW1vdXMgYmxvY2suCisKKyAg ICAgICAgKiBmYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9jay1hZnRlci5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQ6IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9mYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9i bG9jay1hZnRlci1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDEwLTAxLTEzICBEaXJrIFNjaHVs emUgIDxrcml0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmV0aCBEYWtpbi4K SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVy Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRl bnQvYmxvY2stYWZ0ZXIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvY3Nz LWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMTYgQEAKKzxodG1sPgorPGJvZHk+CisKKzxzdHlsZT4KK2Rpdi5hOmFmdGVyIHsgY29udGVu dDogJ1RoaXMgc2VudGVuY2Ugc2hvdWxkIGJlIG9uIHRoZSBsYXN0IGxpbmUuJzsgY29sb3I6IHJl ZDsgfQorPC9zdHlsZT4KKworPHA+QnVnIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMjI4OCI+MzIyODg8L2E+IC0gOmFmdGVyIHNlbGVjdG9yIGRpc3Bs YXlzIGluIHdyb25nIHBsYWNlIHdpdGggbmVzdGVkIGRpdjwvcD4KKworPGRpdiBjbGFzcz0iYSI+ CisgIDxkaXY+Rmlyc3QuPC9kaXY+CisgIDxkaXY+U2Vjb25kLjwvZGl2PiAgCis8L2Rpdj4KKwor PC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvY3Nz LWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxv Y2stYWZ0ZXItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZv cm0vZ3RrL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNiBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBz aXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAor ICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4NAorICAgICAgUmVuZGVy QmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDIwCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0 fSBhdCAoMCwwKSBzaXplIDMxeDIwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGgg MzE6ICJCdWcgIgorICAgICAgICBSZW5kZXJJbmxpbmUge0F9IGF0ICgwLDApIHNpemUgNDB4MjAg W2NvbG9yPSMwMDAwRUVdCisgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgzMSwwKSBz aXplIDQweDIwCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMzEsMCkgd2lkdGggNDA6ICIzMjI4 OCIKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg3MSwwKSBzaXplIDM1MHgyMAorICAg ICAgICAgIHRleHQgcnVuIGF0ICg3MSwwKSB3aWR0aCAzNTA6ICIgLSA6YWZ0ZXIgc2VsZWN0b3Ig ZGlzcGxheXMgaW4gd3JvbmcgcGxhY2Ugd2l0aCBuZXN0ZWQgZGl2IgorICAgICAgUmVuZGVyQmxv Y2sge0RJVn0gYXQgKDAsMzYpIHNpemUgNzg0eDYwCisgICAgICAgIFJlbmRlckJsb2NrIChhbm9u eW1vdXMpIGF0ICgwLDApIHNpemUgNzg0eDAKKyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0g YXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6 ZSA3ODR4MjAKKyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzMngy MAorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzI6ICJGaXJzdC4iCisgICAg ICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDIwKSBzaXplIDc4NHgyMAorICAgICAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDUxeDIwCisgICAgICAgICAgICB0ZXh0IHJ1 biBhdCAoMCwwKSB3aWR0aCA1MTogIlNlY29uZC4iCisgICAgICAgIFJlbmRlckJsb2NrIChhbm9u eW1vdXMpIGF0ICgwLDQwKSBzaXplIDc4NHgyMAorICAgICAgICAgIFJlbmRlcklubGluZSAoZ2Vu ZXJhdGVkKSBhdCAoMCwwKSBzaXplIDI1MHgyMCBbY29sb3I9I0ZGMDAwMF0KKyAgICAgICAgICAg IFJlbmRlclRleHQgYXQgKDAsMCkgc2l6ZSAyNTB4MjAKKyAgICAgICAgICAgICAgdGV4dCBydW4g YXQgKDAsMCkgd2lkdGggMjUwOiAiVGhpcyBzZW50ZW5jZSBzaG91bGQgYmUgb24gdGhlIGxhc3Qg bGluZS4iCg== 46525 2010-01-13 16:30:42 -0800 2010-01-14 14:34:10 -0800 fix the changelog fix-block-after.patch text/plain 4848 vsvabe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzIxMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMTMgIFZhbHRlcnMgU3ZhYmUgIDx2c3ZhYmVAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDph ZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBkaXYKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjg4CisKKyAg ICAgICAgTWFrZSBzdXJlIHdlIGRvbid0IGFwcGVuZCB0aGluZ3MgYWZ0ZXIgOmFmdGVyLWdlbmVy YXRlZCBjb250ZW50LCBpZgorICAgICAgICBpdCdzIGluc2lkZSBhbiBhbm9ueW1vdXMgYmxvY2su CisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrOjphZGRDaGlsZCk6CisKIDIwMTAtMDEtMTMgIEplcmVteSBPcmxv dyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlz aGVyLgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gNTMyMTApCisr KyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2 MSw4ICsyNjEsMTYgQEAgdm9pZCBSZW5kZXJCbG9jazo6dXBkYXRlQmVmb3JlQWZ0ZXJDb250ZQog dm9pZCBSZW5kZXJCbG9jazo6YWRkQ2hpbGQoUmVuZGVyT2JqZWN0KiBuZXdDaGlsZCwgUmVuZGVy T2JqZWN0KiBiZWZvcmVDaGlsZCkKIHsKICAgICAvLyBNYWtlIHN1cmUgd2UgZG9uJ3QgYXBwZW5k IHRoaW5ncyBhZnRlciA6YWZ0ZXItZ2VuZXJhdGVkIGNvbnRlbnQgaWYgd2UgaGF2ZSBpdC4KLSAg ICBpZiAoIWJlZm9yZUNoaWxkICYmIGlzQWZ0ZXJDb250ZW50KGxhc3RDaGlsZCgpKSkKLSAgICAg ICAgYmVmb3JlQ2hpbGQgPSBsYXN0Q2hpbGQoKTsKKyAgICBpZiAoIWJlZm9yZUNoaWxkKSB7Cisg ICAgICAgIFJlbmRlck9iamVjdCogYWZ0ZXJDaGlsZCA9IGxhc3RDaGlsZCgpOworCisgICAgICAg IGlmIChpc0FmdGVyQ29udGVudChhZnRlckNoaWxkKSkKKyAgICAgICAgICAgIGJlZm9yZUNoaWxk ID0gYWZ0ZXJDaGlsZDsKKyAgICAgICAgZWxzZSBpZiAoYWZ0ZXJDaGlsZCAmJiBhZnRlckNoaWxk LT5pc0Fub255bW91c0Jsb2NrKCkgJiYgaXNBZnRlckNvbnRlbnQoYWZ0ZXJDaGlsZC0+bGFzdENo aWxkKCkpKSB7CisgICAgICAgICAgICBhZGRDaGlsZChuZXdDaGlsZCwgYWZ0ZXJDaGlsZC0+bGFz dENoaWxkKCkpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQogCiAgICAg Ym9vbCBtYWRlQm94ZXNOb25JbmxpbmUgPSBmYWxzZTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTMy MTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NyBAQAorMjAxMC0wMS0xMyAgVmFsdGVycyBTdmFiZSAgPHZzdmFiZUBnbWFpbC5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgOmFmdGVyIHNlbGVj dG9yIGRpc3BsYXlzIGluIHdyb25nIHBsYWNlIHdpdGggbmVzdGVkIGRpdgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIyODgKKworICAgICAgICBNYWtl IHN1cmUgd2UgZG9uJ3QgYXBwZW5kIHRoaW5ncyBhZnRlciA6YWZ0ZXItZ2VuZXJhdGVkIGNvbnRl bnQsIGlmCisgICAgICAgIGl0J3MgaW5zaWRlIGFuIGFub255bW91cyBibG9jay4KKworICAgICAg ICAqIGZhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9mYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2Nr LWFmdGVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMTAtMDEtMTMgIERpcmsgU2NodWx6ZSAg PGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBCZXRoIERha2luLgpJbmRl eDogTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9i bG9jay1hZnRlci5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ2Vu ZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwx NiBAQAorPGh0bWw+Cis8Ym9keT4KKworPHN0eWxlPgorZGl2LmE6YWZ0ZXIgeyBjb250ZW50OiAn VGhpcyBzZW50ZW5jZSBzaG91bGQgYmUgb24gdGhlIGxhc3QgbGluZS4nOyBjb2xvcjogcmVkOyB9 Cis8L3N0eWxlPgorCis8cD5CdWcgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMyMjg4Ij4zMjI4ODwvYT4gLSA6YWZ0ZXIgc2VsZWN0b3IgZGlzcGxheXMg aW4gd3JvbmcgcGxhY2Ugd2l0aCBuZXN0ZWQgZGl2PC9wPgorCis8ZGl2IGNsYXNzPSJhIj4KKyAg PGRpdj5GaXJzdC48L2Rpdj4KKyAgPGRpdj5TZWNvbmQuPC9kaXY+ICAKKzwvZGl2PgorCis8L2Jv ZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9jc3MtZ2Vu ZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9jay1h ZnRlci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXItZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI2IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAK KyAgUmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUg ODAweDYwMAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgICAg UmVuZGVyQm9keSB7Qk9EWX0gYXQgKDgsOCkgc2l6ZSA3ODR4NTg0CisgICAgICBSZW5kZXJCbG9j ayB7UH0gYXQgKDAsMCkgc2l6ZSA3ODR4MjAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0 ICgwLDApIHNpemUgMzF4MjAKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzMTog IkJ1ZyAiCisgICAgICAgIFJlbmRlcklubGluZSB7QX0gYXQgKDAsMCkgc2l6ZSA0MHgyMCBbY29s b3I9IzAwMDBFRV0KKyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDMxLDApIHNpemUg NDB4MjAKKyAgICAgICAgICAgIHRleHQgcnVuIGF0ICgzMSwwKSB3aWR0aCA0MDogIjMyMjg4Igor ICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDcxLDApIHNpemUgMzUweDIwCisgICAgICAg ICAgdGV4dCBydW4gYXQgKDcxLDApIHdpZHRoIDM1MDogIiAtIDphZnRlciBzZWxlY3RvciBkaXNw bGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBkaXYiCisgICAgICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMCwzNikgc2l6ZSA3ODR4NjAKKyAgICAgICAgUmVuZGVyQmxvY2sgKGFub255bW91 cykgYXQgKDAsMCkgc2l6ZSA3ODR4MAorICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo MCwwKSBzaXplIDB4MAorICAgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwwKSBzaXplIDc4 NHgyMAorICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDMyeDIwCisg ICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzMjogIkZpcnN0LiIKKyAgICAgICAg UmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMjApIHNpemUgNzg0eDIwCisgICAgICAgICAgUmVuZGVy VGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNTF4MjAKKyAgICAgICAgICAgIHRleHQgcnVuIGF0 ICgwLDApIHdpZHRoIDUxOiAiU2Vjb25kLiIKKyAgICAgICAgUmVuZGVyQmxvY2sgKGFub255bW91 cykgYXQgKDAsNDApIHNpemUgNzg0eDIwCisgICAgICAgICAgUmVuZGVySW5saW5lIChnZW5lcmF0 ZWQpIGF0ICgwLDApIHNpemUgMjUweDIwIFtjb2xvcj0jRkYwMDAwXQorICAgICAgICAgICAgUmVu ZGVyVGV4dCBhdCAoMCwwKSBzaXplIDI1MHgyMAorICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAo MCwwKSB3aWR0aCAyNTA6ICJUaGlzIHNlbnRlbmNlIHNob3VsZCBiZSBvbiB0aGUgbGFzdCBsaW5l LiIK 46605 2010-01-14 14:34:10 -0800 2010-02-08 15:09:36 -0800 Patch v3 fix-block-after-v3.patch text/plain 4867 vsvabe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzI5MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMTQgIFZhbHRlcnMgU3ZhYmUgIDx2c3ZhYmVAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDph ZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBkaXYKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjg4CisKKyAg ICAgICAgTWFrZSBzdXJlIHdlIGRvbid0IGFwcGVuZCB0aGluZ3MgYWZ0ZXIgOmFmdGVyLWdlbmVy YXRlZCBjb250ZW50LCBpZgorICAgICAgICBpdCdzIGluc2lkZSBhbiBhbm9ueW1vdXMgYmxvY2su CisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrOjphZGRDaGlsZCk6CisKIDIwMTAtMDEtMTQgIE5hdGUgQ2hhcGlu ICA8amFwaGV0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEds YXprb3YuCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA1MzI4OSkK KysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjYxLDggKzI2MSwxNiBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVCZWZvcmVBZnRlckNvbnRl CiB2b2lkIFJlbmRlckJsb2NrOjphZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBSZW5k ZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIC8vIE1ha2Ugc3VyZSB3ZSBkb24ndCBhcHBl bmQgdGhpbmdzIGFmdGVyIDphZnRlci1nZW5lcmF0ZWQgY29udGVudCBpZiB3ZSBoYXZlIGl0Lgot ICAgIGlmICghYmVmb3JlQ2hpbGQgJiYgaXNBZnRlckNvbnRlbnQobGFzdENoaWxkKCkpKQotICAg ICAgICBiZWZvcmVDaGlsZCA9IGxhc3RDaGlsZCgpOworICAgIGlmICghYmVmb3JlQ2hpbGQpIHsK KyAgICAgICAgUmVuZGVyT2JqZWN0KiBsYXN0UmVuZGVyZXIgPSBsYXN0Q2hpbGQoKTsKKworICAg ICAgICBpZiAoaXNBZnRlckNvbnRlbnQobGFzdFJlbmRlcmVyKSkKKyAgICAgICAgICAgIGJlZm9y ZUNoaWxkID0gbGFzdFJlbmRlcmVyOworICAgICAgICBlbHNlIGlmIChsYXN0UmVuZGVyZXIgJiYg bGFzdFJlbmRlcmVyLT5pc0Fub255bW91c0Jsb2NrKCkgJiYgaXNBZnRlckNvbnRlbnQobGFzdFJl bmRlcmVyLT5sYXN0Q2hpbGQoKSkpIHsKKyAgICAgICAgICAgIGFkZENoaWxkKG5ld0NoaWxkLCBs YXN0UmVuZGVyZXItPmxhc3RDaGlsZCgpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg fQorICAgIH0KIAogICAgIGJvb2wgbWFkZUJveGVzTm9uSW5saW5lID0gZmFsc2U7CiAKSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDUzMjkwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEtMTQgIFZhbHRlcnMgU3ZhYmUgIDx2c3ZhYmVA Z21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIDphZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBk aXYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjg4 CisKKyAgICAgICAgTWFrZSBzdXJlIHdlIGRvbid0IGFwcGVuZCB0aGluZ3MgYWZ0ZXIgOmFmdGVy LWdlbmVyYXRlZCBjb250ZW50LCBpZgorICAgICAgICBpdCdzIGluc2lkZSBhbiBhbm9ueW1vdXMg YmxvY2suCisKKyAgICAgICAgKiBmYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9jay1hZnRl ci5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvZmFzdC9jc3MtZ2VuZXJhdGVk LWNvbnRlbnQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9mYXN0L2Nzcy1nZW5lcmF0 ZWQtY29udGVudC9ibG9jay1hZnRlci1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDEwLTAxLTE0 ICBFdmFuIFN0YWRlICA8ZXN0YWRlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBFcmljIFNlaWRlbC4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250 ZW50L2Jsb2NrLWFmdGVyLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3Mt Z2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsMTYgQEAKKzxodG1sPgorPGJvZHk+CisKKzxzdHlsZT4KK2Rpdi5h OmFmdGVyIHsgY29udGVudDogJ1RoaXMgc2VudGVuY2Ugc2hvdWxkIGJlIG9uIHRoZSBsYXN0IGxp bmUuJzsgY29sb3I6IHJlZDsgfQorPC9zdHlsZT4KKworPHA+QnVnIDxhIGhyZWY9Imh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjI4OCI+MzIyODg8L2E+IC0gOmFmdGVy IHNlbGVjdG9yIGRpc3BsYXlzIGluIHdyb25nIHBsYWNlIHdpdGggbmVzdGVkIGRpdjwvcD4KKwor PGRpdiBjbGFzcz0iYSI+CisgIDxkaXY+Rmlyc3QuPC9kaXY+CisgIDxkaXY+U2Vjb25kLjwvZGl2 PiAgCis8L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZv cm0vZ3RrL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLWV4cGVjdGVkLnR4 dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9jc3MtZ2VuZXJh dGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFm dGVyLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNiBAQAorbGF5ZXIgYXQg KDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCits YXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDAp IHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4 NAorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDIwCisgICAgICAgIFJl bmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDMxeDIwCisgICAgICAgICAgdGV4dCBydW4g YXQgKDAsMCkgd2lkdGggMzE6ICJCdWcgIgorICAgICAgICBSZW5kZXJJbmxpbmUge0F9IGF0ICgw LDApIHNpemUgNDB4MjAgW2NvbG9yPSMwMDAwRUVdCisgICAgICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICgzMSwwKSBzaXplIDQweDIwCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMzEsMCkg d2lkdGggNDA6ICIzMjI4OCIKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg3MSwwKSBz aXplIDM1MHgyMAorICAgICAgICAgIHRleHQgcnVuIGF0ICg3MSwwKSB3aWR0aCAzNTA6ICIgLSA6 YWZ0ZXIgc2VsZWN0b3IgZGlzcGxheXMgaW4gd3JvbmcgcGxhY2Ugd2l0aCBuZXN0ZWQgZGl2Igor ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMzYpIHNpemUgNzg0eDYwCisgICAgICAgIFJl bmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgwLDApIHNpemUgNzg0eDAKKyAgICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgICAgUmVuZGVyQmxvY2sge0RJ Vn0gYXQgKDAsMCkgc2l6ZSA3ODR4MjAKKyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQg KDAsMCkgc2l6ZSAzMngyMAorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzI6 ICJGaXJzdC4iCisgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDIwKSBzaXplIDc4NHgy MAorICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDUxeDIwCisgICAg ICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA1MTogIlNlY29uZC4iCisgICAgICAgIFJl bmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgwLDQwKSBzaXplIDc4NHgyMAorICAgICAgICAgIFJl bmRlcklubGluZSAoZ2VuZXJhdGVkKSBhdCAoMCwwKSBzaXplIDI1MHgyMCBbY29sb3I9I0ZGMDAw MF0KKyAgICAgICAgICAgIFJlbmRlclRleHQgYXQgKDAsMCkgc2l6ZSAyNTB4MjAKKyAgICAgICAg ICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMjUwOiAiVGhpcyBzZW50ZW5jZSBzaG91bGQg YmUgb24gdGhlIGxhc3QgbGluZS4iCg== 46730 2010-01-15 20:07:51 -0800 2010-03-09 14:24:57 -0800 Patch v4 fix-block-after-v4.patch text/plain 6288 vsvabe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzM1NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMTUgIFZhbHRlcnMgU3ZhYmUgIDx2c3ZhYmVAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDph ZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBkaXYKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjg4CisKKyAg ICAgICAgTWFrZSBzdXJlIHdlIGRvbid0IGFwcGVuZCB0aGluZ3MgYWZ0ZXIgOmFmdGVyLWdlbmVy YXRlZCBjb250ZW50LCBpZgorICAgICAgICBpdCdzIGluc2lkZSBhbiBhbm9ueW1vdXMgYmxvY2su CisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrOjphZGRDaGlsZCk6CisKIDIwMTAtMDEtMTUgIENhcm9sIFN6YWJv ICA8Y2Fyb2wuc3phYm9Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gNTMzNTUpCisr KyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2 MSw4ICsyNjEsMTYgQEAgdm9pZCBSZW5kZXJCbG9jazo6dXBkYXRlQmVmb3JlQWZ0ZXJDb250ZQog dm9pZCBSZW5kZXJCbG9jazo6YWRkQ2hpbGQoUmVuZGVyT2JqZWN0KiBuZXdDaGlsZCwgUmVuZGVy T2JqZWN0KiBiZWZvcmVDaGlsZCkKIHsKICAgICAvLyBNYWtlIHN1cmUgd2UgZG9uJ3QgYXBwZW5k IHRoaW5ncyBhZnRlciA6YWZ0ZXItZ2VuZXJhdGVkIGNvbnRlbnQgaWYgd2UgaGF2ZSBpdC4KLSAg ICBpZiAoIWJlZm9yZUNoaWxkICYmIGlzQWZ0ZXJDb250ZW50KGxhc3RDaGlsZCgpKSkKLSAgICAg ICAgYmVmb3JlQ2hpbGQgPSBsYXN0Q2hpbGQoKTsKKyAgICBpZiAoIWJlZm9yZUNoaWxkKSB7Cisg ICAgICAgIFJlbmRlck9iamVjdCogbGFzdFJlbmRlcmVyID0gbGFzdENoaWxkKCk7CisKKyAgICAg ICAgaWYgKGlzQWZ0ZXJDb250ZW50KGxhc3RSZW5kZXJlcikpCisgICAgICAgICAgICBiZWZvcmVD aGlsZCA9IGxhc3RSZW5kZXJlcjsKKyAgICAgICAgZWxzZSBpZiAobGFzdFJlbmRlcmVyICYmIGxh c3RSZW5kZXJlci0+aXNBbm9ueW1vdXNCbG9jaygpICYmIGlzQWZ0ZXJDb250ZW50KGxhc3RSZW5k ZXJlci0+bGFzdENoaWxkKCkpKSB7CisgICAgICAgICAgICBhZGRDaGlsZChuZXdDaGlsZCwgbGFz dFJlbmRlcmVyLT5sYXN0Q2hpbGQoKSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICB9CiAKICAgICBib29sIG1hZGVCb3hlc05vbklubGluZSA9IGZhbHNlOwogCkluZGV4OiBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzM1NSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE5IEBACisyMDEwLTAxLTE1ICBWYWx0ZXJzIFN2YWJlICA8dnN2YWJlQGdt YWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICA6YWZ0ZXIgc2VsZWN0b3IgZGlzcGxheXMgaW4gd3JvbmcgcGxhY2Ugd2l0aCBuZXN0ZWQgZGl2 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjI4OAor CisgICAgICAgIFRlc3QgZm9yIHRoaXMgYnVnZml4LiBOZWVkcyBuZXcgcmVzdWx0cyBmb3IgbWFj LCB3aW4gYW5kIHF0LgorCisgICAgICAgICogZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxv Y2stYWZ0ZXIuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvY3NzLWdl bmVyYXRlZC1jb250ZW50OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvZmFzdC9jc3Mt Z2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXItZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVk OgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9Ta2lwcGVkOgorCiAyMDEwLTAxLTE1ICBDYXJvbCBT emFibyAgPGNhcm9sLnN6YWJvQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Js b2NrLWFmdGVyLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ2VuZXJh dGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLmh0bWwJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsMTYgQEAKKzxodG1sPgorPGJvZHk+CisKKzxzdHlsZT4KK2Rpdi5hOmFmdGVy IHsgY29udGVudDogJ1RoaXMgc2VudGVuY2Ugc2hvdWxkIGJlIG9uIHRoZSBsYXN0IGxpbmUuJzsg Y29sb3I6IHJlZDsgfQorPC9zdHlsZT4KKworPHA+QnVnIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjI4OCI+MzIyODg8L2E+IC0gOmFmdGVyIHNlbGVj dG9yIGRpc3BsYXlzIGluIHdyb25nIHBsYWNlIHdpdGggbmVzdGVkIGRpdjwvcD4KKworPGRpdiBj bGFzcz0iYSI+CisgIDxkaXY+Rmlyc3QuPC9kaXY+CisgIDxkaXY+U2Vjb25kLjwvZGl2PiAgCis8 L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLWV4cGVjdGVkLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9jc3MtZ2VuZXJhdGVkLWNv bnRlbnQvYmxvY2stYWZ0ZXItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNiBAQAorbGF5ZXIgYXQgKDAsMCkg c2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBh dCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUg ODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4NAorICAg ICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDIwCisgICAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDMxeDIwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAs MCkgd2lkdGggMzE6ICJCdWcgIgorICAgICAgICBSZW5kZXJJbmxpbmUge0F9IGF0ICgwLDApIHNp emUgNDB4MjAgW2NvbG9yPSMwMDAwRUVdCisgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0 ICgzMSwwKSBzaXplIDQweDIwCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMzEsMCkgd2lkdGgg NDA6ICIzMjI4OCIKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg3MSwwKSBzaXplIDM1 MHgyMAorICAgICAgICAgIHRleHQgcnVuIGF0ICg3MSwwKSB3aWR0aCAzNTA6ICIgLSA6YWZ0ZXIg c2VsZWN0b3IgZGlzcGxheXMgaW4gd3JvbmcgcGxhY2Ugd2l0aCBuZXN0ZWQgZGl2IgorICAgICAg UmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMzYpIHNpemUgNzg0eDYwCisgICAgICAgIFJlbmRlckJs b2NrIChhbm9ueW1vdXMpIGF0ICgwLDApIHNpemUgNzg0eDAKKyAgICAgICAgICBSZW5kZXJUZXh0 IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQg KDAsMCkgc2l6ZSA3ODR4MjAKKyAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkg c2l6ZSAzMngyMAorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzI6ICJGaXJz dC4iCisgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDIwKSBzaXplIDc4NHgyMAorICAg ICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDUxeDIwCisgICAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA1MTogIlNlY29uZC4iCisgICAgICAgIFJlbmRlckJs b2NrIChhbm9ueW1vdXMpIGF0ICgwLDQwKSBzaXplIDc4NHgyMAorICAgICAgICAgIFJlbmRlcklu bGluZSAoZ2VuZXJhdGVkKSBhdCAoMCwwKSBzaXplIDI1MHgyMCBbY29sb3I9I0ZGMDAwMF0KKyAg ICAgICAgICAgIFJlbmRlclRleHQgYXQgKDAsMCkgc2l6ZSAyNTB4MjAKKyAgICAgICAgICAgICAg dGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMjUwOiAiVGhpcyBzZW50ZW5jZSBzaG91bGQgYmUgb24g dGhlIGxhc3QgbGluZS4iCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAkocmV2aXNpb24g NTMzNTUpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAkod29ya2luZyBjb3B5 KQpAQCAtOTgsMyArOTgsNiBAQCBtZWRpYS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbAogCiAjIFRo ZXNlIHRlc3RzIHJlcXVpcmUgdG91Y2ggc3VwcG9ydAogZmFzdC9ldmVudHMvdG91Y2gKKworIyBO ZWVkcyByZW5kZXJpbmcgcmVzdWx0cyBnZW5lcmF0ZWQuCitmYXN0L2Nzcy1nZW5lcmF0ZWQtY29u dGVudC9ibG9jay1hZnRlci5odG1sCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lw cGVkCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQJKHJldmlz aW9uIDUzMzU1KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkod29ya2luZyBj b3B5KQpAQCAtNTA5NCwzICs1MDk0LDYgQEAgZmFzdC9mb3Jtcy9zbGlkZXItbW91c2UtZXZlbnRz Lmh0bWwKIAogIyBKdXN0IG5lZWRzIHBpeGVsIGFuZCByZW5kZXJpbmcgcmVzdWx0cyBnZW5lcmF0 ZWQgYnkgc29tZW9uZSB3aXRoIHRoaXMgcGxhdGZvcm06CiBmYXN0L2Nzcy9ub24tc3RhbmRhcmQt Y2hlY2tib3gtc2l6ZS5odG1sCisKKyMgTmVlZHMgcmVuZGVyaW5nIHJlc3VsdHMgZ2VuZXJhdGVk LgorZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIuaHRtbApJbmRleDogTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv cGxhdGZvcm0vd2luL1NraXBwZWQJKHJldmlzaW9uIDUzMzU1KQorKysgTGF5b3V0VGVzdHMvcGxh dGZvcm0vd2luL1NraXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTc0NSwzICs3NDUsNiBAQCBzdmcv VzNDLVNWRy0xLjEvZmlsdGVycy1jb252LTAxLWYuc3ZnCiAKICMgSnVzdCBuZWVkcyBwaXhlbCBh bmQgcmVuZGVyaW5nIHJlc3VsdHMgZ2VuZXJhdGVkIGJ5IHNvbWVvbmUgd2l0aCB0aGlzIHBsYXRm b3JtOgogZmFzdC9jc3Mvbm9uLXN0YW5kYXJkLWNoZWNrYm94LXNpemUuaHRtbAorCisjIE5lZWRz IHJlbmRlcmluZyByZXN1bHRzIGdlbmVyYXRlZC4KK2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50 L2Jsb2NrLWFmdGVyLmh0bWwK 50349 2010-03-09 14:24:57 -0800 2010-03-09 15:34:46 -0800 Patch v5. fix-block-after-v5.patch text/plain 4451 vsvabe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTczNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDMtMDkgIFZhbHRlcnMgU3ZhYmUgIDx2c3ZhYmVAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDph ZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBkaXYKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjg4CisgICAg ICAgIAorICAgICAgICBNYWtlIHN1cmUgd2UgZG9uJ3QgYXBwZW5kIHRoaW5ncyBhZnRlciA6YWZ0 ZXItZ2VuZXJhdGVkIGNvbnRlbnQsIGlmCisgICAgICAgIGl0J3MgaW5zaWRlIGFuIGFub255bW91 cyBibG9jay4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9j ay1hZnRlci5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFkZENoaWxkKToKKwogMjAxMC0wMy0wOSAgR3Vz dGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAog ICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCAob25seSBleHBvc2VkIGJ5IG1ha2UgZGlzdGNo ZWNrKS4gVGhlCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA1NTcz NCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjYxLDggKzI2MSwxNiBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVCZWZvcmVBZnRlckNv bnRlCiB2b2lkIFJlbmRlckJsb2NrOjphZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBS ZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIC8vIE1ha2Ugc3VyZSB3ZSBkb24ndCBh cHBlbmQgdGhpbmdzIGFmdGVyIDphZnRlci1nZW5lcmF0ZWQgY29udGVudCBpZiB3ZSBoYXZlIGl0 LgotICAgIGlmICghYmVmb3JlQ2hpbGQgJiYgaXNBZnRlckNvbnRlbnQobGFzdENoaWxkKCkpKQot ICAgICAgICBiZWZvcmVDaGlsZCA9IGxhc3RDaGlsZCgpOworICAgIGlmICghYmVmb3JlQ2hpbGQp IHsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiBsYXN0UmVuZGVyZXIgPSBsYXN0Q2hpbGQoKTsKKwor ICAgICAgICBpZiAoaXNBZnRlckNvbnRlbnQobGFzdFJlbmRlcmVyKSkKKyAgICAgICAgICAgIGJl Zm9yZUNoaWxkID0gbGFzdFJlbmRlcmVyOworICAgICAgICBlbHNlIGlmIChsYXN0UmVuZGVyZXIg JiYgbGFzdFJlbmRlcmVyLT5pc0Fub255bW91c0Jsb2NrKCkgJiYgaXNBZnRlckNvbnRlbnQobGFz dFJlbmRlcmVyLT5sYXN0Q2hpbGQoKSkpIHsKKyAgICAgICAgICAgIGFkZENoaWxkKG5ld0NoaWxk LCBsYXN0UmVuZGVyZXItPmxhc3RDaGlsZCgpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgIH0KIAogICAgIGJvb2wgbWFkZUJveGVzTm9uSW5saW5lID0gZmFsc2U7CiAKSW5k ZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHJldmlzaW9uIDU1NzM0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDMtMDkgIFZhbHRlcnMgU3ZhYmUgIDx2c3Zh YmVAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIDphZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3Rl ZCBkaXYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMy Mjg4CisKKyAgICAgICAgKiBmYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9jay1hZnRlci1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50 L2Jsb2NrLWFmdGVyLmh0bWw6IEFkZGVkLgorCiAyMDEwLTAzLTA5ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFNraXAgbWVkaWEvdmlkZW8tc291cmNl LWVycm9yLmh0bWwgb24gU25vd0xlb3BhcmQsIGJlYWN1c2UgaXQgZmFpbHMgc3BvcmFkaWNhbGx5 LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0 ZXItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY3NzLWdlbmVy YXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLWV4cGVjdGVk LnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBACitCdWcgMzIyODggLSA6YWZ0ZXIgc2Vs ZWN0b3IgZGlzcGxheXMgaW4gd3JvbmcgcGxhY2Ugd2l0aCBuZXN0ZWQgZGl2CisKK0ZpcnN0Lgor U2Vjb25kLgorUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRl bnQvYmxvY2stYWZ0ZXIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy1n ZW5lcmF0ZWQtY29udGVudC9ibG9jay1hZnRlci5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIuaHRtbAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSw0MCBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAg ZGl2IHsKKyAgICAgICAgbWFyZ2luOiAwcHg7CisgICAgICAgIHBhZGRpbmc6IDBweDsKKyAgICAg ICAgYm9yZGVyOiBub25lOworICAgIH0KKyAgICBkaXYuYTphZnRlciB7IAorICAgICAgICBjb250 ZW50OiAnVGhpcyBzZW50ZW5jZSBzaG91bGQgYmUgYWZ0ZXIgIkZpcnN0LiIgYW5kICJTZWNvbmQu Iic7IAorICAgICAgICBjb2xvcjogcmVkOyAKKyAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2Ny aXB0PgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91 dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgIGZ1bmN0aW9uIHRlc3QoKXsKKyAg ICAgICAgdmFyIGZpcnN0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImZpcnN0Iik7CisgICAg ICAgIHZhciBzZWNvbmQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2Vjb25kIik7CisgICAg CisgICAgICAgIC8vVGVzdCB3aGV0aGVyIHRoZSBmaXJzdCBhbmQgc2Vjb25kIGxpbmVzIGFyZSBs YWlkIG91dCBzZXF1ZW50aWFsbHkuCisgICAgICAgIC8vSWYgdGhlcmUgaXMgc29tZXRoaW5nIGJl dHdlZW4gdGhlbSB0aGVuIGl0IG11c3QgYmUgdGhlIGNzcyBnZW5lcmF0ZWQKKyAgICAgICAgLy9j b250ZW50IHdoaWNoIG1lYW5zIHRoaXMgYnVnIGlzIG5vdCBmaXhlZC4KKyAgICAgICAgaWYoc2Vj b25kLm9mZnNldFRvcCAhPSBmaXJzdC5vZmZzZXRUb3AgKyBmaXJzdC5vZmZzZXRIZWlnaHQpCisg ICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0IikuaW5uZXJIVE1MID0g IkZBSUwiOworICAgICAgICBlbHNlCisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgicmVzdWx0IikuaW5uZXJIVE1MID0gIlBBU1MiOworICAgIH0gICAgCisgICAgPC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InRlc3QoKSI+CisgICAgPHA+QnVnIDxhIGhyZWY9Imh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjI4OCI+MzIyODg8L2E+IC0g OmFmdGVyIHNlbGVjdG9yIGRpc3BsYXlzIGluIHdyb25nIHBsYWNlIHdpdGggbmVzdGVkIGRpdjwv cD4KKyAgICA8ZGl2IGNsYXNzPSJhIiBpZD0iY29udGFpbmVyIj4KKyAgICAgICAgPGRpdiBpZD0i Zmlyc3QiPkZpcnN0LjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJzZWNvbmQiPlNlY29uZC48L2Rp dj4gIAorICAgIDwvZGl2PgorICAgIDxwIGlkPSJyZXN1bHQiPjwvZGl2PgorPC9ib2R5PgorPC9o dG1sPgo= 50357 2010-03-09 15:34:46 -0800 2010-03-15 21:41:34 -0700 Patch v6 fix-block-after-v6.patch text/plain 4411 vsvabe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTczNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDMtMDkgIFZhbHRlcnMgU3ZhYmUgIDx2c3ZhYmVAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDph ZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3RlZCBkaXYKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjg4CisgICAg ICAgIAorICAgICAgICBNYWtlIHN1cmUgd2UgZG9uJ3QgYXBwZW5kIHRoaW5ncyBhZnRlciA6YWZ0 ZXItZ2VuZXJhdGVkIGNvbnRlbnQsIGlmCisgICAgICAgIGl0J3MgaW5zaWRlIGFuIGFub255bW91 cyBibG9jay4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9j ay1hZnRlci5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFkZENoaWxkKToKKwogMjAxMC0wMy0wOSAgR3Vz dGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAog ICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCAob25seSBleHBvc2VkIGJ5IG1ha2UgZGlzdGNo ZWNrKS4gVGhlCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA1NTcz NCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjYxLDggKzI2MSwxNCBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVCZWZvcmVBZnRlckNv bnRlCiB2b2lkIFJlbmRlckJsb2NrOjphZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBS ZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIC8vIE1ha2Ugc3VyZSB3ZSBkb24ndCBh cHBlbmQgdGhpbmdzIGFmdGVyIDphZnRlci1nZW5lcmF0ZWQgY29udGVudCBpZiB3ZSBoYXZlIGl0 LgotICAgIGlmICghYmVmb3JlQ2hpbGQgJiYgaXNBZnRlckNvbnRlbnQobGFzdENoaWxkKCkpKQot ICAgICAgICBiZWZvcmVDaGlsZCA9IGxhc3RDaGlsZCgpOworICAgIGlmICghYmVmb3JlQ2hpbGQp IHsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiBsYXN0UmVuZGVyZXIgPSBsYXN0Q2hpbGQoKTsKKwor ICAgICAgICBpZiAoaXNBZnRlckNvbnRlbnQobGFzdFJlbmRlcmVyKSkKKyAgICAgICAgICAgIGJl Zm9yZUNoaWxkID0gbGFzdFJlbmRlcmVyOworICAgICAgICBlbHNlIGlmIChsYXN0UmVuZGVyZXIg JiYgbGFzdFJlbmRlcmVyLT5pc0Fub255bW91c0Jsb2NrKCkgJiYgaXNBZnRlckNvbnRlbnQobGFz dFJlbmRlcmVyLT5sYXN0Q2hpbGQoKSkpCisgICAgICAgICAgICBiZWZvcmVDaGlsZCA9IGxhc3RS ZW5kZXJlci0+bGFzdENoaWxkKCk7CisgICAgfQogCiAgICAgYm9vbCBtYWRlQm94ZXNOb25Jbmxp bmUgPSBmYWxzZTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTU3MzQpCisrKyBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wMy0wOSAgVmFs dGVycyBTdmFiZSAgPHZzdmFiZUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgOmFmdGVyIHNlbGVjdG9yIGRpc3BsYXlzIGluIHdyb25n IHBsYWNlIHdpdGggbmVzdGVkIGRpdgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzIyODgKKworICAgICAgICAqIGZhc3QvY3NzLWdlbmVyYXRlZC1jb250 ZW50L2Jsb2NrLWFmdGVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3Mt Z2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXIuaHRtbDogQWRkZWQuCisKIDIwMTAtMDMtMDkg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgU2tpcCBt ZWRpYS92aWRlby1zb3VyY2UtZXJyb3IuaHRtbCBvbiBTbm93TGVvcGFyZCwgYmVhY3VzZSBpdCBm YWlscyBzcG9yYWRpY2FsbHkuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy1nZW5lcmF0ZWQt Y29udGVudC9ibG9jay1hZnRlci1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxvY2stYWZ0ZXItZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ2VuZXJhdGVkLWNvbnRlbnQvYmxv Y2stYWZ0ZXItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUgQEAKK0J1ZyAz MjI4OCAtIDphZnRlciBzZWxlY3RvciBkaXNwbGF5cyBpbiB3cm9uZyBwbGFjZSB3aXRoIG5lc3Rl ZCBkaXYKKworRmlyc3QuCitTZWNvbmQuCitQQVNTCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nz cy1nZW5lcmF0ZWQtY29udGVudC9ibG9jay1hZnRlci5odG1sCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2Zhc3QvY3NzLWdlbmVyYXRlZC1jb250ZW50L2Jsb2NrLWFmdGVyLmh0bWwJKHJldmlz aW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9ibG9jay1h ZnRlci5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQwIEBACis8aHRtbD4KKzxoZWFkPgor ICAgIDxzdHlsZT4KKyAgICBkaXYgeworICAgICAgICBtYXJnaW46IDBweDsKKyAgICAgICAgcGFk ZGluZzogMHB4OworICAgICAgICBib3JkZXI6IG5vbmU7CisgICAgfQorICAgIGRpdi5hOmFmdGVy IHsgCisgICAgICAgIGNvbnRlbnQ6ICdUaGlzIHNlbnRlbmNlIHNob3VsZCBiZSBhZnRlciAiRmly c3QuIiBhbmQgIlNlY29uZC4iJzsgCisgICAgICAgIGNvbG9yOiByZWQ7IAorICAgIH0KKyAgICA8 L3N0eWxlPgorICAgIDxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl cikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgZnVu Y3Rpb24gdGVzdCgpeworICAgICAgICB2YXIgZmlyc3QgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgiZmlyc3QiKTsKKyAgICAgICAgdmFyIHNlY29uZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJzZWNvbmQiKTsKKyAgICAKKyAgICAgICAgLy9UZXN0IHdoZXRoZXIgdGhlIGZpcnN0IGFuZCBz ZWNvbmQgbGluZXMgYXJlIGxhaWQgb3V0IHNlcXVlbnRpYWxseS4KKyAgICAgICAgLy9JZiB0aGVy ZSBpcyBzb21ldGhpbmcgYmV0d2VlbiB0aGVtIHRoZW4gaXQgbXVzdCBiZSB0aGUgY3NzIGdlbmVy YXRlZAorICAgICAgICAvL2NvbnRlbnQgd2hpY2ggbWVhbnMgdGhpcyBidWcgaXMgbm90IGZpeGVk LgorICAgICAgICBpZihzZWNvbmQub2Zmc2V0VG9wICE9IGZpcnN0Lm9mZnNldFRvcCArIGZpcnN0 Lm9mZnNldEhlaWdodCkKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1 bHQiKS5pbm5lckhUTUwgPSAiRkFJTCI7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHQiKS5pbm5lckhUTUwgPSAiUEFTUyI7CisgICAgfSAg ICAKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKyAgICA8 cD5CdWcgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMy Mjg4Ij4zMjI4ODwvYT4gLSA6YWZ0ZXIgc2VsZWN0b3IgZGlzcGxheXMgaW4gd3JvbmcgcGxhY2Ug d2l0aCBuZXN0ZWQgZGl2PC9wPgorICAgIDxkaXYgY2xhc3M9ImEiIGlkPSJjb250YWluZXIiPgor ICAgICAgICA8ZGl2IGlkPSJmaXJzdCI+Rmlyc3QuPC9kaXY+CisgICAgICAgIDxkaXYgaWQ9InNl Y29uZCI+U2Vjb25kLjwvZGl2PiAgCisgICAgPC9kaXY+CisgICAgPHAgaWQ9InJlc3VsdCI+PC9k aXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==