94604 2012-08-21 08:12:11 -0700 Fix cross-direction stretch for replaced elements in column flexbox 2012-08-23 16:40:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 shezbaig.wk shezbaig.wk eric ojan tony webkit.review.bot oldest_to_newest 700770 0 shezbaig.wk 2012-08-21 08:12:11 -0700 Cross direction stretch should ignore intrinsic width of replaced elements, but take into account fixed size, min-size and max-size. See bug 94237 for more discussion about this. 702418 1 160020 shezbaig.wk 2012-08-22 15:26:02 -0700 Created attachment 160020 Patch 702633 2 160020 ojan 2012-08-22 19:16:39 -0700 Comment on attachment 160020 Patch Can you add test cases that set min-width/max-width to a pixel value, a percent value, fit-content, min-content, max-content and fill-available? See http://dev.w3.org/csswg/css3-sizing/ if you're unfamilar with the last four of those (or just see the test-cases we have for those). Also, sigh...as I look at this more closely, I think maybe our last patch was not the best. Instead of logicalHeightConstrainedByMinMax, we should have added constrainLogicalHeightByMinMax, which just takes a height value and constrains it: LayoutUnit minH = computeLogicalHeightUsing(MinSize, styleToUse->logicalMinHeight()); // Leave as -1 if unset. LayoutUnit maxH = styleToUse->logicalMaxHeight().isUndefined() ? result : computeLogicalHeightUsing(MaxSize, styleToUse->logicalMaxHeight()); if (maxH == -1) maxH = result; result = min(maxH, result); result = max(minH, result); return result; Since, in this case, we know the height is auto, we don't need to do the first few lines that are currently at the beginning of logicalHeightConstrainedByMinMax. Also, we'll need this same stretching logic for RenderGrid only if the height/width is auto. So, I'm thinking the above change makes sense, WDYT? Then we could get the logicalWidth case to do something similar so we can share more code with RenderBox: 1. Add a constrainLogicalWidthByMinMax(availableWidth) that does the equivalent of constrainLogicalHeightByMinMax. 2. Restructure RenderBox::computeLogicalWidthInRegion to use constrainLogicalHeightByMinMax. 3. Use constrainLogicalHeightByMinMax here in RenderFlexibleBox. Then you don't need computeStretchedLogicalWidthUsing and you'll handle the above test-cases I suggested correctly. 702961 3 shezbaig.wk 2012-08-23 07:23:26 -0700 Thanks for the review. (In reply to comment #2) > (From update of attachment 160020 [details]) > Can you add test cases that set min-width/max-width to a pixel value, a percent value, fit-content, min-content, max-content and fill-available? See http://dev.w3.org/csswg/css3-sizing/ if you're unfamilar with the last four of those (or just see the test-cases we have for those). > Will do. > Also, sigh...as I look at this more closely, I think maybe our last patch was not the best. Instead of logicalHeightConstrainedByMinMax, we should have added constrainLogicalHeightByMinMax, which just takes a height value and constrains it: > LayoutUnit minH = computeLogicalHeightUsing(MinSize, styleToUse->logicalMinHeight()); // Leave as -1 if unset. > LayoutUnit maxH = styleToUse->logicalMaxHeight().isUndefined() ? result : computeLogicalHeightUsing(MaxSize, styleToUse->logicalMaxHeight()); > if (maxH == -1) > maxH = result; > result = min(maxH, result); > result = max(minH, result); > return result; > > Since, in this case, we know the height is auto, we don't need to do the first few lines that are currently at the beginning of logicalHeightConstrainedByMinMax. Also, we'll need this same stretching logic for RenderGrid only if the height/width is auto. So, I'm thinking the above change makes sense, WDYT? > Agreed, I've entered bug 94807 to do this as a separate patch since this will be a relatively simple change. > Then we could get the logicalWidth case to do something similar so we can share more code with RenderBox: > 1. Add a constrainLogicalWidthByMinMax(availableWidth) that does the equivalent of constrainLogicalHeightByMinMax. > 2. Restructure RenderBox::computeLogicalWidthInRegion to use constrainLogicalHeightByMinMax. > 3. Use constrainLogicalHeightByMinMax here in RenderFlexibleBox. > > Then you don't need computeStretchedLogicalWidthUsing and you'll handle the above test-cases I suggested correctly. Will do. It might be a little more complicated than that though, because computeLogicalWidthInRegion call computeLogicalWidthInRegionUsing when constraining the min/max width. These functions take "region" and "offsetFromLogicalTopOfFirstPage" arguments, which I'm assuming we would need to compute in RenderFlexibleBox? I'll experiment with this today. Thanks! 703169 4 ojan 2012-08-23 11:15:52 -0700 (In reply to comment #3) > Will do. It might be a little more complicated than that though, because computeLogicalWidthInRegion call computeLogicalWidthInRegionUsing when constraining the min/max width. These functions take "region" and "offsetFromLogicalTopOfFirstPage" arguments, which I'm assuming we would need to compute in RenderFlexibleBox? I'll experiment with this today. Oh right. I knew I was forgetting something. Using computeLogicalWidthInRegionUsing is correct I think. You can just pass 0 for both of those arguments for now. It's not clear how flexbox and regions are supposed to interact exactly anyways. That's what RenderBox::computeLogicalWidth does. It calls computeLogicalWidthInRegion without any arguments (see the default arguments for computeLogicalWidthInRegion in RenderBox.h). 703343 5 160237 shezbaig.wk 2012-08-23 14:05:44 -0700 Created attachment 160237 Patch (with changes from comment 2) 703386 6 160237 ojan 2012-08-23 14:36:19 -0700 Comment on attachment 160237 Patch (with changes from comment 2) View in context: https://bugs.webkit.org/attachment.cgi?id=160237&action=review Looks great. Just a few nits. > Source/WebCore/rendering/RenderBox.cpp:440 > + // Constrain by MaxSize. I know the old code had these comments, but they're just stating what the code obviously does. Mind deleting these while you're in here? > Source/WebCore/rendering/RenderBox.cpp:443 > + // Constrain by MinSize. ditto > Source/WebCore/rendering/RenderBox.cpp:1702 > + // Calculate LogicalWidth constrained by MaxLogicalWidth and MinLogicalWidth ditto > LayoutTests/css3/flexbox/flexitem.html:130 > + <img data-expected-display="block" data-expected-height="60" style="min-height:60px" src="../images/resources/blue-100.png"> I think we have enough coverage of the expected-display. Mind remove this from these new tests? It adds clutter that makes it harder to see what the test actually cares about. > LayoutTests/platform/chromium/TestExpectations:-3513 > -BUGWK94675 : css3/flexbox/flexitem.html = TEXT TL;DR: I think we still need this line for now. I think there's still the issue with the image cases that are flakily giving the wrong results, so I think we need to leave this in until we figure out what's going wrong there. I was hoping that once we got this checked in it would filter out the cases that were due to the column-flow issue so we can see where the flaky image failures happen across platforms and try to reproduce it locally. 703405 7 160253 shezbaig.wk 2012-08-23 14:46:24 -0700 Created attachment 160253 Patch (with changes from comment 6) 703408 8 160253 ojan 2012-08-23 14:47:05 -0700 Comment on attachment 160253 Patch (with changes from comment 6) Thanks! 703412 9 shezbaig.wk 2012-08-23 14:49:04 -0700 Thank *you*! :) 703489 10 160253 webkit.review.bot 2012-08-23 15:50:51 -0700 Comment on attachment 160253 Patch (with changes from comment 6) Rejecting attachment 160253 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: content): Merge conflict in LayoutTests/ChangeLog Failed to merge in the changes. Patch failed at 0001 Trailing spaces in CSP source lists should not generate console warnings. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/13564862 703511 11 160253 ojan 2012-08-23 16:15:42 -0700 Comment on attachment 160253 Patch (with changes from comment 6) Trying again to see if applying the ChangeLog failing was just a fluke. 703531 12 160253 webkit.review.bot 2012-08-23 16:40:47 -0700 Comment on attachment 160253 Patch (with changes from comment 6) Clearing flags on attachment: 160253 Committed r126503: <http://trac.webkit.org/changeset/126503> 703532 13 webkit.review.bot 2012-08-23 16:40:51 -0700 All reviewed patches have been landed. Closing bug. 160020 2012-08-22 15:26:02 -0700 2012-08-23 14:04:45 -0700 Patch bug-94604-20120822182601.patch text/plain 9427 shezbaig.wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0YTdjM2YzMmNkMjI5 YjM0NTQwZGMxMjg4ODYzODBjMzc1NjFiOC4uNzk2ZDI5NmIxOTIyYzc1N2RkYmI3MzdmOWZhZDE0 ZWJjOTQ2YjgyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA4LTIyICBTaGV6 YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNvbT4KKworICAgICAgICBGaXggY3Jvc3MtZGly ZWN0aW9uIHN0cmV0Y2ggZm9yIHJlcGxhY2VkIGVsZW1lbnRzIGluIGNvbHVtbiBmbGV4Ym94Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDYwNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gc3RyZXRj aGluZyB0aGUgd2lkdGggb2YgY2hpbGRyZW4gaW4gY29sdW1uIGZsb3csIHdlIGNhbm5vdCB1c2Ug dGhlCisgICAgICAgIGxvZ2ljYWwgd2lkdGggY29tcHV0ZWQgZnJvbSBjb21wdXRlTG9naWNhbFdp ZHRoLCBiZWNhdXNlIHRoaXMgaXMgYWx3YXlzCisgICAgICAgIHNocnVuayB0byB0aGUgaW50cmlu c2ljIHNpemUuIEluc3RlYWQsIGEgbmV3IGhlbHBlciBtZXRob2QgaXMgdXNlZCB0bworICAgICAg ICBjb21wdXRlIHRoZSBzdHJldGNoZWQgbG9naWNhbCB3aWR0aCwgYmFzZWQgb24gdGhlIGF2YWls YWJsZSB3aWR0aCBpbgorICAgICAgICB0aGUgY3Jvc3MgZGlyZWN0aW9uLgorCisgICAgICAgIElu IHRoaXMgY2hhbmdlLCB3ZSBhbHNvIHRha2UgdGhlIGxvZ2ljYWxNaW5XaWR0aCBhbmQgbG9naWNh bE1heFdpZHRoCisgICAgICAgIGludG8gY29uc2lkZXJhdGlvbi4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFRoZSBleGlzdGluZyBjc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbCB0ZXN0IGNvdmVy cyB0aGlzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjphcHBseVN0cmV0Y2hBbGlnbm1lbnRU b0NoaWxkKTogVXNlCisgICAgICAgIGNvbXB1dGVTdHJldGNoZWRMb2dpY2FsV2lkdGhVc2luZyBm b3Igc3RyZXRjaGluZyBjaGlsZHJlbiB3aGVuIGluCisgICAgICAgIGNvbHVtbiBmbG93IG1vZGUu CisgICAgICAgIGZsb3cuCisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckZsZXhpYmxlQm94Ojpjb21wdXRlU3RyZXRjaGVkTG9naWNhbFdpZHRoVXNpbmcpOiBOZXcK KyAgICAgICAgaGVscGVyIG1ldGhvZCB0byBjb21wdXRlIHRoZSBzdHJldGNoZWQgbG9naWNhbCB3 aWR0aC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKwogMjAxMi0w OC0yMiAgS29qaSBJc2hpaSAgPGtvamlpc2hpQGdtYWlsLmNvbT4KIAogICAgICAgICBGb250TWV0 cmljcy51bml0c1BlckVtKCksIEZvbnRQbGF0Zm9ybURhdGEub3JpZW50YXRpb24oKSwgU2ltcGxl Rm9udERhdGE6OnBsYXRmb3JtQm91bmRzRm9yR2x5cGggYXJlIG5vdCBpbXBsZW1lbnRlZCBvbiBD aHJvbWl1bSBXaW5kb3dzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcAppbmRleCA0NDhkNGRhNmRkY2Q4MjIyZmRkYThlNmRhODk1OTEyNzQ2YWUzOWFm Li4zZmM5ZDYyNzAwNWFiM2UwYzBiZTNhNmIzYjFmNmU0ZjBhZDU1ZTQ1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTEyMzMsNyArMTIz Myw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmFsaWduQ2hpbGRyZW4oT3JkZXJJdGVyYXRv ciYgaXRlcmF0b3IsIGNvbnN0IFdURjo6VmVjdG9yCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojph cHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkKFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQg bGluZUNyb3NzQXhpc0V4dGVudCkKIHsKICAgICBpZiAoIWlzQ29sdW1uRmxvdygpICYmIGNoaWxk LT5zdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCkpIHsKLSAgICAgICAgLy8gRklYTUU6 IElmIHRoZSBjaGlsZCBoYXMgb3J0aG9nb25hbCBmbG93LCB0aGVuIGl0IGFscmVhZHkgaGFzIGFu IG92ZXJyaWRlIGhlaWdodCBzZXQuIEhvdyBkbyB3ZSBzdHJldGNoPworICAgICAgICAvLyBGSVhN RTogSWYgdGhlIGNoaWxkIGhhcyBvcnRob2dvbmFsIGZsb3csIHRoZW4gaXQgYWxyZWFkeSBoYXMg YW4gb3ZlcnJpZGUgaGVpZ2h0IHNldCwgc28gdXNlIGl0LgogICAgICAgICBpZiAoIWhhc09ydGhv Z29uYWxGbG93KGNoaWxkKSkgewogICAgICAgICAgICAgTGF5b3V0VW5pdCBzdHJldGNoZWRMb2dp Y2FsSGVpZ2h0ID0gY2hpbGQtPmxvZ2ljYWxIZWlnaHQoKSArIGF2YWlsYWJsZUFsaWdubWVudFNw YWNlRm9yQ2hpbGQobGluZUNyb3NzQXhpc0V4dGVudCwgY2hpbGQpOwogICAgICAgICAgICAgTGF5 b3V0VW5pdCBkZXNpcmVkTG9naWNhbEhlaWdodCA9IGNoaWxkLT5sb2dpY2FsSGVpZ2h0Q29uc3Ry YWluZWRCeU1pbk1heChzdHJldGNoZWRMb2dpY2FsSGVpZ2h0KTsKQEAgLTEyNDYsMTQgKzEyNDYs NDIgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGls ZChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbmkKICAgICAgICAgICAgICAgICBjaGlsZC0+bGF5 b3V0SWZOZWVkZWQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAo aXNDb2x1bW5GbG93KCkgJiYgY2hpbGQtPnN0eWxlKCktPmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygp ICYmIGlzTXVsdGlsaW5lKCkpIHsKLSAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBtaW4td2lkdGgg YW5kIG1heC13aWR0aC4KLSAgICAgICAgLy8gRklYTUU6IFdlIG9ubHkgbmVlZCB0byByZWxheW91 dCBoZXJlIGlmIHRoZSB3aWR0aCBjaGFuZ2VzLgotICAgICAgICAvLyBGSVhNRTogVGhlIGlzTXVs dGlsaW5lIGNoZWNrIGFib3ZlIG1heSBub3QgYmUgbmVjZXNzYXJ5IGlmIHRoZSB3aWR0aCBoYXMg bm90IGNoYW5nZWQuIFNlZSBodHRwczovL3dlYmtpdC5vcmcvYi85NDIzNwotICAgICAgICBMYXlv dXRVbml0IGNoaWxkV2lkdGggPSBsaW5lQ3Jvc3NBeGlzRXh0ZW50IC0gY3Jvc3NBeGlzTWFyZ2lu RXh0ZW50Rm9yQ2hpbGQoY2hpbGQpOwotICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVMb2dpY2Fs Q29udGVudFdpZHRoKHN0ZDo6bWF4KFpFUk9fTEFZT1VUX1VOSVQsIGNoaWxkV2lkdGgpKTsKLSAg ICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgTWFya09ubHlUaGlzKTsKLSAg ICAgICAgY2hpbGQtPmxheW91dElmTmVlZGVkKCk7CisgICAgfSBlbHNlIGlmIChpc0NvbHVtbkZs b3coKSAmJiBjaGlsZC0+c3R5bGUoKS0+bG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpIHsKKyAgICAg ICAgLy8gRklYTUU6IElmIHRoZSBjaGlsZCBkb2Vzbid0IGhhdmUgb3J0aG9nb25hbCBmbG93LCB0 aGVuIGl0IGFscmVhZHkgaGFzIG92ZXJyaWRlIHdpZHRoIHNldCwgc28gdXNlIGl0LgorICAgICAg ICBpZiAoaGFzT3J0aG9nb25hbEZsb3coY2hpbGQpKSB7CisgICAgICAgICAgICBMYXlvdXRVbml0 IGF2YWlsYWJsZVdpZHRoID0gbGluZUNyb3NzQXhpc0V4dGVudCAtIGNyb3NzQXhpc01hcmdpbkV4 dGVudEZvckNoaWxkKGNoaWxkKTsKKyAgICAgICAgICAgIExheW91dFVuaXQgZGVzaXJlZFdpZHRo ID0gY29tcHV0ZVN0cmV0Y2hlZExvZ2ljYWxXaWR0aFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUs IGNoaWxkLT5zdHlsZSgpLT5sb2dpY2FsV2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgpOworICAgICAg ICAgICAgTGF5b3V0VW5pdCBtaW5pbXVtV2lkdGggPSBjb21wdXRlU3RyZXRjaGVkTG9naWNhbFdp ZHRoVXNpbmcoTWluU2l6ZSwgY2hpbGQtPnN0eWxlKCktPmxvZ2ljYWxNaW5XaWR0aCgpLCBhdmFp bGFibGVXaWR0aCk7CisgICAgICAgICAgICBMYXlvdXRVbml0IG1heGltdW1XaWR0aCA9IGNvbXB1 dGVTdHJldGNoZWRMb2dpY2FsV2lkdGhVc2luZyhNYXhTaXplLCBjaGlsZC0+c3R5bGUoKS0+bG9n aWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoKTsKKyAgICAgICAgICAgIExheW91dFVuaXQg Y2hpbGRXaWR0aCA9IHN0ZDo6bWluKG1heGltdW1XaWR0aCwgc3RkOjptYXgobWluaW11bVdpZHRo LCBkZXNpcmVkV2lkdGgpKTsKKworICAgICAgICAgICAgaWYgKGNoaWxkV2lkdGggIT0gY2hpbGQt PmxvZ2ljYWxXaWR0aCgpKSB7CisgICAgICAgICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlTG9n aWNhbENvbnRlbnRXaWR0aChjaGlsZFdpZHRoKTsKKyAgICAgICAgICAgICAgICBjaGlsZC0+c2V0 Q2hpbGROZWVkc0xheW91dCh0cnVlLCBNYXJrT25seVRoaXMpOworICAgICAgICAgICAgICAgIGNo aWxkLT5sYXlvdXRJZk5lZWRlZCgpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQor fQorCitMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlU3RyZXRjaGVkTG9naWNh bFdpZHRoVXNpbmcoU2l6ZVR5cGUgc2l6ZVR5cGUsIExlbmd0aCBsZW5ndGgsIExheW91dFVuaXQg YXZhaWxhYmxlV2lkdGgpIGNvbnN0Cit7CisgICAgc3dpdGNoIChsZW5ndGgudHlwZSgpKSB7Cisg ICAgY2FzZSBGaXhlZDoKKyAgICBjYXNlIFBlcmNlbnQ6CisgICAgY2FzZSBDYWxjdWxhdGVkOgor ICAgIGNhc2UgVmlld3BvcnRQZXJjZW50YWdlV2lkdGg6CisgICAgY2FzZSBWaWV3cG9ydFBlcmNl bnRhZ2VIZWlnaHQ6CisgICAgY2FzZSBWaWV3cG9ydFBlcmNlbnRhZ2VNaW46CisgICAgY2FzZSBG aWxsQXZhaWxhYmxlOgorICAgIGNhc2UgQXV0bzoKKyAgICAgICAgaWYgKHNpemVUeXBlID09IE1p blNpemUpCisgICAgICAgICAgICByZXR1cm4gbWluaW11bVZhbHVlRm9yTGVuZ3RoKGxlbmd0aCwg YXZhaWxhYmxlV2lkdGgsIHZpZXcoKSk7CisgICAgICAgIHJldHVybiB2YWx1ZUZvckxlbmd0aChs ZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCB2aWV3KCkpOworICAgIGRlZmF1bHQ6CisgICAgICAgIGlm IChzaXplVHlwZSA9PSBNaW5TaXplKQorICAgICAgICAgICAgcmV0dXJuIFpFUk9fTEFZT1VUX1VO SVQ7CisgICAgICAgIHJldHVybiBhdmFpbGFibGVXaWR0aDsKICAgICB9CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggZDQxOGNlODRjNGVl YzU3MmY1M2U5MzBjMzY0Y2FlMmMwOTg2OGU1OS4uOTMxNTA4OTc3ODZiMGQwMjA0NWEwMDg0NGMz NTRmMTBmZmI2MDcxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmgKQEAgLTEzNyw2ICsxMzcsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYWxpZ25GbGV4 TGluZXMoT3JkZXJJdGVyYXRvciYsIFdURjo6VmVjdG9yPExpbmVDb250ZXh0PiYpOwogICAgIHZv aWQgYWxpZ25DaGlsZHJlbihPcmRlckl0ZXJhdG9yJiwgY29uc3QgV1RGOjpWZWN0b3I8TGluZUNv bnRleHQ+Jik7CiAgICAgdm9pZCBhcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkKFJlbmRlckJv eCosIExheW91dFVuaXQgbGluZUNyb3NzQXhpc0V4dGVudCk7CisgICAgTGF5b3V0VW5pdCBjb21w dXRlU3RyZXRjaGVkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUsIExlbmd0aCwgTGF5b3V0VW5p dCkgY29uc3Q7CiAgICAgdm9pZCBmbGlwRm9yUmlnaHRUb0xlZnRDb2x1bW4oT3JkZXJJdGVyYXRv ciYpOwogICAgIHZvaWQgZmxpcEZvcldyYXBSZXZlcnNlKE9yZGVySXRlcmF0b3ImLCBjb25zdCBX VEY6OlZlY3RvcjxMaW5lQ29udGV4dD4mLCBMYXlvdXRVbml0IGNyb3NzQXhpc1N0YXJ0RWRnZSk7 CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCAwMjhkYjY4NDQzMTI3ZTg2YzRmNDIzMmZkOTZiNGQ2YmMzOTkxNGRjLi5jMmUy ZTUxZjdkOGQ2NjliNWZkZjdmMmIwOTA3YTlmOGZlMzkxYmY1IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTItMDgtMjIgIFNoZXphbiBCYWlnICA8c2hlemJhaWcud2tAZ21haWwuY29tPgorCisg ICAgICAgIEZpeCBjcm9zcy1kaXJlY3Rpb24gc3RyZXRjaCBmb3IgcmVwbGFjZWQgZWxlbWVudHMg aW4gY29sdW1uIGZsZXhib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk0NjA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRml4IHRoZSBleHBlY3RlZCB0ZXN0IHJlc3VsdC4KKworICAgICAgICAqIGNzczMv ZmxleGJveC9mbGV4aXRlbS1leHBlY3RlZC50eHQ6CisKIDIwMTItMDgtMjIgIEtvamkgSXNoaWkg IDxrb2ppaXNoaUBnbWFpbC5jb20+CiAKICAgICAgICAgRm9udE1ldHJpY3MudW5pdHNQZXJFbSgp LCBGb250UGxhdGZvcm1EYXRhLm9yaWVudGF0aW9uKCksIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9y bUJvdW5kc0ZvckdseXBoIGFyZSBub3QgaW1wbGVtZW50ZWQgb24gQ2hyb21pdW0gV2luZG93cwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9mbGV4aXRlbS1leHBlY3RlZC50eHQKaW5kZXgg NjI1ZmZkMGJiZWVjOWE4YzkwNGNiOWE0NmIwYzYwMmNmZmZiMmVkYS4uYjRkMzU4MDJhMmQzNDRm OThiNTI0MTNkNTY3NjExMDVmYTk5MTNlMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9m bGV4Ym94L2ZsZXhpdGVtLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhi b3gvZmxleGl0ZW0tZXhwZWN0ZWQudHh0CkBAIC0yNSwzOCArMjUsOSBAQCBQQVNTCiAKIFBBU1MK IAotRkFJTDoKLUV4cGVjdGVkIDEwMHB4IGZvciB3aWR0aCwgYnV0IGdvdCAzMDAuIAotCi08ZGl2 IGNsYXNzPSJmbGV4Ym94IGNvbHVtbiIgc3R5bGU9IndpZHRoOjEwMHB4Ij4KLSAgPCEtLSBGSVhN RTogVGhlIGlmcmFtZSBzaG91bGQgc2hyaW5rIGluIHRoZSBjcm9zcyBkaXJlY3Rpb246IGh0dHBz Oi8vd2Via2l0Lm9yZy9iLzk0NjA0IC0tPgotICA8aWZyYW1lIGRhdGEtZXhwZWN0ZWQtZGlzcGxh eT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMHB4IiBzcmM9ImRhdGE6dGV4dC9odG1s LCZsdDtib2R5IGJnY29sb3I9I2ZmZiZndDtpZnJhbWUmbHQ7L2JvZHkmZ3Q7Ij48L2lmcmFtZT4K LSAgPGlmcmFtZSBzZWFtbGVzcz0iIiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRh LWV4cGVjdGVkLXdpZHRoPSIxMDBweCIgc3JjPSJkYXRhOnRleHQvaHRtbCwmbHQ7Ym9keSBiZ2Nv bG9yPSNmZmYmZ3Q7aWZyYW1lJmx0Oy9ib2R5Jmd0OyI+PC9pZnJhbWU+Ci08L2Rpdj4KK1BBU1MK IGJ1dHRvbgogCiBvYmplY3QKIAotRkFJTDoKLUV4cGVjdGVkIDYwMCBmb3Igd2lkdGgsIGJ1dCBn b3QgMzQuIAotRXhwZWN0ZWQgNjAwIGZvciB3aWR0aCwgYnV0IGdvdCA2MC4gCi1FeHBlY3RlZCA2 MDAgZm9yIHdpZHRoLCBidXQgZ290IDMwMC4gCi1FeHBlY3RlZCA2MDAgZm9yIHdpZHRoLCBidXQg Z290IDU2LiAKLUV4cGVjdGVkIDYwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTU1LiAKLQotPGRpdiBj bGFzcz0iZmxleGJveCBjb2x1bW4iIHN0eWxlPSJoZWlnaHQ6MjEwcHgiPgotICA8IS0tIEZJWE1F OiBUaGUgYnV0dG9uIHNob3VsZCBzdHJldGNoIGluIHRoZSBjcm9zcyBkaXJlY3Rpb24uIC0tPgot ICA8YnV0dG9uIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lk dGg9IjYwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwIj5idXR0b248L2J1dHRvbj4KLSAgPCEt LSBGSVhNRTogVGhlIGNhbnZhcyBzaG91bGQgc3RyZXRjaCBpbiB0aGUgY3Jvc3MgZGlyZWN0aW9u OiBodHRwczovL3dlYmtpdC5vcmcvYi85NDYwNCAtLT4KLSAgPGNhbnZhcyBkYXRhLWV4cGVjdGVk LWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSIzMCIgc3R5bGU9ImhlaWdodDozMHB4Ij5jYW52YXM8L2NhbnZhcz4KLSAgPCEtLSBG SVhNRTogVGhlIGlmcmFtZSBzaG91bGQgc3RyZXRjaCBpbiB0aGUgY3Jvc3MgZGlyZWN0aW9uOiBo dHRwczovL3dlYmtpdC5vcmcvYi85NDYwNCAtLT4KLSAgPGlmcmFtZSBkYXRhLWV4cGVjdGVkLWRp c3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVp Z2h0PSIzMCIgc3R5bGU9ImhlaWdodDozMHB4IiBzcmM9ImRhdGE6dGV4dC9odG1sLCZsdDtib2R5 IGJnY29sb3I9I2ZmZiZndDtpZnJhbWUmbHQ7L2JvZHkmZ3Q7Ij48L2lmcmFtZT4KLSAgPGlmcmFt ZSBzZWFtbGVzcz0iIiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMCIgc3R5bGU9ImhlaWdodDozMHB4 IiBzcmM9ImRhdGE6dGV4dC9odG1sLCZsdDtib2R5IGJnY29sb3I9I2ZmZiZndDtpZnJhbWUmbHQ7 L2JvZHkmZ3Q7Ij48L2lmcmFtZT4KLSAgPG9iamVjdCBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJs b2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMCI+ b2JqZWN0PC9vYmplY3Q+Ci0gIDwhLS0gRklYTUU6IFRoZSBzZWxlY3Qgc2hvdWxkIHN0cmV0Y2gg aW4gdGhlIGNyb3NzIGRpcmVjdGlvbi4gLS0+Ci0gIDxzZWxlY3QgZGF0YS1leHBlY3RlZC1kaXNw bGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNjAwIiBkYXRhLWV4cGVjdGVkLWhlaWdo dD0iMzAiPgotICAgIDxvcHRpb24+c2VsZWN0PC9vcHRpb24+Ci0gIDwvc2VsZWN0PgotICA8IS0t IEZJWE1FOiBUaGUgdGV4dGFyZWEgc2hvdWxkIHN0cmV0Y2ggaW4gdGhlIGNyb3NzIGRpcmVjdGlv bi4gLS0+Ci0gIDx0ZXh0YXJlYSBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMCI+dGV4dGFyZWE8L3Rl eHRhcmVhPgotPC9kaXY+CitQQVNTCg== 160237 2012-08-23 14:05:44 -0700 2012-08-23 14:45:48 -0700 Patch (with changes from comment 2) bug-94604-20120823170526.patch text/plain 17366 shezbaig.wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E5YWNiODA5MmJjYzkz Nzk1NjExYWNhNDI4ODcyMjViZmY5YjQxYS4uMDcwYWE5OTI1MDM3MDI3ZDRkZjFkYzliNTY4ZDE1 MzFmMjRlZjdkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDEyLTA4LTIzICBTaGV6 YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNvbT4KIAorICAgICAgICBGaXggY3Jvc3MtZGly ZWN0aW9uIHN0cmV0Y2ggZm9yIHJlcGxhY2VkIGVsZW1lbnRzIGluIGNvbHVtbiBmbGV4Ym94Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDYwNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIHRoZSBs b2dpYyB0aGF0IGNvbnN0cmFpbnMgbG9naWNhbCB3aWR0aCBieSBNaW5TaXplIGFuZCBNYXhTaXpl IHRvCisgICAgICAgIGEgbmV3IGhlbHBlciBmdW5jdGlvbiBjYWxsZWQgY29uc3RyYWluTG9naWNh bFdpZHRoSW5SZWdpb25CeU1pbk1heC4KKyAgICAgICAgVGhpcyBoZWxwZXIgZnVuY3Rpb24gaXMg dXNlZCBmcm9tIGJvdGggY29tcHV0ZUxvZ2ljYWxXaWR0aEluUmVnaW9uIGFuZAorICAgICAgICBS ZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZC4KKworICAgICAg ICBSZW5kZXJGbGV4aWJsZUJveCBubyBsb25nZXIgY2hlY2tzIGZvciBpc011bHRpbGluZSB3aGVu IHN0cmV0Y2hpbmcKKyAgICAgICAgZWxlbWVudHMgaW4gYSBjb2x1bW4gZmxleGJveC4gSW5zdGVh ZCwgd2Ugbm93IGNvbnN0cmFpbiB0aGUgYXZhaWxhYmxlCisgICAgICAgIHdpZHRoIGJ5IHRoZSBj aGlsZCdzIG1pbi13aWR0aCBhbmQgbWF4LXdpZHRoLCBhbmQgc2V0IHRoZSBvdmVycmlkZQorICAg ICAgICB3aWR0aCBvbmx5IGlmIHRoYXQgY29uc3RyYWluZWQgd2lkdGggaXMgZGlmZmVyZW50IGZy b20gdGhlIGNoaWxkJ3MKKyAgICAgICAgY3VycmVudCBsb2dpY2FsV2lkdGguCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBUaGUgZXhpc3RpbmcgY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLmh0bWwgdGVz dCB3YXMgZXh0ZW5kZWQKKyAgICAgICAgdG8gZXhlcmNpc2UgdGhlIG5ldyBjb2RlLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC b3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9uQnlNaW5NYXgpOiBOZXcgaGVscGVyCisg ICAgICAgIG1ldGhvZCB0byBjb25zdHJhaW4gbG9naWNhbCB3aWR0aCBieSBtaW4td2lkdGggYW5k IG1heC13aWR0aC4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb24pOiBDaGFuZ2VkIHRvIHVzZSB0aGUKKyAg ICAgICAgbmV3IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9uQnlNaW5NYXggaGVscGVyIG1l dGhvZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChSZW5kZXJC b3gpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGls ZCk6IENoYW5nZWQgdG8KKyAgICAgICAgdXNlIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9u QnlNaW5NYXggdG8gZGV0ZXJtaW5lIHRoZSBvdmVycmlkZQorICAgICAgICB3aWR0aCBmb3IgdGhl IGNoaWxkLgorCisyMDEyLTA4LTIzICBTaGV6YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNv bT4KKwogICAgICAgICBGbGV4Ym94IGRvZXNuJ3QgbmVlZCB0byBjb21wdXRlIGxvZ2ljYWwgaGVp Z2h0IGZvciBzdHJldGNoZWQgaXRlbXMgaW4gcm93IGZsb3cKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODA3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKaW5kZXggNWVjNmRmOTU3ZDJhMGI1ZjE4Y2JhOTM2ZjE4MGFlM2FlMmU1 NzI4Ni4uNGQ0YWMzMzhjZDM2ZTJmMzAxZmUxZTJlNWMwNDIwZWJmMzk2MTBlNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTQzMyw2ICs0MzMsMTcgQEAgdm9pZCBS ZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKICAgICAgICAgbGF5ZXIoKS0+dXBkYXRl VHJhbnNmb3JtKCk7CiB9CiAKK0xheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2Fs V2lkdGhJblJlZ2lvbkJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0 IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayogY2IsIFJlbmRlclJlZ2lvbiogcmVnaW9uLCBM YXlvdXRVbml0IG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UpCit7CisgICAgUmVuZGVy U3R5bGUqIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOworICAgIGlmICghc3R5bGVUb1VzZS0+bG9naWNh bE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSkgeworICAgICAgICAvLyBDb25zdHJhaW4gYnkgTWF4 U2l6ZS4KKyAgICAgICAgbG9naWNhbFdpZHRoID0gbWluKGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxv Z2ljYWxXaWR0aEluUmVnaW9uVXNpbmcoTWF4U2l6ZSwgYXZhaWxhYmxlV2lkdGgsIGNiLCByZWdp b24sIG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UpKTsKKyAgICB9CisgICAgLy8gQ29u c3RyYWluIGJ5IE1pblNpemUuCisgICAgcmV0dXJuIG1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVM b2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKE1pblNpemUsIGF2YWlsYWJsZVdpZHRoLCBjYiwgcmVn aW9uLCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKSk7Cit9CisKIExheW91dFVuaXQg UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dp Y2FsSGVpZ2h0KQogewogICAgIFJlbmRlclN0eWxlKiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKQEAg LTE2ODgsMjAgKzE2OTksOSBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aElu UmVnaW9uKFJlbmRlclJlZ2lvbiogcmVnaW9uLCBMYXlvdXRVbml0IG9mZgogICAgIGlmICh0cmVh dEFzUmVwbGFjZWQpCiAgICAgICAgIHNldExvZ2ljYWxXaWR0aChsb2dpY2FsV2lkdGhMZW5ndGgu dmFsdWUoKSArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSk7CiAgICAgZWxzZSB7Ci0g ICAgICAgIC8vIENhbGN1bGF0ZSBMb2dpY2FsV2lkdGgKLSAgICAgICAgc2V0TG9naWNhbFdpZHRo KGNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKE1haW5PclByZWZlcnJlZFNpemUsIGNv bnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sIGNiLCByZWdpb24sIG9mZnNldEZyb21Mb2dp Y2FsVG9wT2ZGaXJzdFBhZ2UpKTsKLQotICAgICAgICAvLyBDYWxjdWxhdGUgTWF4TG9naWNhbFdp ZHRoCi0gICAgICAgIGlmICghc3R5bGVUb1VzZS0+bG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmlu ZWQoKSkgewotICAgICAgICAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRl TG9naWNhbFdpZHRoSW5SZWdpb25Vc2luZyhNYXhTaXplLCBjb250YWluZXJXaWR0aEluSW5saW5l RGlyZWN0aW9uLCBjYiwgcmVnaW9uLCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKTsK LSAgICAgICAgICAgIGlmIChsb2dpY2FsV2lkdGgoKSA+IG1heExvZ2ljYWxXaWR0aCkKLSAgICAg ICAgICAgICAgICBzZXRMb2dpY2FsV2lkdGgobWF4TG9naWNhbFdpZHRoKTsKLSAgICAgICAgfQot Ci0gICAgICAgIC8vIENhbGN1bGF0ZSBNaW5Mb2dpY2FsV2lkdGgKLSAgICAgICAgTGF5b3V0VW5p dCBtaW5Mb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb25Vc2luZyhNaW5T aXplLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCBjYiwgcmVnaW9uLCBvZmZzZXRG cm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKTsKLSAgICAgICAgaWYgKGxvZ2ljYWxXaWR0aCgpIDwg bWluTG9naWNhbFdpZHRoKQotICAgICAgICAgICAgc2V0TG9naWNhbFdpZHRoKG1pbkxvZ2ljYWxX aWR0aCk7CisgICAgICAgIC8vIENhbGN1bGF0ZSBMb2dpY2FsV2lkdGggY29uc3RyYWluZWQgYnkg TWF4TG9naWNhbFdpZHRoIGFuZCBNaW5Mb2dpY2FsV2lkdGgKKyAgICAgICAgTGF5b3V0VW5pdCBw cmVmZXJyZWRXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKE1haW5PclBy ZWZlcnJlZFNpemUsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sIGNiLCByZWdpb24s IG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UpOworICAgICAgICBzZXRMb2dpY2FsV2lk dGgoY29uc3RyYWluTG9naWNhbFdpZHRoSW5SZWdpb25CeU1pbk1heChwcmVmZXJyZWRXaWR0aCwg Y29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgY2IsIHJlZ2lvbiwgb2Zmc2V0RnJvbUxv Z2ljYWxUb3BPZkZpcnN0UGFnZSkpOwogICAgIH0KIAogICAgIC8vIEZpZWxkc2V0cyBhcmUgY3Vy cmVudGx5IHRoZSBvbmx5IG9iamVjdHMgdGhhdCBzdHJldGNoIHRvIHRoZWlyIG1pbmltdW0gd2lk dGguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggNGFmZmJjMGM3ZDUwNDFh NDRmZDgyZGI4MTJiYzU4NmM4NTU1ZTk1ZC4uZjE0M2M1YzA2ZWI3OTlhNDY5M2ExZDRiNjRmMGEy ZmZlY2NjOTkxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtNzUsNiAr NzUsNyBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJl dHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gd2lkdGgoKSA6IGhlaWdo dCgpOyB9CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3R5 bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgpIDogd2lkdGgoKTsgfQog CisgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJblJlZ2lvbkJ5TWluTWF4KExh eW91dFVuaXQsIExheW91dFVuaXQsIFJlbmRlckJsb2NrKiwgUmVuZGVyUmVnaW9uKiA9IDAsIExh eW91dFVuaXQgb2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSA9IFpFUk9fTEFZT1VUX1VO SVQpOwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91 dFVuaXQpOwogCiAgICAgaW50IHBpeGVsU25hcHBlZExvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJl dHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gcGl4ZWxTbmFwcGVkSGVp Z2h0KCkgOiBwaXhlbFNuYXBwZWRXaWR0aCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBmNDAyMDFmZWU0YzU0YzRmOTc3NjZjYzNi MTE5OGZmOThmMGYzNzhhLi45Zjg3Y2Y4MzVhYzU5MDc0NmI0YTc1YTAxYTE2MzczZjQ4MDc3MTQ3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK QEAgLTEyNDYsMTQgKzEyNDYsMTggQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlTdHJl dGNoQWxpZ25tZW50VG9DaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbmkKICAgICAgICAg ICAgICAgICBjaGlsZC0+bGF5b3V0SWZOZWVkZWQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQotICAgIH0gZWxzZSBpZiAoaXNDb2x1bW5GbG93KCkgJiYgY2hpbGQtPnN0eWxlKCktPmxvZ2lj YWxXaWR0aCgpLmlzQXV0bygpICYmIGlzTXVsdGlsaW5lKCkpIHsKLSAgICAgICAgLy8gRklYTUU6 IEhhbmRsZSBtaW4td2lkdGggYW5kIG1heC13aWR0aC4KLSAgICAgICAgLy8gRklYTUU6IFdlIG9u bHkgbmVlZCB0byByZWxheW91dCBoZXJlIGlmIHRoZSB3aWR0aCBjaGFuZ2VzLgotICAgICAgICAv LyBGSVhNRTogVGhlIGlzTXVsdGlsaW5lIGNoZWNrIGFib3ZlIG1heSBub3QgYmUgbmVjZXNzYXJ5 IGlmIHRoZSB3aWR0aCBoYXMgbm90IGNoYW5nZWQuIFNlZSBodHRwczovL3dlYmtpdC5vcmcvYi85 NDIzNwotICAgICAgICBMYXlvdXRVbml0IGNoaWxkV2lkdGggPSBsaW5lQ3Jvc3NBeGlzRXh0ZW50 IC0gY3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9yQ2hpbGQoY2hpbGQpOwotICAgICAgICBjaGlsZC0+ c2V0T3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKHN0ZDo6bWF4KFpFUk9fTEFZT1VUX1VOSVQs IGNoaWxkV2lkdGgpKTsKLSAgICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwg TWFya09ubHlUaGlzKTsKLSAgICAgICAgY2hpbGQtPmxheW91dElmTmVlZGVkKCk7CisgICAgfSBl bHNlIGlmIChpc0NvbHVtbkZsb3coKSAmJiBjaGlsZC0+c3R5bGUoKS0+bG9naWNhbFdpZHRoKCku aXNBdXRvKCkpIHsKKyAgICAgICAgLy8gRklYTUU6IElmIHRoZSBjaGlsZCBkb2Vzbid0IGhhdmUg b3J0aG9nb25hbCBmbG93LCB0aGVuIGl0IGFscmVhZHkgaGFzIGFuIG92ZXJyaWRlIHdpZHRoIHNl dCwgc28gdXNlIGl0LgorICAgICAgICBpZiAoaGFzT3J0aG9nb25hbEZsb3coY2hpbGQpKSB7Cisg ICAgICAgICAgICBMYXlvdXRVbml0IGNoaWxkV2lkdGggPSBzdGQ6Om1heChaRVJPX0xBWU9VVF9V TklULCBsaW5lQ3Jvc3NBeGlzRXh0ZW50IC0gY3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9yQ2hpbGQo Y2hpbGQpKTsKKyAgICAgICAgICAgIGNoaWxkV2lkdGggPSBjaGlsZC0+Y29uc3RyYWluTG9naWNh bFdpZHRoSW5SZWdpb25CeU1pbk1heChjaGlsZFdpZHRoLCBjaGlsZFdpZHRoLCB0aGlzKTsKKwor ICAgICAgICAgICAgaWYgKGNoaWxkV2lkdGggIT0gY2hpbGQtPmxvZ2ljYWxXaWR0aCgpKSB7Cisg ICAgICAgICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aChjaGls ZFdpZHRoKTsKKyAgICAgICAgICAgICAgICBjaGlsZC0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVl LCBNYXJrT25seVRoaXMpOworICAgICAgICAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgp OworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzU5NTAxMTgz MTE3ODBiYWViYjI3NWMxOGIxZDU4ZDdhNTUxYTY5ZC4uM2IxNDY2ZWU5ODM1NzE4ZGU0ZjJkNmFm YTRmNjBjNjhlYmE4ZDIzMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4LTIzICBTaGV6 YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNvbT4KKworICAgICAgICBGaXggY3Jvc3MtZGly ZWN0aW9uIHN0cmV0Y2ggZm9yIHJlcGxhY2VkIGVsZW1lbnRzIGluIGNvbHVtbiBmbGV4Ym94Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDYwNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGZhaWxp bmcgdGVzdCBjYXNlcy4gQWRkIHRlc3RzIGZvciBtaW4vbWF4IHdpZHRoL2hlaWdodC4gRW5hYmxl ZAorICAgICAgICBjc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbCB0ZXN0IGluIENocm9taXVtLgor CisgICAgICAgICogY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBjc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1 bS9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDEyLTA4LTIzICBLd2FuZ1lvbmcgQ2hvaSAgPGt5MC5j aG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIFVwZGF0ZSBwaXhlbCB0ZXN0IGV4cGVj dGF0aW9ucyBmb3IgbGF5b3V0IHRlc3QgZmFzdC9mb3Jtcy8KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2NzczMvZmxleGJveC9mbGV4aXRlbS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleGl0ZW0tZXhwZWN0ZWQudHh0CmluZGV4IDYyNWZmZDBiYmVlYzlhOGM5MDRj YjlhNDZiMGM2MDJjZmZmYjJlZGEuLjJmNTEzNTUyY2I1MDE2YjQ0NjY4YjM0ZGZkNzQ2NTRmMDNi M2U0YmUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9mbGV4aXRlbS1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLWV4cGVjdGVk LnR4dApAQCAtMjUsMzggKzI1LDE3IEBAIFBBU1MKIAogUEFTUwogCi1GQUlMOgotRXhwZWN0ZWQg MTAwcHggZm9yIHdpZHRoLCBidXQgZ290IDMwMC4gCi0KLTxkaXYgY2xhc3M9ImZsZXhib3ggY29s dW1uIiBzdHlsZT0id2lkdGg6MTAwcHgiPgotICA8IS0tIEZJWE1FOiBUaGUgaWZyYW1lIHNob3Vs ZCBzaHJpbmsgaW4gdGhlIGNyb3NzIGRpcmVjdGlvbjogaHR0cHM6Ly93ZWJraXQub3JnL2IvOTQ2 MDQgLS0+Ci0gIDxpZnJhbWUgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBl Y3RlZC13aWR0aD0iMTAwcHgiIHNyYz0iZGF0YTp0ZXh0L2h0bWwsJmx0O2JvZHkgYmdjb2xvcj0j ZmZmJmd0O2lmcmFtZSZsdDsvYm9keSZndDsiPjwvaWZyYW1lPgotICA8aWZyYW1lIHNlYW1sZXNz PSIiIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEw MHB4IiBzcmM9ImRhdGE6dGV4dC9odG1sLCZsdDtib2R5IGJnY29sb3I9I2ZmZiZndDtpZnJhbWUm bHQ7L2JvZHkmZ3Q7Ij48L2lmcmFtZT4KLTwvZGl2PgorUEFTUwogYnV0dG9uCiAKIG9iamVjdAog Ci1GQUlMOgotRXhwZWN0ZWQgNjAwIGZvciB3aWR0aCwgYnV0IGdvdCAzNC4gCi1FeHBlY3RlZCA2 MDAgZm9yIHdpZHRoLCBidXQgZ290IDYwLiAKLUV4cGVjdGVkIDYwMCBmb3Igd2lkdGgsIGJ1dCBn b3QgMzAwLiAKLUV4cGVjdGVkIDYwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgNTYuIAotRXhwZWN0ZWQg NjAwIGZvciB3aWR0aCwgYnV0IGdvdCAxNTUuIAotCi08ZGl2IGNsYXNzPSJmbGV4Ym94IGNvbHVt biIgc3R5bGU9ImhlaWdodDoyMTBweCI+Ci0gIDwhLS0gRklYTUU6IFRoZSBidXR0b24gc2hvdWxk IHN0cmV0Y2ggaW4gdGhlIGNyb3NzIGRpcmVjdGlvbi4gLS0+Ci0gIDxidXR0b24gZGF0YS1leHBl Y3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNjAwIiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iMzAiPmJ1dHRvbjwvYnV0dG9uPgotICA8IS0tIEZJWE1FOiBUaGUgY2FudmFz IHNob3VsZCBzdHJldGNoIGluIHRoZSBjcm9zcyBkaXJlY3Rpb246IGh0dHBzOi8vd2Via2l0Lm9y Zy9iLzk0NjA0IC0tPgotICA8Y2FudmFzIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRh dGEtZXhwZWN0ZWQtd2lkdGg9IjYwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwIiBzdHlsZT0i aGVpZ2h0OjMwcHgiPmNhbnZhczwvY2FudmFzPgotICA8IS0tIEZJWE1FOiBUaGUgaWZyYW1lIHNo b3VsZCBzdHJldGNoIGluIHRoZSBjcm9zcyBkaXJlY3Rpb246IGh0dHBzOi8vd2Via2l0Lm9yZy9i Lzk0NjA0IC0tPgotICA8aWZyYW1lIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjYwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwIiBzdHlsZT0iaGVp Z2h0OjMwcHgiIHNyYz0iZGF0YTp0ZXh0L2h0bWwsJmx0O2JvZHkgYmdjb2xvcj0jZmZmJmd0O2lm cmFtZSZsdDsvYm9keSZndDsiPjwvaWZyYW1lPgotICA8aWZyYW1lIHNlYW1sZXNzPSIiIGRhdGEt ZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjYwMCIgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9IjMwIiBzdHlsZT0iaGVpZ2h0OjMwcHgiIHNyYz0iZGF0YTp0ZXh0L2h0 bWwsJmx0O2JvZHkgYmdjb2xvcj0jZmZmJmd0O2lmcmFtZSZsdDsvYm9keSZndDsiPjwvaWZyYW1l PgotICA8b2JqZWN0IGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQt d2lkdGg9IjYwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwIj5vYmplY3Q8L29iamVjdD4KLSAg PCEtLSBGSVhNRTogVGhlIHNlbGVjdCBzaG91bGQgc3RyZXRjaCBpbiB0aGUgY3Jvc3MgZGlyZWN0 aW9uLiAtLT4KLSAgPHNlbGVjdCBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMCI+Ci0gICAgPG9wdGlv bj5zZWxlY3Q8L29wdGlvbj4KLSAgPC9zZWxlY3Q+Ci0gIDwhLS0gRklYTUU6IFRoZSB0ZXh0YXJl YSBzaG91bGQgc3RyZXRjaCBpbiB0aGUgY3Jvc3MgZGlyZWN0aW9uLiAtLT4KLSAgPHRleHRhcmVh IGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjYwMCIg ZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwIj50ZXh0YXJlYTwvdGV4dGFyZWE+Ci08L2Rpdj4KK1BB U1MKKworUEFTUworCitQQVNTCisKK1BBU1MKKworUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gv ZmxleGl0ZW0uaHRtbAppbmRleCA5ODg4YWJlNGE0NDEyZjQyOGExZTFhMjMwZTdlM2JlYjZjZjg1 Zjg2Li5iMmYxZWFiMGIzMWJkZjljZWNkM2I4ODg2NWQzYTJhMDk2OWQ3ZGYyIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9jc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbApAQCAtMTI1LDQgKzEyNSw1NCBAQCBpZiAod2lu ZG93LnRlc3RSdW5uZXIpCiAgIDx0ZXh0YXJlYSBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2Nr IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMCI+dGV4 dGFyZWE8L3RleHRhcmVhPgogPC9kaXY+CiAKKzwhLS0gdGVzdHMgdGhhdCBtaW4taGVpZ2h0IGV4 cGFuZHMgdGhlIGhlaWdodCBvZiBmbGV4IGl0ZW1zIGJleW9uZCB0aGUgaGVpZ2h0IG9mIHRoZSBm bGV4Ym94IC0tPgorPGRpdiBjbGFzcz0iZmxleGJveCIgc3R5bGU9ImhlaWdodDo1MHB4Ij4KKyAg ICA8aW1nIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0 PSI2MCIgc3R5bGU9Im1pbi1oZWlnaHQ6NjBweCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2Js dWUtMTAwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iNjAiIHN0eWxlPSJtaW4taGVpZ2h0OjYwcHgiIHNyYz0iLi4vaW1h Z2VzL3Jlc291cmNlcy9ncmVlbi0xMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC1kaXNw bGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9Ijc1IiBzdHlsZT0ibWluLWhlaWdodDox NTAlIiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvYmx1ZS0xMDAucG5nIj4KKyAgICA8aW1nIGRh dGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI3NSIgc3R5 bGU9Im1pbi1oZWlnaHQ6MTUwJSIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEwLnBu ZyI+CisgICAgPCEtLSBUT0RPOiB0ZXN0IG1pbi1jb250ZW50LCBtYXgtY29udGVudCwgZmlsbC1h dmFpbGFibGUsIGZpdC1jb250ZW50IHdoZW4gdGhlc2UgYXJlIGltcGxlbWVudGVkIGZvciBoZWln aHQgLS0+Cis8L2Rpdj4KKworPCEtLSB0ZXN0cyB0aGF0IG1heC1oZWlnaHQgc2hyaW5rcyB0aGUg aGVpZ2h0IG9mIGZsZXggaXRlbXMgbGVzcyB0aGFuIHRoZSBoZWlnaHQgb2YgdGhlIGZsZXhib3gg LS0+Cis8ZGl2IGNsYXNzPSJmbGV4Ym94IiBzdHlsZT0iaGVpZ2h0OjUwcHgiPgorICAgIDxpbWcg ZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjQwIiBz dHlsZT0ibWF4LWhlaWdodDo0MHB4IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvYmx1ZS0xMDAu cG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0 ZWQtaGVpZ2h0PSI0MCIgc3R5bGU9Im1heC1oZWlnaHQ6NDBweCIgc3JjPSIuLi9pbWFnZXMvcmVz b3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJs b2NrIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjUiIHN0eWxlPSJtYXgtaGVpZ2h0OjUwJSIgc3Jj PSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUtMTAwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVj dGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjUiIHN0eWxlPSJtYXgt aGVpZ2h0OjUwJSIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAg PCEtLSBUT0RPOiB0ZXN0IG1pbi1jb250ZW50LCBtYXgtY29udGVudCwgZmlsbC1hdmFpbGFibGUs IGZpdC1jb250ZW50IHdoZW4gdGhlc2UgYXJlIGltcGxlbWVudGVkIGZvciBoZWlnaHQgLS0+Cis8 L2Rpdj4KKworPCEtLSB0ZXN0cyB0aGF0IG1pbi13aWR0aCBleHBhbmRzIHRoZSB3aWR0aCBvZiBm bGV4IGl0ZW1zIGJleW9uZCB0aGUgd2lkdGggb2YgdGhlIGZsZXhib3ggLS0+Cis8ZGl2IGNsYXNz PSJmbGV4Ym94IGNvbHVtbiIgc3R5bGU9IndpZHRoOjUwcHgiPgorICAgIDxpbWcgZGF0YS1leHBl Y3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNjAiIHN0eWxlPSJtaW4t d2lkdGg6NjBweCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUtMTAwLnBuZyI+CisgICAg PGltZyBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2 MCIgc3R5bGU9Im1pbi13aWR0aDo2MHB4IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4t MTAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9Ijc1IiBzdHlsZT0ibWluLXdpZHRoOjE1MCUiIHNyYz0iLi4vaW1hZ2VzL3Jl c291cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJi bG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNzUiIHN0eWxlPSJtaW4td2lkdGg6MTUwJSIgc3Jj PSIuLi9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVj dGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIHN0eWxlPSJtaW4t d2lkdGg6LXdlYmtpdC1taW4tY29udGVudCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUt MTAwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSI1MCIgc3R5bGU9Im1pbi13aWR0aDotd2Via2l0LW1pbi1jb250ZW50IiBz cmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4tMTAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhw ZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgc3R5bGU9Im1p bi13aWR0aDotd2Via2l0LW1heC1jb250ZW50IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvYmx1 ZS0xMDAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjUwIiBzdHlsZT0ibWluLXdpZHRoOi13ZWJraXQtbWF4LWNvbnRlbnQi IHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ncmVlbi0xMC5wbmciPgorICAgIDxpbWcgZGF0YS1l eHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIHN0eWxlPSJt aW4td2lkdGg6LXdlYmtpdC1maWxsLWF2YWlsYWJsZSIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2Vz L2JsdWUtMTAwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBk YXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgc3R5bGU9Im1pbi13aWR0aDotd2Via2l0LWZpbGwtYXZh aWxhYmxlIiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4tMTAucG5nIj4KKyAgICA8aW1n IGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIg c3R5bGU9Im1pbi13aWR0aDotd2Via2l0LWZpdC1jb250ZW50IiBzcmM9Ii4uL2ltYWdlcy9yZXNv dXJjZXMvYmx1ZS0xMDAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxv Y2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBzdHlsZT0ibWluLXdpZHRoOi13ZWJraXQtZml0 LWNvbnRlbnQiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ncmVlbi0xMC5wbmciPgorPC9kaXY+ CisKKzwhLS0gdGVzdHMgdGhhdCBtYXgtd2lkdGggc2hyaW5rcyB0aGUgd2lkdGggb2YgZmxleCBp dGVtcyBsZXNzIHRoYW4gdGhlIHdpZHRoIG9mIHRoZSBmbGV4Ym94IC0tPgorPGRpdiBjbGFzcz0i ZmxleGJveCBjb2x1bW4iIHN0eWxlPSJ3aWR0aDo1MHB4Ij4KKyAgICA8aW1nIGRhdGEtZXhwZWN0 ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwIiBzdHlsZT0ibWF4LXdp ZHRoOjQwcHgiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxp bWcgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAi IHN0eWxlPSJtYXgtd2lkdGg6NDBweCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEw LnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVj dGVkLXdpZHRoPSIyNSIgc3R5bGU9Im1heC13aWR0aDo1MCUiIHNyYz0iLi4vaW1hZ2VzL3Jlc291 cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9j ayIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjUiIHN0eWxlPSJtYXgtd2lkdGg6NTAlIiBzcmM9Ii4u L2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4tMTAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQt ZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBzdHlsZT0ibWF4LXdpZHRo Oi13ZWJraXQtbWluLWNvbnRlbnQiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ibHVlLTEwMC5w bmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMTAiIHN0eWxlPSJtYXgtd2lkdGg6LXdlYmtpdC1taW4tY29udGVudCIgc3JjPSIu Li9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVk LWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgc3R5bGU9Im1heC13aWR0 aDotd2Via2l0LW1heC1jb250ZW50IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvYmx1ZS0xMDAu cG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjEwIiBzdHlsZT0ibWF4LXdpZHRoOi13ZWJraXQtbWF4LWNvbnRlbnQiIHNyYz0i Li4vaW1hZ2VzL3Jlc291cmNlcy9ncmVlbi0xMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3Rl ZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIHN0eWxlPSJtYXgtd2lk dGg6LXdlYmtpdC1maWxsLWF2YWlsYWJsZSIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUt MTAwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSI1MCIgc3R5bGU9Im1heC13aWR0aDotd2Via2l0LWZpbGwtYXZhaWxhYmxl IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4tMTAucG5nIj4KKyAgICA8aW1nIGRhdGEt ZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBzdHlsZT0i bWF4LXdpZHRoOi13ZWJraXQtZml0LWNvbnRlbnQiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9i bHVlLTEwMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0 YS1leHBlY3RlZC13aWR0aD0iMTAiIHN0eWxlPSJtYXgtd2lkdGg6LXdlYmtpdC1maXQtY29udGVu dCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+Cis8L2Rpdj4KKwogPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVj dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggMTQyMTg1ODRkNmVlOTdlZDEwOWUwZGQyNWZiYzY0OGUxMGYwYWRmMy4uOTYyYWRkNjEz ZDc3YTY2NDI5Mjk4NThkNWU2ZjQwZWZhNmM2YjU0OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNTEwLDcgKzM1MTAsNiBAQCBCVUdX Szk0NTMyIExJTlVYIDogZmFzdC9mb3Jtcy9mb3JtbWV0aG9kLWF0dHJpYnV0ZS1idXR0b24taHRt bC5odG1sID0gUEFTUyBNSVNTSQogCiBCVUdXSzk0NjYwIDogZmFzdC9qcy9jcmVhdGUtbG90cy1v Zi13b3JrZXJzLmh0bWwgPSBQQVNTIENSQVNICiBCVUdXSzk0NjY3IFdJTiA6IGZhc3QvZm9ybXMv dGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBsZS1maWVsZHMtYXBwZWFyYW5jZS1iYXNp Yy5odG1sID0gSU1BR0UKLUJVR1dLOTQ2NzUgOiBjc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbCA9 IFRFWFQKIAogQlVHV0s5NDczMCBNQUMgOiBmYXN0L3JlcGFpbnQvamFwYW5lc2Utcmwtc2VsZWN0 aW9uLXJlcGFpbnQtaW4tcmVnaW9ucy5odG1sID0gSU1BR0UKIAo= 160253 2012-08-23 14:46:24 -0700 2012-08-23 16:40:47 -0700 Patch (with changes from comment 6) bug-94604-20120823174629.patch text/plain 15831 shezbaig.wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E5YWNiODA5MmJjYzkz Nzk1NjExYWNhNDI4ODcyMjViZmY5YjQxYS4uMDcwYWE5OTI1MDM3MDI3ZDRkZjFkYzliNTY4ZDE1 MzFmMjRlZjdkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDEyLTA4LTIzICBTaGV6 YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNvbT4KIAorICAgICAgICBGaXggY3Jvc3MtZGly ZWN0aW9uIHN0cmV0Y2ggZm9yIHJlcGxhY2VkIGVsZW1lbnRzIGluIGNvbHVtbiBmbGV4Ym94Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDYwNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIHRoZSBs b2dpYyB0aGF0IGNvbnN0cmFpbnMgbG9naWNhbCB3aWR0aCBieSBNaW5TaXplIGFuZCBNYXhTaXpl IHRvCisgICAgICAgIGEgbmV3IGhlbHBlciBmdW5jdGlvbiBjYWxsZWQgY29uc3RyYWluTG9naWNh bFdpZHRoSW5SZWdpb25CeU1pbk1heC4KKyAgICAgICAgVGhpcyBoZWxwZXIgZnVuY3Rpb24gaXMg dXNlZCBmcm9tIGJvdGggY29tcHV0ZUxvZ2ljYWxXaWR0aEluUmVnaW9uIGFuZAorICAgICAgICBS ZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZC4KKworICAgICAg ICBSZW5kZXJGbGV4aWJsZUJveCBubyBsb25nZXIgY2hlY2tzIGZvciBpc011bHRpbGluZSB3aGVu IHN0cmV0Y2hpbmcKKyAgICAgICAgZWxlbWVudHMgaW4gYSBjb2x1bW4gZmxleGJveC4gSW5zdGVh ZCwgd2Ugbm93IGNvbnN0cmFpbiB0aGUgYXZhaWxhYmxlCisgICAgICAgIHdpZHRoIGJ5IHRoZSBj aGlsZCdzIG1pbi13aWR0aCBhbmQgbWF4LXdpZHRoLCBhbmQgc2V0IHRoZSBvdmVycmlkZQorICAg ICAgICB3aWR0aCBvbmx5IGlmIHRoYXQgY29uc3RyYWluZWQgd2lkdGggaXMgZGlmZmVyZW50IGZy b20gdGhlIGNoaWxkJ3MKKyAgICAgICAgY3VycmVudCBsb2dpY2FsV2lkdGguCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBUaGUgZXhpc3RpbmcgY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLmh0bWwgdGVz dCB3YXMgZXh0ZW5kZWQKKyAgICAgICAgdG8gZXhlcmNpc2UgdGhlIG5ldyBjb2RlLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC b3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9uQnlNaW5NYXgpOiBOZXcgaGVscGVyCisg ICAgICAgIG1ldGhvZCB0byBjb25zdHJhaW4gbG9naWNhbCB3aWR0aCBieSBtaW4td2lkdGggYW5k IG1heC13aWR0aC4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb24pOiBDaGFuZ2VkIHRvIHVzZSB0aGUKKyAg ICAgICAgbmV3IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9uQnlNaW5NYXggaGVscGVyIG1l dGhvZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChSZW5kZXJC b3gpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGls ZCk6IENoYW5nZWQgdG8KKyAgICAgICAgdXNlIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9u QnlNaW5NYXggdG8gZGV0ZXJtaW5lIHRoZSBvdmVycmlkZQorICAgICAgICB3aWR0aCBmb3IgdGhl IGNoaWxkLgorCisyMDEyLTA4LTIzICBTaGV6YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNv bT4KKwogICAgICAgICBGbGV4Ym94IGRvZXNuJ3QgbmVlZCB0byBjb21wdXRlIGxvZ2ljYWwgaGVp Z2h0IGZvciBzdHJldGNoZWQgaXRlbXMgaW4gcm93IGZsb3cKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODA3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKaW5kZXggNWVjNmRmOTU3ZDJhMGI1ZjE4Y2JhOTM2ZjE4MGFlM2FlMmU1 NzI4Ni4uNmU5YzA0NjllYzQzNmRlMDY1OTU2ZDMwMTRiMjYxMjNlODlkOWY1MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTQzMywxNiArNDMzLDIyIEBAIHZvaWQg UmVuZGVyQm94Ojp1cGRhdGVMYXllclRyYW5zZm9ybSgpCiAgICAgICAgIGxheWVyKCktPnVwZGF0 ZVRyYW5zZm9ybSgpOwogfQogCitMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNh bFdpZHRoSW5SZWdpb25CeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5p dCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2sqIGNiLCBSZW5kZXJSZWdpb24qIHJlZ2lvbiwg TGF5b3V0VW5pdCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKQoreworICAgIFJlbmRl clN0eWxlKiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKKyAgICBpZiAoIXN0eWxlVG9Vc2UtPmxvZ2lj YWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IG1pbihs b2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKE1heFNpemUsIGF2 YWlsYWJsZVdpZHRoLCBjYiwgcmVnaW9uLCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdl KSk7CisgICAgcmV0dXJuIG1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJblJl Z2lvblVzaW5nKE1pblNpemUsIGF2YWlsYWJsZVdpZHRoLCBjYiwgcmVnaW9uLCBvZmZzZXRGcm9t TG9naWNhbFRvcE9mRmlyc3RQYWdlKSk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25z dHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KQogewog ICAgIFJlbmRlclN0eWxlKiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKICAgICBpZiAoIXN0eWxlVG9V c2UtPmxvZ2ljYWxNYXhIZWlnaHQoKS5pc1VuZGVmaW5lZCgpKSB7Ci0gICAgICAgIC8vIENvbnN0 cmFpbiBieSBNYXhTaXplLgogICAgICAgICBMYXlvdXRVbml0IG1heEggPSBjb21wdXRlTG9naWNh bEhlaWdodFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UtPmxvZ2ljYWxNYXhIZWlnaHQoKSk7CiAg ICAgICAgIGlmIChtYXhIICE9IC0xKQogICAgICAgICAgICAgbG9naWNhbEhlaWdodCA9IG1pbihs b2dpY2FsSGVpZ2h0LCBtYXhIKTsKICAgICB9Ci0gICAgLy8gQ29uc3RyYWluIGJ5IE1pblNpemUu CiAgICAgcmV0dXJuIG1heChsb2dpY2FsSGVpZ2h0LCBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5n KE1pblNpemUsIHN0eWxlVG9Vc2UtPmxvZ2ljYWxNaW5IZWlnaHQoKSkpOwogfQogCkBAIC0xNjg4 LDIwICsxNjk0LDggQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lv bihSZW5kZXJSZWdpb24qIHJlZ2lvbiwgTGF5b3V0VW5pdCBvZmYKICAgICBpZiAodHJlYXRBc1Jl cGxhY2VkKQogICAgICAgICBzZXRMb2dpY2FsV2lkdGgobG9naWNhbFdpZHRoTGVuZ3RoLnZhbHVl KCkgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwogICAgIGVsc2UgewotICAgICAg ICAvLyBDYWxjdWxhdGUgTG9naWNhbFdpZHRoCi0gICAgICAgIHNldExvZ2ljYWxXaWR0aChjb21w dXRlTG9naWNhbFdpZHRoSW5SZWdpb25Vc2luZyhNYWluT3JQcmVmZXJyZWRTaXplLCBjb250YWlu ZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCBjYiwgcmVnaW9uLCBvZmZzZXRGcm9tTG9naWNhbFRv cE9mRmlyc3RQYWdlKSk7Ci0KLSAgICAgICAgLy8gQ2FsY3VsYXRlIE1heExvZ2ljYWxXaWR0aAot ICAgICAgICBpZiAoIXN0eWxlVG9Vc2UtPmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkp IHsKLSAgICAgICAgICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoID0gY29tcHV0ZUxvZ2lj YWxXaWR0aEluUmVnaW9uVXNpbmcoTWF4U2l6ZSwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVj dGlvbiwgY2IsIHJlZ2lvbiwgb2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSk7Ci0gICAg ICAgICAgICBpZiAobG9naWNhbFdpZHRoKCkgPiBtYXhMb2dpY2FsV2lkdGgpCi0gICAgICAgICAg ICAgICAgc2V0TG9naWNhbFdpZHRoKG1heExvZ2ljYWxXaWR0aCk7Ci0gICAgICAgIH0KLQotICAg ICAgICAvLyBDYWxjdWxhdGUgTWluTG9naWNhbFdpZHRoCi0gICAgICAgIExheW91dFVuaXQgbWlu TG9naWNhbFdpZHRoID0gY29tcHV0ZUxvZ2ljYWxXaWR0aEluUmVnaW9uVXNpbmcoTWluU2l6ZSwg Y29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgY2IsIHJlZ2lvbiwgb2Zmc2V0RnJvbUxv Z2ljYWxUb3BPZkZpcnN0UGFnZSk7Ci0gICAgICAgIGlmIChsb2dpY2FsV2lkdGgoKSA8IG1pbkxv Z2ljYWxXaWR0aCkKLSAgICAgICAgICAgIHNldExvZ2ljYWxXaWR0aChtaW5Mb2dpY2FsV2lkdGgp OworICAgICAgICBMYXlvdXRVbml0IHByZWZlcnJlZFdpZHRoID0gY29tcHV0ZUxvZ2ljYWxXaWR0 aEluUmVnaW9uVXNpbmcoTWFpbk9yUHJlZmVycmVkU2l6ZSwgY29udGFpbmVyV2lkdGhJbklubGlu ZURpcmVjdGlvbiwgY2IsIHJlZ2lvbiwgb2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSk7 CisgICAgICAgIHNldExvZ2ljYWxXaWR0aChjb25zdHJhaW5Mb2dpY2FsV2lkdGhJblJlZ2lvbkJ5 TWluTWF4KHByZWZlcnJlZFdpZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCBj YiwgcmVnaW9uLCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKSk7CiAgICAgfQogCiAg ICAgLy8gRmllbGRzZXRzIGFyZSBjdXJyZW50bHkgdGhlIG9ubHkgb2JqZWN0cyB0aGF0IHN0cmV0 Y2ggdG8gdGhlaXIgbWluaW11bSB3aWR0aC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu aAppbmRleCA0YWZmYmMwYzdkNTA0MWE0NGZkODJkYjgxMmJjNTg2Yzg1NTVlOTVkLi5mMTQzYzVj MDZlYjc5OWE0NjkzYTFkNGI2NGYwYTJmZmVjY2M5OTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCkBAIC03NSw2ICs3NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxv Z2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlKCkgPyB3aWR0aCgpIDogaGVpZ2h0KCk7IH0KICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8g aGVpZ2h0KCkgOiB3aWR0aCgpOyB9CiAKKyAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxX aWR0aEluUmVnaW9uQnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2sq LCBSZW5kZXJSZWdpb24qID0gMCwgTGF5b3V0VW5pdCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmly c3RQYWdlID0gWkVST19MQVlPVVRfVU5JVCk7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dp Y2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCk7CiAKICAgICBpbnQgcGl4ZWxTbmFwcGVkTG9n aWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlKCkgPyBwaXhlbFNuYXBwZWRIZWlnaHQoKSA6IHBpeGVsU25hcHBlZFdpZHRoKCk7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGY0 MDIwMWZlZTRjNTRjNGY5Nzc2NmNjM2IxMTk4ZmY5OGYwZjM3OGEuLjlmODdjZjgzNWFjNTkwNzQ2 YjRhNzVhMDFhMTYzNzNmNDgwNzcxNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMTI0NiwxNCArMTI0NiwxOCBAQCB2b2lkIFJlbmRl ckZsZXhpYmxlQm94OjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkKFJlbmRlckJveCogY2hp bGQsIExheW91dFVuaQogICAgICAgICAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgpOwog ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgfSBlbHNlIGlmIChpc0NvbHVtbkZsb3coKSAm JiBjaGlsZC0+c3R5bGUoKS0+bG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgaXNNdWx0aWxpbmUo KSkgewotICAgICAgICAvLyBGSVhNRTogSGFuZGxlIG1pbi13aWR0aCBhbmQgbWF4LXdpZHRoLgot ICAgICAgICAvLyBGSVhNRTogV2Ugb25seSBuZWVkIHRvIHJlbGF5b3V0IGhlcmUgaWYgdGhlIHdp ZHRoIGNoYW5nZXMuCi0gICAgICAgIC8vIEZJWE1FOiBUaGUgaXNNdWx0aWxpbmUgY2hlY2sgYWJv dmUgbWF5IG5vdCBiZSBuZWNlc3NhcnkgaWYgdGhlIHdpZHRoIGhhcyBub3QgY2hhbmdlZC4gU2Vl IGh0dHBzOi8vd2Via2l0Lm9yZy9iLzk0MjM3Ci0gICAgICAgIExheW91dFVuaXQgY2hpbGRXaWR0 aCA9IGxpbmVDcm9zc0F4aXNFeHRlbnQgLSBjcm9zc0F4aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChj aGlsZCk7Ci0gICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoc3Rk OjptYXgoWkVST19MQVlPVVRfVU5JVCwgY2hpbGRXaWR0aCkpOwotICAgICAgICBjaGlsZC0+c2V0 Q2hpbGROZWVkc0xheW91dCh0cnVlLCBNYXJrT25seVRoaXMpOwotICAgICAgICBjaGlsZC0+bGF5 b3V0SWZOZWVkZWQoKTsKKyAgICB9IGVsc2UgaWYgKGlzQ29sdW1uRmxvdygpICYmIGNoaWxkLT5z dHlsZSgpLT5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkgeworICAgICAgICAvLyBGSVhNRTogSWYg dGhlIGNoaWxkIGRvZXNuJ3QgaGF2ZSBvcnRob2dvbmFsIGZsb3csIHRoZW4gaXQgYWxyZWFkeSBo YXMgYW4gb3ZlcnJpZGUgd2lkdGggc2V0LCBzbyB1c2UgaXQuCisgICAgICAgIGlmIChoYXNPcnRo b2dvbmFsRmxvdyhjaGlsZCkpIHsKKyAgICAgICAgICAgIExheW91dFVuaXQgY2hpbGRXaWR0aCA9 IHN0ZDo6bWF4KFpFUk9fTEFZT1VUX1VOSVQsIGxpbmVDcm9zc0F4aXNFeHRlbnQgLSBjcm9zc0F4 aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChjaGlsZCkpOworICAgICAgICAgICAgY2hpbGRXaWR0aCA9 IGNoaWxkLT5jb25zdHJhaW5Mb2dpY2FsV2lkdGhJblJlZ2lvbkJ5TWluTWF4KGNoaWxkV2lkdGgs IGNoaWxkV2lkdGgsIHRoaXMpOworCisgICAgICAgICAgICBpZiAoY2hpbGRXaWR0aCAhPSBjaGls ZC0+bG9naWNhbFdpZHRoKCkpIHsKKyAgICAgICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVM b2dpY2FsQ29udGVudFdpZHRoKGNoaWxkV2lkdGgpOworICAgICAgICAgICAgICAgIGNoaWxkLT5z ZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUsIE1hcmtPbmx5VGhpcyk7CisgICAgICAgICAgICAgICAg Y2hpbGQtPmxheW91dElmTmVlZGVkKCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9 CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCBjNTk1MDExODMxMTc4MGJhZWJiMjc1YzE4YjFkNThkN2E1NTFhNjlkLi40 N2Q5YzAwYTJhODQ3ZTMzMjZlMWJhYmJlZjI1NDFkZjk5NWUyMmE2IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTItMDgtMjMgIFNoZXphbiBCYWlnICA8c2hlemJhaWcud2tAZ21haWwuY29tPgor CisgICAgICAgIEZpeCBjcm9zcy1kaXJlY3Rpb24gc3RyZXRjaCBmb3IgcmVwbGFjZWQgZWxlbWVu dHMgaW4gY29sdW1uIGZsZXhib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk0NjA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRml4ZWQgZmFpbGluZyB0ZXN0IGNhc2VzLiBBZGQgdGVzdHMgZm9yIG1pbi9t YXggd2lkdGgvaGVpZ2h0LgorCisgICAgICAgICogY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLWV4cGVj dGVkLnR4dDoKKyAgICAgICAgKiBjc3MzL2ZsZXhib3gvZmxleGl0ZW0uaHRtbDoKKwogMjAxMi0w OC0yMyAgS3dhbmdZb25nIENob2kgIDxreTAuY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBb RUZMXSBVcGRhdGUgcGl4ZWwgdGVzdCBleHBlY3RhdGlvbnMgZm9yIGxheW91dCB0ZXN0IGZhc3Qv Zm9ybXMvCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvZmxleGl0ZW0tZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLWV4cGVjdGVkLnR4 dAppbmRleCA2MjVmZmQwYmJlZWM5YThjOTA0Y2I5YTQ2YjBjNjAyY2ZmZmIyZWRhLi4yZjUxMzU1 MmNiNTAxNmI0NDY2OGIzNGRmZDc0NjU0ZjAzYjNlNGJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9jc3MzL2ZsZXhib3gvZmxleGl0ZW0tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Nz czMvZmxleGJveC9mbGV4aXRlbS1leHBlY3RlZC50eHQKQEAgLTI1LDM4ICsyNSwxNyBAQCBQQVNT CiAKIFBBU1MKIAotRkFJTDoKLUV4cGVjdGVkIDEwMHB4IGZvciB3aWR0aCwgYnV0IGdvdCAzMDAu IAotCi08ZGl2IGNsYXNzPSJmbGV4Ym94IGNvbHVtbiIgc3R5bGU9IndpZHRoOjEwMHB4Ij4KLSAg PCEtLSBGSVhNRTogVGhlIGlmcmFtZSBzaG91bGQgc2hyaW5rIGluIHRoZSBjcm9zcyBkaXJlY3Rp b246IGh0dHBzOi8vd2Via2l0Lm9yZy9iLzk0NjA0IC0tPgotICA8aWZyYW1lIGRhdGEtZXhwZWN0 ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMHB4IiBzcmM9ImRhdGE6 dGV4dC9odG1sLCZsdDtib2R5IGJnY29sb3I9I2ZmZiZndDtpZnJhbWUmbHQ7L2JvZHkmZ3Q7Ij48 L2lmcmFtZT4KLSAgPGlmcmFtZSBzZWFtbGVzcz0iIiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJs b2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDBweCIgc3JjPSJkYXRhOnRleHQvaHRtbCwmbHQ7 Ym9keSBiZ2NvbG9yPSNmZmYmZ3Q7aWZyYW1lJmx0Oy9ib2R5Jmd0OyI+PC9pZnJhbWU+Ci08L2Rp dj4KK1BBU1MKIGJ1dHRvbgogCiBvYmplY3QKIAotRkFJTDoKLUV4cGVjdGVkIDYwMCBmb3Igd2lk dGgsIGJ1dCBnb3QgMzQuIAotRXhwZWN0ZWQgNjAwIGZvciB3aWR0aCwgYnV0IGdvdCA2MC4gCi1F eHBlY3RlZCA2MDAgZm9yIHdpZHRoLCBidXQgZ290IDMwMC4gCi1FeHBlY3RlZCA2MDAgZm9yIHdp ZHRoLCBidXQgZ290IDU2LiAKLUV4cGVjdGVkIDYwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTU1LiAK LQotPGRpdiBjbGFzcz0iZmxleGJveCBjb2x1bW4iIHN0eWxlPSJoZWlnaHQ6MjEwcHgiPgotICA8 IS0tIEZJWE1FOiBUaGUgYnV0dG9uIHNob3VsZCBzdHJldGNoIGluIHRoZSBjcm9zcyBkaXJlY3Rp b24uIC0tPgotICA8YnV0dG9uIGRhdGEtZXhwZWN0ZWQtZGlzcGxheT0iYmxvY2siIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9IjYwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwIj5idXR0b248L2J1dHRv bj4KLSAgPCEtLSBGSVhNRTogVGhlIGNhbnZhcyBzaG91bGQgc3RyZXRjaCBpbiB0aGUgY3Jvc3Mg ZGlyZWN0aW9uOiBodHRwczovL3dlYmtpdC5vcmcvYi85NDYwNCAtLT4KLSAgPGNhbnZhcyBkYXRh LWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PSIzMCIgc3R5bGU9ImhlaWdodDozMHB4Ij5jYW52YXM8L2NhbnZhcz4K LSAgPCEtLSBGSVhNRTogVGhlIGlmcmFtZSBzaG91bGQgc3RyZXRjaCBpbiB0aGUgY3Jvc3MgZGly ZWN0aW9uOiBodHRwczovL3dlYmtpdC5vcmcvYi85NDYwNCAtLT4KLSAgPGlmcmFtZSBkYXRhLWV4 cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PSIzMCIgc3R5bGU9ImhlaWdodDozMHB4IiBzcmM9ImRhdGE6dGV4dC9odG1s LCZsdDtib2R5IGJnY29sb3I9I2ZmZiZndDtpZnJhbWUmbHQ7L2JvZHkmZ3Q7Ij48L2lmcmFtZT4K LSAgPGlmcmFtZSBzZWFtbGVzcz0iIiBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2NrIiBkYXRh LWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMCIgc3R5bGU9Imhl aWdodDozMHB4IiBzcmM9ImRhdGE6dGV4dC9odG1sLCZsdDtib2R5IGJnY29sb3I9I2ZmZiZndDtp ZnJhbWUmbHQ7L2JvZHkmZ3Q7Ij48L2lmcmFtZT4KLSAgPG9iamVjdCBkYXRhLWV4cGVjdGVkLWRp c3BsYXk9ImJsb2NrIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVp Z2h0PSIzMCI+b2JqZWN0PC9vYmplY3Q+Ci0gIDwhLS0gRklYTUU6IFRoZSBzZWxlY3Qgc2hvdWxk IHN0cmV0Y2ggaW4gdGhlIGNyb3NzIGRpcmVjdGlvbi4gLS0+Ci0gIDxzZWxlY3QgZGF0YS1leHBl Y3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNjAwIiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iMzAiPgotICAgIDxvcHRpb24+c2VsZWN0PC9vcHRpb24+Ci0gIDwvc2VsZWN0 PgotICA8IS0tIEZJWE1FOiBUaGUgdGV4dGFyZWEgc2hvdWxkIHN0cmV0Y2ggaW4gdGhlIGNyb3Nz IGRpcmVjdGlvbi4gLS0+Ci0gIDx0ZXh0YXJlYSBkYXRhLWV4cGVjdGVkLWRpc3BsYXk9ImJsb2Nr IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI2MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMCI+dGV4 dGFyZWE8L3RleHRhcmVhPgotPC9kaXY+CitQQVNTCisKK1BBU1MKKworUEFTUworCitQQVNTCisK K1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9mbGV4aXRlbS5odG1s IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLmh0bWwKaW5kZXggOTg4OGFiZTRh NDQxMmY0MjhhMWUxYTIzMGU3ZTNiZWI2Y2Y4NWY4Ni4uNzhhY2JiNjI2ZWFlMGM0ZTZhOGFjMWJi MWZhM2Q5ZTA3N2EzYThhNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2Zs ZXhpdGVtLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXhpdGVtLmh0bWwK QEAgLTEyNSw0ICsxMjUsNTQgQEAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQogICA8dGV4dGFyZWEg ZGF0YS1leHBlY3RlZC1kaXNwbGF5PSJibG9jayIgZGF0YS1leHBlY3RlZC13aWR0aD0iNjAwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iMzAiPnRleHRhcmVhPC90ZXh0YXJlYT4KIDwvZGl2PgogCis8 IS0tIHRlc3RzIHRoYXQgbWluLWhlaWdodCBleHBhbmRzIHRoZSBoZWlnaHQgb2YgZmxleCBpdGVt cyBiZXlvbmQgdGhlIGhlaWdodCBvZiB0aGUgZmxleGJveCAtLT4KKzxkaXYgY2xhc3M9ImZsZXhi b3giIHN0eWxlPSJoZWlnaHQ6NTBweCI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLWhlaWdodD0i NjAiIHN0eWxlPSJtaW4taGVpZ2h0OjYwcHgiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ibHVl LTEwMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjYwIiBzdHlsZT0ibWlu LWhlaWdodDo2MHB4IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4tMTAucG5nIj4KKyAg ICA8aW1nIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI3NSIgc3R5bGU9Im1pbi1oZWlnaHQ6MTUwJSIg c3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUtMTAwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4 cGVjdGVkLWhlaWdodD0iNzUiIHN0eWxlPSJtaW4taGVpZ2h0OjE1MCUiIHNyYz0iLi4vaW1hZ2Vz L3Jlc291cmNlcy9ncmVlbi0xMC5wbmciPgorICAgIDwhLS0gVE9ETzogdGVzdCBtaW4tY29udGVu dCwgbWF4LWNvbnRlbnQsIGZpbGwtYXZhaWxhYmxlLCBmaXQtY29udGVudCB3aGVuIHRoZXNlIGFy ZSBpbXBsZW1lbnRlZCBmb3IgaGVpZ2h0IC0tPgorPC9kaXY+CisKKzwhLS0gdGVzdHMgdGhhdCBt YXgtaGVpZ2h0IHNocmlua3MgdGhlIGhlaWdodCBvZiBmbGV4IGl0ZW1zIGxlc3MgdGhhbiB0aGUg aGVpZ2h0IG9mIHRoZSBmbGV4Ym94IC0tPgorPGRpdiBjbGFzcz0iZmxleGJveCIgc3R5bGU9Imhl aWdodDo1MHB4Ij4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0MCIgc3R5bGU9Im1h eC1oZWlnaHQ6NDBweCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUtMTAwLnBuZyI+Cisg ICAgPGltZyBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiIHN0eWxlPSJtYXgtaGVpZ2h0OjQwcHgi IHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ncmVlbi0xMC5wbmciPgorICAgIDxpbWcgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9IjI1IiBzdHlsZT0ibWF4LWhlaWdodDo1MCUiIHNyYz0iLi4vaW1hZ2Vz L3Jlc291cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC1oZWlnaHQ9 IjI1IiBzdHlsZT0ibWF4LWhlaWdodDo1MCUiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ncmVl bi0xMC5wbmciPgorICAgIDwhLS0gVE9ETzogdGVzdCBtaW4tY29udGVudCwgbWF4LWNvbnRlbnQs IGZpbGwtYXZhaWxhYmxlLCBmaXQtY29udGVudCB3aGVuIHRoZXNlIGFyZSBpbXBsZW1lbnRlZCBm b3IgaGVpZ2h0IC0tPgorPC9kaXY+CisKKzwhLS0gdGVzdHMgdGhhdCBtaW4td2lkdGggZXhwYW5k cyB0aGUgd2lkdGggb2YgZmxleCBpdGVtcyBiZXlvbmQgdGhlIHdpZHRoIG9mIHRoZSBmbGV4Ym94 IC0tPgorPGRpdiBjbGFzcz0iZmxleGJveCBjb2x1bW4iIHN0eWxlPSJ3aWR0aDo1MHB4Ij4KKyAg ICA8aW1nIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjYwIiBzdHlsZT0ibWluLXdpZHRoOjYwcHgiIHNy Yz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBl Y3RlZC13aWR0aD0iNjAiIHN0eWxlPSJtaW4td2lkdGg6NjBweCIgc3JjPSIuLi9pbWFnZXMvcmVz b3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLXdpZHRoPSI3NSIg c3R5bGU9Im1pbi13aWR0aDoxNTAlIiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvYmx1ZS0xMDAu cG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtd2lkdGg9Ijc1IiBzdHlsZT0ibWluLXdpZHRo OjE1MCUiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ncmVlbi0xMC5wbmciPgorICAgIDxpbWcg ZGF0YS1leHBlY3RlZC13aWR0aD0iMTAwIiBzdHlsZT0ibWluLXdpZHRoOi13ZWJraXQtbWluLWNv bnRlbnQiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxpbWcg ZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIHN0eWxlPSJtaW4td2lkdGg6LXdlYmtpdC1taW4tY29u dGVudCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGltZyBk YXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIHN0eWxlPSJtaW4td2lkdGg6LXdlYmtpdC1tYXgtY29u dGVudCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUtMTAwLnBuZyI+CisgICAgPGltZyBk YXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgc3R5bGU9Im1pbi13aWR0aDotd2Via2l0LW1heC1jb250 ZW50IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4tMTAucG5nIj4KKyAgICA8aW1nIGRh dGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBzdHlsZT0ibWluLXdpZHRoOi13ZWJraXQtZmlsbC1hdmFp bGFibGUiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxpbWcg ZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIHN0eWxlPSJtaW4td2lkdGg6LXdlYmtpdC1maWxsLWF2 YWlsYWJsZSIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGlt ZyBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIHN0eWxlPSJtaW4td2lkdGg6LXdlYmtpdC1maXQt Y29udGVudCIgc3JjPSIuLi9pbWFnZXMvcmVzb3VyY2VzL2JsdWUtMTAwLnBuZyI+CisgICAgPGlt ZyBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgc3R5bGU9Im1pbi13aWR0aDotd2Via2l0LWZpdC1j b250ZW50IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvZ3JlZW4tMTAucG5nIj4KKzwvZGl2Pgor Cis8IS0tIHRlc3RzIHRoYXQgbWF4LXdpZHRoIHNocmlua3MgdGhlIHdpZHRoIG9mIGZsZXggaXRl bXMgbGVzcyB0aGFuIHRoZSB3aWR0aCBvZiB0aGUgZmxleGJveCAtLT4KKzxkaXYgY2xhc3M9ImZs ZXhib3ggY29sdW1uIiBzdHlsZT0id2lkdGg6NTBweCI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVk LXdpZHRoPSI0MCIgc3R5bGU9Im1heC13aWR0aDo0MHB4IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJj ZXMvYmx1ZS0xMDAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwIiBzdHls ZT0ibWF4LXdpZHRoOjQwcHgiIHNyYz0iLi4vaW1hZ2VzL3Jlc291cmNlcy9ncmVlbi0xMC5wbmci PgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC13aWR0aD0iMjUiIHN0eWxlPSJtYXgtd2lkdGg6NTAl IiBzcmM9Ii4uL2ltYWdlcy9yZXNvdXJjZXMvYmx1ZS0xMDAucG5nIj4KKyAgICA8aW1nIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjI1IiBzdHlsZT0ibWF4LXdpZHRoOjUwJSIgc3JjPSIuLi9pbWFnZXMv cmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1 MCIgc3R5bGU9Im1heC13aWR0aDotd2Via2l0LW1pbi1jb250ZW50IiBzcmM9Ii4uL2ltYWdlcy9y ZXNvdXJjZXMvYmx1ZS0xMDAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEw IiBzdHlsZT0ibWF4LXdpZHRoOi13ZWJraXQtbWluLWNvbnRlbnQiIHNyYz0iLi4vaW1hZ2VzL3Jl c291cmNlcy9ncmVlbi0xMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC13aWR0aD0iNTAi IHN0eWxlPSJtYXgtd2lkdGg6LXdlYmtpdC1tYXgtY29udGVudCIgc3JjPSIuLi9pbWFnZXMvcmVz b3VyY2VzL2JsdWUtMTAwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMCIg c3R5bGU9Im1heC13aWR0aDotd2Via2l0LW1heC1jb250ZW50IiBzcmM9Ii4uL2ltYWdlcy9yZXNv dXJjZXMvZ3JlZW4tMTAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBz dHlsZT0ibWF4LXdpZHRoOi13ZWJraXQtZmlsbC1hdmFpbGFibGUiIHNyYz0iLi4vaW1hZ2VzL3Jl c291cmNlcy9ibHVlLTEwMC5wbmciPgorICAgIDxpbWcgZGF0YS1leHBlY3RlZC13aWR0aD0iNTAi IHN0eWxlPSJtYXgtd2lkdGg6LXdlYmtpdC1maWxsLWF2YWlsYWJsZSIgc3JjPSIuLi9pbWFnZXMv cmVzb3VyY2VzL2dyZWVuLTEwLnBuZyI+CisgICAgPGltZyBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1 MCIgc3R5bGU9Im1heC13aWR0aDotd2Via2l0LWZpdC1jb250ZW50IiBzcmM9Ii4uL2ltYWdlcy9y ZXNvdXJjZXMvYmx1ZS0xMDAucG5nIj4KKyAgICA8aW1nIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEw IiBzdHlsZT0ibWF4LXdpZHRoOi13ZWJraXQtZml0LWNvbnRlbnQiIHNyYz0iLi4vaW1hZ2VzL3Jl c291cmNlcy9ncmVlbi0xMC5wbmciPgorPC9kaXY+CisKIDwvaHRtbD4K