46496 2010-09-24 12:25:11 -0700 calcReplacedWidthUsing has wrong containing block width. 2021-10-20 10:36:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 46123 1 hyatt hyatt changseok commit-queue darin d-r esprehn+autocc ews-watchlist fmalita glenn gyuyoung.kim hyatt kondapallykalyan pdr rbuis schenney svillar webkit-bug-importer zalan oldest_to_newest 284620 0 hyatt 2010-09-24 12:25:11 -0700 calcReplacedWidthUsing has wrong containing block width. The width used has to match the block-flow directionality of the replaced element and not of the containing block. 976236 1 223081 yuki.sekiguchi 2014-02-04 00:40:20 -0800 Created attachment 223081 Patch 1172561 2 darin 2016-03-09 09:16:39 -0800 Dave, would you review+ or review- please? 1204222 3 223081 ddkilzer 2016-06-21 11:38:07 -0700 Comment on attachment 223081 Patch Clearing review? flag on old patch that no longer applies to trunk. 1805249 4 441486 rbuis 2021-10-16 04:30:17 -0700 Created attachment 441486 Patch 1805300 5 441503 rbuis 2021-10-16 13:22:05 -0700 Created attachment 441503 Patch 1806041 6 441735 rbuis 2021-10-19 09:08:25 -0700 Created attachment 441735 Patch 1806061 7 441735 darin 2021-10-19 09:28:08 -0700 Comment on attachment 441735 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441735&action=review > Source/WebCore/rendering/RenderBox.cpp:3334 > + LayoutUnit containerWidth; > + if (isOutOfFlowPositioned()) > + containerWidth = containingBlockLogicalWidthForPositioned(downcast<RenderBoxModelObject>(*container())); > + else if (isHorizontalWritingMode() == containingBlock()->isHorizontalWritingMode()) > + containerWidth = containingBlockLogicalWidthForContent(); > + else > + containerWidth = perpendicularContainingBlockLogicalHeight(); I’ve been noticing something like this, perhaps if not exactly the same, as a repeated idiom in patches recently correcting orthogonal flow behavior. Is there a way to add another function to help us get the repeated pattern right, without the code having an if statement like this in the middle or hurting efficiency? Or maybe it’s not repeated often enough. 1806222 8 441735 rbuis 2021-10-19 12:23:20 -0700 Comment on attachment 441735 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441735&action=review >> Source/WebCore/rendering/RenderBox.cpp:3334 >> + containerWidth = perpendicularContainingBlockLogicalHeight(); > > I’ve been noticing something like this, perhaps if not exactly the same, as a repeated idiom in patches recently correcting orthogonal flow behavior. Is there a way to add another function to help us get the repeated pattern right, without the code having an if statement like this in the middle or hurting efficiency? Or maybe it’s not repeated often enough. I checked but I do not see it repeated enough. I do think we can provide something for the frequent "isHorizontalWritingMode() == containingBlock()->isHorizontalWritingMode()" like checks, but that sounds like a different bug. 1806287 9 441735 zalan 2021-10-19 13:57:30 -0700 Comment on attachment 441735 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441735&action=review >>> Source/WebCore/rendering/RenderBox.cpp:3334 >>> + containerWidth = perpendicularContainingBlockLogicalHeight(); >> >> I’ve been noticing something like this, perhaps if not exactly the same, as a repeated idiom in patches recently correcting orthogonal flow behavior. Is there a way to add another function to help us get the repeated pattern right, without the code having an if statement like this in the middle or hurting efficiency? Or maybe it’s not repeated often enough. > > I checked but I do not see it repeated enough. I do think we can provide something for the frequent "isHorizontalWritingMode() == containingBlock()->isHorizontalWritingMode()" like checks, but that sounds like a different bug. I always get confused when I see code like this sine the writing-direction defines (at least the part that's relevant here) the block direction for the content. Now the block level child box's writing direction (replaced box in this case) should have nothing to do with how we get the available width constraint from the containing block. It's only the containing block's writing direction that rules the logical width/height for its content (again, replaced box in this case). When the containing block has horizontal writing mode, the available width for its block level boxes matches its "physical" width, while with vertical direction the available width becomes its "physical" height so that the box level child boxes grow vertically with their widths. i.e. when you call containingBlockLogicalWidthForContent() it shouldn't matter whether _this_ box is horizontal or vertical in the context of finding the available width for the child box. I know this code copies the logic from computeReplacedLogicalHeightUsing, but we either do yet another flip somewhere to have correct final values or simply the functions/variable names don't mean logical values. 1806318 10 zalan 2021-10-19 14:28:48 -0700 or put it simply: when the child box ask “how much I can grow (logical)horizontally in this containing block”, the child box's writing direction is irrelevant. 1806565 11 441735 svillar 2021-10-20 04:21:28 -0700 Comment on attachment 441735 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441735&action=review >>>> Source/WebCore/rendering/RenderBox.cpp:3334 >>>> + containerWidth = perpendicularContainingBlockLogicalHeight(); >>> >>> I’ve been noticing something like this, perhaps if not exactly the same, as a repeated idiom in patches recently correcting orthogonal flow behavior. Is there a way to add another function to help us get the repeated pattern right, without the code having an if statement like this in the middle or hurting efficiency? Or maybe it’s not repeated often enough. >> >> I checked but I do not see it repeated enough. I do think we can provide something for the frequent "isHorizontalWritingMode() == containingBlock()->isHorizontalWritingMode()" like checks, but that sounds like a different bug. > > I always get confused when I see code like this sine the writing-direction defines (at least the part that's relevant here) the block direction for the content. > Now the block level child box's writing direction (replaced box in this case) should have nothing to do with how we get the available width constraint from the containing block. It's only the containing block's writing direction that rules the logical width/height for its content (again, replaced box in this case). > When the containing block has horizontal writing mode, the available width for its block level boxes matches its "physical" width, while with vertical direction the available width becomes its "physical" height so that the box level child boxes grow vertically with their widths. i.e. when you call containingBlockLogicalWidthForContent() it shouldn't matter whether _this_ box is horizontal or vertical in the context of finding the available width for the child box. I know this code copies the logic from computeReplacedLogicalHeightUsing, but we either do yet another flip somewhere to have correct final values or simply the functions/variable names don't mean logical values. I agree it's confusing but I don't think there is a problem with the code. In this case we're interested in the size of the container in the inline size of the child. If both are parallel then we need the inline size of the container, otherwise we are looking for the block size of the container. So we do need to check whether or not they're orthogonal. The question is I guess whether we do it in the caller does or the callee. BTW orthogonal to this bug, should we push for using Inline/Block instead of LogicalWidth/LogicalHeight ? 1806686 12 ews-feeder 2021-10-20 10:35:25 -0700 Committed r284548 (243290@main): <https://commits.webkit.org/243290@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441735. 1806688 13 webkit-bug-importer 2021-10-20 10:36:20 -0700 <rdar://problem/84468824> 223081 2014-02-04 00:40:20 -0800 2021-10-16 04:30:12 -0700 Patch bug-46496-20140204174017.patch text/plain 20137 yuki.sekiguchi U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTNmMzM0OWVhNTRhZTJj NThkODEyM2I4Y2NkM2I1YWZhZTA0MTk3OC4uOGQyYTAzZjQxODE3YTIwYzE5Nzk1YzU4MDMxNTc3 MmIxODA2ZDBlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTAyLTA0ICBZdWtp IFNla2lndWNoaSAgPHl1a2kuc2VraWd1Y2hpQGFjY2Vzcy1jb21wYW55LmNvbT4KKworICAgICAg ICBjYWxjUmVwbGFjZWRXaWR0aFVzaW5nIGhhcyB3cm9uZyBjb250YWluaW5nIGJsb2NrIHdpZHRo LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0OTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjYWxjUmVw bGFjZWRXaWR0aFVzaW5nIHdhcyBjaGFuZ2VkIHRvIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0 aFVzaW5nLgorCisgICAgICAgIElmIHRoZSByZXBsYWNlZCBoYXMgYSBwZXJwZW5kaWN1bGFyIGNv bnRhaW5pbmcgYmxvY2ssIGl0IHNob3VsZCB1c2UKKyAgICAgICAgdGhlIGxvZ2ljYWwgaGVpZ2h0 IG9mIGNvbnRhaW5pbmcgYmxvY2sgaW4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbC0KKyAgICAgICAg V2lkdGhVc2luZygpLgorCisgICAgICAgIElmIGFuIG9iamVjdCBlbGVtZW50IGhhcyBTVkcgZGF0 YSBpbiB2ZXJ0aWNhbCB3cml0aW5nIG1vZGUsIHRoZSBTVkcKKyAgICAgICAgYmVjb21lcyBob3Jp em9udGFsIHdyaXRpbmcgbW9kZSwgc28gd2Ugc2hvdWxkIGNoZWNrIG93bmVyIHJlbmRlcmVyJ3MK KyAgICAgICAgd3JpdGluZyBtb2RlLgorCisgICAgICAgIFRlc3RzOiBmYXN0L3dyaXRpbmctbW9k ZS9wZXJwZW5kaWN1bGFyLWltYWdlLWguaHRtbAorICAgICAgICAgICAgICAgZmFzdC93cml0aW5n LW1vZGUvcGVycGVuZGljdWxhci1pbWFnZS12Lmh0bWwKKyAgICAgICAgICAgICAgIGZhc3Qvd3Jp dGluZy1tb2RlL3BlcnBlbmRpY3VsYXItc3ZnLWguaHRtbAorICAgICAgICAgICAgICAgZmFzdC93 cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1zdmctdi5odG1sCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVJl cGxhY2VkTG9naWNhbFdpZHRoVXNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpj b21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0VXNpbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUm9vdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSb290Ojpj b21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZH Um9vdDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCk6CisKIDIwMTQtMDItMDMgIEFuZHJl YXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBzdHJheSB2ZXN0 aWdlIGZyb20gOjotd2Via2l0LWRpc3RyaWJ1dGVkIHNlbGVjdG9yLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBhODMzYTQyYzlmNWYxNWU0ZDY2ZTUxYzBmNDlmYzZm YTQyNmRhYzU2Li5mYjI2OWU2Y2FjYzUyYmIzYjI2NDNkYWI3NDU0ODMyZTU1M2FiZjFmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjg1MSwxMSArMjg1MSwyMCBA QCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoVXNpbmco TGVuZ3RoIGxvZ2ljYWxXaWR0aCkgY29ucwogICAgICAgICBjYXNlIEZpbGxBdmFpbGFibGU6CiAg ICAgICAgIGNhc2UgUGVyY2VudDogCiAgICAgICAgIGNhc2UgQ2FsY3VsYXRlZDogewotICAgICAg ICAgICAgLy8gRklYTUU6IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBp cyB3cm9uZyBpZiB0aGUgcmVwbGFjZWQgZWxlbWVudCdzIGJsb2NrLWZsb3cgaXMgcGVycGVuZGlj dWxhciB0byB0aGUKLSAgICAgICAgICAgIC8vIGNvbnRhaW5pbmcgYmxvY2sncyBibG9jay1mbG93 LgotICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ2NDk2Ci0gICAgICAgICAgICBjb25zdCBMYXlvdXRVbml0IGN3ID0gaXNPdXRPZkZsb3dQb3Np dGlvbmVkKCkgPyBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKHRvUmVu ZGVyQm94TW9kZWxPYmplY3QoY29udGFpbmVyKCkpKSA6IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxX aWR0aEZvckNvbnRlbnQoKTsKLSAgICAgICAgICAgIExlbmd0aCBjb250YWluZXJMb2dpY2FsV2lk dGggPSBjb250YWluaW5nQmxvY2soKS0+c3R5bGUoKS5sb2dpY2FsV2lkdGgoKTsKKyAgICAgICAg ICAgIGNvbnN0IGJvb2wgaGFzUGVycGVuZGljdWxhckNvbnRhaW5pbmdCbG9jayA9IGNvbnRhaW5l cigpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCk7CisgICAgICAgICAgICBMYXlvdXRVbml0IGN3OworICAgICAgICAgICAgaWYgKGlzT3V0T2ZG bG93UG9zaXRpb25lZCgpKSB7CisgICAgICAgICAgICAgICAgLy8gY29udGFpbmluZ0Jsb2NrTG9n aWNhbFdpZHRoRm9yUG9zaXRpb25lZCgpIGFscmVhZHkgY29uc2lkZXJzIHBlcnBlbmRpY3VsYXIg Y2FzZS4KKyAgICAgICAgICAgICAgICBjdyA9IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZv clBvc2l0aW9uZWQodG9SZW5kZXJCb3hNb2RlbE9iamVjdChjb250YWluZXIoKSkpOworICAgICAg ICAgICAgfSBlbHNlIGlmIChoYXNQZXJwZW5kaWN1bGFyQ29udGFpbmluZ0Jsb2NrKQorICAgICAg ICAgICAgICAgIGN3ID0gY29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodEZvckNvbnRlbnQoSW5j bHVkZU1hcmdpbkJvcmRlclBhZGRpbmcpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgIGN3ID0gY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOworICAgICAg ICAgICAgTGVuZ3RoIGNvbnRhaW5lckxvZ2ljYWxXaWR0aDsKKyAgICAgICAgICAgIGlmIChoYXNQ ZXJwZW5kaWN1bGFyQ29udGFpbmluZ0Jsb2NrKQorICAgICAgICAgICAgICAgIGNvbnRhaW5lckxv Z2ljYWxXaWR0aCA9IGNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsK KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgg PSBjb250YWluaW5nQmxvY2soKS0+c3R5bGUoKS5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAg IC8vIEZJWE1FOiBIYW5kbGUgY2FzZXMgd2hlbiBjb250YWluaW5nIGJsb2NrIHdpZHRoIGlzIGNh bGN1bGF0ZWQgb3Igdmlld3BvcnQgcGVyY2VudC4KICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTA3MQogICAgICAgICAgICAgaWYgKGxvZ2lj YWxXaWR0aC5pc0ludHJpbnNpYygpKQpAQCAtMjkyMSw3ICsyOTMwLDExIEBAIExheW91dFVuaXQg UmVuZGVyQm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0VXNpbmcoTGVuZ3RoIGxvZ2lj YWxIZWlnaHQpIGNvCiAgICAgICAgICAgICBpZiAoaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCiAg ICAgICAgICAgICAgICAgYXZhaWxhYmxlSGVpZ2h0ID0gY29udGFpbmluZ0Jsb2NrTG9naWNhbEhl aWdodEZvclBvc2l0aW9uZWQodG9SZW5kZXJCb3hNb2RlbE9iamVjdChjYikpOwogICAgICAgICAg ICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgYXZhaWxhYmxlSGVpZ2h0ID0gY29udGFpbmluZ0Js b2NrTG9naWNhbEhlaWdodEZvckNvbnRlbnQoSW5jbHVkZU1hcmdpbkJvcmRlclBhZGRpbmcpOwor ICAgICAgICAgICAgICAgIGNvbnN0IGJvb2wgaGFzUGVycGVuZGljdWxhckNvbnRhaW5pbmdCbG9j ayA9IGNvbnRhaW5lcigpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCk7CisgICAgICAgICAgICAgICAgaWYgKGhhc1BlcnBlbmRpY3VsYXJDb250 YWluaW5nQmxvY2spCisgICAgICAgICAgICAgICAgICAgIGF2YWlsYWJsZUhlaWdodCA9IGNvbnRh aW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKTsKKyAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgIGF2YWlsYWJsZUhlaWdodCA9IGNvbnRhaW5pbmdCbG9ja0xv Z2ljYWxIZWlnaHRGb3JDb250ZW50KEluY2x1ZGVNYXJnaW5Cb3JkZXJQYWRkaW5nKTsKICAgICAg ICAgICAgICAgICAvLyBJdCBpcyBuZWNlc3NhcnkgdG8gdXNlIHRoZSBib3JkZXItYm94IHRvIG1h dGNoIFdpbklFJ3MgYnJva2VuCiAgICAgICAgICAgICAgICAgLy8gYm94IG1vZGVsLiAgVGhpcyBp cyBlc3NlbnRpYWwgZm9yIHNpemluZyBpbnNpZGUKICAgICAgICAgICAgICAgICAvLyB0YWJsZSBj ZWxscyB1c2luZyBwZXJjZW50YWdlIGhlaWdodHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcAppbmRleCA2ZGUzYWEzYzZiODBmYzIzZmE1ZWNjMmE0 OWM0ZDYxZDRlYjdhOTA4Li5jZjEyZDQ3YTY5YzdkMTE3MTYzMjA4YjFmZjQxN2M5MDllYThlNzMw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAK QEAgLTE0NiwxMiArMTQ2LDI0IEBAIExheW91dFVuaXQgUmVuZGVyU1ZHUm9vdDo6Y29tcHV0ZVJl cGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2hvCiAgICAgaWYgKHN0 eWxlKCkubG9naWNhbFdpZHRoKCkuaXNTcGVjaWZpZWQoKSB8fCBzdHlsZSgpLmxvZ2ljYWxNYXhX aWR0aCgpLmlzU3BlY2lmaWVkKCkpCiAgICAgICAgIHJldHVybiBSZW5kZXJSZXBsYWNlZDo6Y29t cHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogCi0gICAg aWYgKHN2Z1NWR0VsZW1lbnQoKS53aWR0aEF0dHJpYnV0ZUVzdGFibGlzaGVzVmlld3BvcnQoKSkK LSAgICAgICAgcmV0dXJuIHJlc29sdmVMZW5ndGhBdHRyaWJ1dGVGb3JTVkcoc3ZnU1ZHRWxlbWVu dCgpLmludHJpbnNpY1dpZHRoKFNWR1NWR0VsZW1lbnQ6Oklnbm9yZUNTU1Byb3BlcnRpZXMpLCBz dHlsZSgpLmVmZmVjdGl2ZVpvb20oKSwgY29udGFpbmluZ0Jsb2NrKCktPmF2YWlsYWJsZUxvZ2lj YWxXaWR0aCgpLCAmdmlldygpKTsKKyAgICBpZiAoc3ZnU1ZHRWxlbWVudCgpLndpZHRoQXR0cmli dXRlRXN0YWJsaXNoZXNWaWV3cG9ydCgpKSB7CisgICAgICAgIGNvbnN0IFJlbmRlckJsb2NrKiBj YiA9IGNvbnRhaW5pbmdCbG9jaygpOworICAgICAgICBjb25zdCBib29sIGhhc1BlcnBlbmRpY3Vs YXJDb250YWluaW5nQmxvY2sgPSBjYi0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAhPSBpc0hv cml6b250YWxXcml0aW5nTW9kZSgpOworICAgICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2lj YWxXaWR0aDsKKyAgICAgICAgaWYgKGhhc1BlcnBlbmRpY3VsYXJDb250YWluaW5nQmxvY2spCisg ICAgICAgICAgICBhdmFpbGFibGVMb2dpY2FsV2lkdGggPSBjYi0+YXZhaWxhYmxlTG9naWNhbEhl aWdodChJbmNsdWRlTWFyZ2luQm9yZGVyUGFkZGluZyk7CisgICAgICAgIGVsc2UKKyAgICAgICAg ICAgIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCA9IGNiLT5hdmFpbGFibGVMb2dpY2FsV2lkdGgoKTsK KyAgICAgICAgcmV0dXJuIHJlc29sdmVMZW5ndGhBdHRyaWJ1dGVGb3JTVkcoc3ZnU1ZHRWxlbWVu dCgpLmludHJpbnNpY1dpZHRoKFNWR1NWR0VsZW1lbnQ6Oklnbm9yZUNTU1Byb3BlcnRpZXMpLCBz dHlsZSgpLmVmZmVjdGl2ZVpvb20oKSwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCAmdmlldygpKTsK KyAgICB9CiAKICAgICAvLyBTVkcgZW1iZWRkZWQgdGhyb3VnaCBvYmplY3QvZW1iZWQvaWZyYW1l LgotICAgIGlmIChpc0VtYmVkZGVkVGhyb3VnaEZyYW1lQ29udGFpbmluZ1NWR0RvY3VtZW50KCkp CisgICAgaWYgKGlzRW1iZWRkZWRUaHJvdWdoRnJhbWVDb250YWluaW5nU1ZHRG9jdW1lbnQoKSkg eworICAgICAgICBjb25zdCBib29sIGhhc1BlcnBlbmRpY3VsYXJDb250YWluaW5nRnJhbWUgPSBm cmFtZSgpLm93bmVyUmVuZGVyZXIoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAhPSBpc0hv cml6b250YWxXcml0aW5nTW9kZSgpOworICAgICAgICBpZiAoaGFzUGVycGVuZGljdWxhckNvbnRh aW5pbmdGcmFtZSkKKyAgICAgICAgICAgIHJldHVybiBmcmFtZSgpLm93bmVyUmVuZGVyZXIoKS0+ YXZhaWxhYmxlTG9naWNhbEhlaWdodChJbmNsdWRlTWFyZ2luQm9yZGVyUGFkZGluZyk7CiAgICAg ICAgIHJldHVybiBmcmFtZSgpLm93bmVyUmVuZGVyZXIoKS0+YXZhaWxhYmxlTG9naWNhbFdpZHRo KCk7CisgICAgfQogCiAgICAgLy8gU1ZHIGVtYmVkZGVkIHZpYSBTVkdJbWFnZSAoYmFja2dyb3Vu ZC1pbWFnZS9ib3JkZXItaW1hZ2UvZXRjKSAvIElubGluZSBTVkcuCiAgICAgcmV0dXJuIFJlbmRl clJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoc2hvdWxkQ29tcHV0ZVByZWZl cnJlZCk7CkBAIC0xNzgsMTIgKzE5MCwyMyBAQCBMYXlvdXRVbml0IFJlbmRlclNWR1Jvb3Q6OmNv bXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSBjb25zdAogICAgICAgICB9IGVsc2UKICAgICAg ICAgICAgIFJlbmRlckJsb2NrOjpyZW1vdmVQZXJjZW50SGVpZ2h0RGVzY2VuZGFudChjb25zdF9j YXN0PFJlbmRlclNWR1Jvb3QmPigqdGhpcykpOwogCi0gICAgICAgIHJldHVybiByZXNvbHZlTGVu Z3RoQXR0cmlidXRlRm9yU1ZHKGhlaWdodCwgc3R5bGUoKS5lZmZlY3RpdmVab29tKCksIGNvbnRh aW5pbmdCbG9jaygpLT5hdmFpbGFibGVMb2dpY2FsSGVpZ2h0KEluY2x1ZGVNYXJnaW5Cb3JkZXJQ YWRkaW5nKSwgJnZpZXcoKSk7CisgICAgICAgIGNvbnN0IFJlbmRlckJsb2NrKiBjYiA9IGNvbnRh aW5pbmdCbG9jaygpOworICAgICAgICBjb25zdCBib29sIGhhc1BlcnBlbmRpY3VsYXJDb250YWlu aW5nQmxvY2sgPSBjYi0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAhPSBpc0hvcml6b250YWxX cml0aW5nTW9kZSgpOworICAgICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxIZWlnaHQ7 CisgICAgICAgIGlmIChoYXNQZXJwZW5kaWN1bGFyQ29udGFpbmluZ0Jsb2NrKQorICAgICAgICAg ICAgYXZhaWxhYmxlTG9naWNhbEhlaWdodCA9IGNiLT5hdmFpbGFibGVMb2dpY2FsV2lkdGgoKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgYXZhaWxhYmxlTG9naWNhbEhlaWdodCA9IGNiLT5h dmFpbGFibGVMb2dpY2FsSGVpZ2h0KEluY2x1ZGVNYXJnaW5Cb3JkZXJQYWRkaW5nKTsKKyAgICAg ICAgcmV0dXJuIHJlc29sdmVMZW5ndGhBdHRyaWJ1dGVGb3JTVkcoaGVpZ2h0LCBzdHlsZSgpLmVm ZmVjdGl2ZVpvb20oKSwgYXZhaWxhYmxlTG9naWNhbEhlaWdodCwgJnZpZXcoKSk7CiAgICAgfQog CiAgICAgLy8gU1ZHIGVtYmVkZGVkIHRocm91Z2ggb2JqZWN0L2VtYmVkL2lmcmFtZS4KLSAgICBp ZiAoaXNFbWJlZGRlZFRocm91Z2hGcmFtZUNvbnRhaW5pbmdTVkdEb2N1bWVudCgpKQorICAgIGlm IChpc0VtYmVkZGVkVGhyb3VnaEZyYW1lQ29udGFpbmluZ1NWR0RvY3VtZW50KCkpIHsKKyAgICAg ICAgY29uc3QgYm9vbCBoYXNQZXJwZW5kaWN1bGFyQ29udGFpbmluZ0ZyYW1lID0gZnJhbWUoKS5v d25lclJlbmRlcmVyKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgIT0gaXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKTsKKyAgICAgICAgaWYgKGhhc1BlcnBlbmRpY3VsYXJDb250YWluaW5nRnJh bWUpCisgICAgICAgICAgICByZXR1cm4gZnJhbWUoKS5vd25lclJlbmRlcmVyKCktPmF2YWlsYWJs ZUxvZ2ljYWxXaWR0aCgpOwogICAgICAgICByZXR1cm4gZnJhbWUoKS5vd25lclJlbmRlcmVyKCkt PmF2YWlsYWJsZUxvZ2ljYWxIZWlnaHQoSW5jbHVkZU1hcmdpbkJvcmRlclBhZGRpbmcpOworICAg IH0KIAogICAgIC8vIFNWRyBlbWJlZGRlZCB2aWEgU1ZHSW1hZ2UgKGJhY2tncm91bmQtaW1hZ2Uv Ym9yZGVyLWltYWdlL2V0YykgLyBJbmxpbmUgU1ZHLgogICAgIHJldHVybiBSZW5kZXJSZXBsYWNl ZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGNkNmExYzUzODE5YzVh ODY1Y2FiZTk0M2JkNDA3NDgwM2Q4ODdlZmMuLjhmYWNhYWE0YjQ2Mzk2ZWRlN2I4YTRmYzc2Mjk3 MzhhNGNjMDI3ODggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxNC0wMi0wNCAgWXVraSBTZWtp Z3VjaGkgIDx5dWtpLnNla2lndWNoaUBhY2Nlc3MtY29tcGFueS5jb20+CisKKyAgICAgICAgY2Fs Y1JlcGxhY2VkV2lkdGhVc2luZyBoYXMgd3JvbmcgY29udGFpbmluZyBibG9jayB3aWR0aC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCB0aGF0IGNo YW5naW5nIHdyaXRpbmcgbW9kZSBhdCBpbWcsIHN2ZyBhbmQgb2JqZWN0IGVsZW1lbnQuCisKKyAg ICAgICAgKiBmYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLWltYWdlLWgtZXhwZWN0ZWQu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC93cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1p bWFnZS1oLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvd3JpdGluZy1tb2RlL3BlcnBlbmRp Y3VsYXItaW1hZ2Utdi1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3dyaXRp bmctbW9kZS9wZXJwZW5kaWN1bGFyLWltYWdlLXYuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFz dC93cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1zdmctaC1leHBlY3RlZC5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBmYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLXN2Zy1oLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGZhc3Qvd3JpdGluZy1tb2RlL3BlcnBlbmRpY3VsYXItc3ZnLXYtZXhw ZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC93cml0aW5nLW1vZGUvcGVycGVuZGlj dWxhci1zdmctdi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3dyaXRpbmctbW9kZS9yZXNv dXJjZXMvMjAweDEwMC1jaXJjbGUucG5nOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3dyaXRpbmct bW9kZS9yZXNvdXJjZXMvMjAweDEwMC1yZWN0LnN2ZzogQWRkZWQuCisKIDIwMTQtMDItMDMgIE1h cmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE5lZWQgcmVncmVzc2lvbiB0 ZXN0IGZvciB0aGUgZGVidWdnZXIgbW9kaWZ5aW5nIGxvY2FscyBpbiBhIERGRyBmcmFtZS4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL3BlcnBlbmRpY3VsYXItaW1h Z2UtaC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvcGVycGVu ZGljdWxhci1pbWFnZS1oLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDM2NGEyYjlmODg2NWM5 YjQ1ZTZiN2JhYTRlZTEyMGM0ZDEwNmNmNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3Qvd3JpdGluZy1tb2RlL3BlcnBlbmRpY3VsYXItaW1hZ2UtaC1leHBlY3RlZC5odG1sCkBA IC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8c3R5bGU+CisgICAgaHRt bCB7IC13ZWJraXQtd3JpdGluZy1tb2RlOiBob3Jpem9udGFsLXRiOyB9CisgICAgZGl2IHsgLXdl YmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyB9Cis8L3N0eWxlPgorVGhlc2UgYmx1ZSBj aXJjbGUgaW1hZ2VzIHNob3VsZCBiZSBjaXJjbGVzLCBub3QgZWxsaXBzZXMuPGJyPgorVGhlc2Ug c2hvdWxkIG5vdCBiZSBvdmVyZmxvd2VkIGZyb20gb3JhbmdlIGJvcmRlci4KKzxocj4KK2ltZyBl bGVtZW50IHdpdGggcGVyY2VudCB3aWR0aC9oZWlnaHQuCis8ZGl2IHN0eWxlPSJ3aWR0aDogMjAw cHg7IGhlaWdodDogMTAwcHg7IGJvcmRlcjogc29saWQgM3B4IG9yYW5nZTsiPgorICAgIDxpbWcg c3R5bGU9IndpZHRoOiAxMDAlOyBoZWlnaHQ6IDEwMCUiIHNyYz0icmVzb3VyY2VzLzIwMHgxMDAt Y2lyY2xlLnBuZyI+Cis8L2Rpdj4KKzxocj4KK29iamVjdCBlbGVtZW50IHdoaWNoIGRhdGEgaXMg cG5nLgorPGRpdiBzdHlsZT0id2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDEwMHB4OyBib3JkZXI6IHNv bGlkIDNweCBvcmFuZ2U7Ij4KKyAgICA8b2JqZWN0IGRhdGE9InJlc291cmNlcy8yMDB4MTAwLWNp cmNsZS5wbmciIHR5cGU9ImltYWdlL3BuZyIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIxMDAiPjwvb2Jq ZWN0PgorPC9kaXY+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3dyaXRp bmctbW9kZS9wZXJwZW5kaWN1bGFyLWltYWdlLWguaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvd3Jp dGluZy1tb2RlL3BlcnBlbmRpY3VsYXItaW1hZ2UtaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE4ZmZkYzcz NDE3ODkxMWJjODRlYTZlMjgxZDk0YTRlYmRmODE4MWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLWltYWdlLWguaHRtbApAQCAt MCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPHN0eWxlPgorICAgIGh0bWwg eyAtd2Via2l0LXdyaXRpbmctbW9kZTogaG9yaXpvbnRhbC10YjsgfQorICAgIGltZyB7IC13ZWJr aXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgfQorPC9zdHlsZT4KK1RoZXNlIGJsdWUgY2ly Y2xlIGltYWdlcyBzaG91bGQgYmUgY2lyY2xlcywgbm90IGVsbGlwc2VzLjxicj4KK1RoZXNlIHNo b3VsZCBub3QgYmUgb3ZlcmZsb3dlZCBmcm9tIG9yYW5nZSBib3JkZXIuCis8aHI+CitpbWcgZWxl bWVudCB3aXRoIHBlcmNlbnQgd2lkdGgvaGVpZ2h0LgorPGRpdiBzdHlsZT0id2lkdGg6IDIwMHB4 OyBoZWlnaHQ6IDEwMHB4OyBib3JkZXI6IHNvbGlkIDNweCBvcmFuZ2U7Ij4KKyAgICA8aW1nIHN0 eWxlPSJ3aWR0aDogMTAwJTsgaGVpZ2h0OiAxMDAlIiBzcmM9InJlc291cmNlcy8yMDB4MTAwLWNp cmNsZS5wbmciPgorPC9kaXY+Cis8aHI+CitvYmplY3QgZWxlbWVudCB3aGljaCBkYXRhIGlzIHBu Zy4KKzxkaXYgc3R5bGU9IndpZHRoOiAyMDBweDsgaGVpZ2h0OiAxMDBweDsgYm9yZGVyOiBzb2xp ZCAzcHggb3JhbmdlOyI+CisgICAgPG9iamVjdCBkYXRhPSJyZXNvdXJjZXMvMjAweDEwMC1jaXJj bGUucG5nIiB0eXBlPSJpbWFnZS9wbmciIHdpZHRoPSIyMDAiIGhlaWdodD0iMTAwIj48L29iamVj dD4KKzwvZGl2PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5n LW1vZGUvcGVycGVuZGljdWxhci1pbWFnZS12LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLWltYWdlLXYtZXhwZWN0ZWQuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi4zNjYxYTFlNDkzMDMzZjAwYzMyZTBhMGY3NWRkZTRjZjFjOTVjY2QxCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1p bWFnZS12LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8 aHRtbD4KKzxzdHlsZT4KKyAgICBodG1sIHsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2Fs LXJsOyB9CisgICAgZGl2IHsgLXdlYmtpdC13cml0aW5nLW1vZGU6IGhvcml6b250YWwtdGI7IH0K Kzwvc3R5bGU+CitUaGVzZSBibHVlIGNpcmNsZSBpbWFnZXMgc2hvdWxkIGJlIGNpcmNsZXMsIG5v dCBlbGxpcHNlcy48YnI+CitUaGVzZSBzaG91bGQgbm90IGJlIG92ZXJmbG93ZWQgZnJvbSBvcmFu Z2UgYm9yZGVyLgorPGhyPgoraW1nIGVsZW1lbnQgd2l0aCBwZXJjZW50IHdpZHRoL2hlaWdodC4K KzxkaXYgc3R5bGU9IndpZHRoOiAyMDBweDsgaGVpZ2h0OiAxMDBweDsgYm9yZGVyOiBzb2xpZCAz cHggb3JhbmdlOyI+CisgICAgPGltZyBzdHlsZT0id2lkdGg6IDEwMCU7IGhlaWdodDogMTAwJSIg c3JjPSJyZXNvdXJjZXMvMjAweDEwMC1jaXJjbGUucG5nIj4KKzwvZGl2PgorPGhyPgorb2JqZWN0 IGVsZW1lbnQgd2hpY2ggZGF0YSBpcyBwbmcuCis8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwcHg7IGhl aWdodDogMTAwcHg7IGJvcmRlcjogc29saWQgM3B4IG9yYW5nZTsiPgorICAgIDxvYmplY3QgZGF0 YT0icmVzb3VyY2VzLzIwMHgxMDAtY2lyY2xlLnBuZyIgdHlwZT0iaW1hZ2UvcG5nIiB3aWR0aD0i MjAwIiBoZWlnaHQ9IjEwMCI+PC9vYmplY3Q+Cis8L2Rpdj4KKzwvaHRtbD4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL3BlcnBlbmRpY3VsYXItaW1hZ2Utdi5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1pbWFnZS12Lmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uNmJlNDEzZDNlNDY5ODk5YWZjNTQ2ZjllZDkwZDZkN2MzNTI1NDMwNgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL3BlcnBlbmRp Y3VsYXItaW1hZ2Utdi5odG1sCkBAIC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0 bWw+Cis8c3R5bGU+CisgICAgaHRtbCB7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1y bDsgfQorICAgIGltZyB7IC13ZWJraXQtd3JpdGluZy1tb2RlOiBob3Jpem9udGFsLXRiOyB9Cis8 L3N0eWxlPgorVGhlc2UgYmx1ZSBjaXJjbGUgaW1hZ2VzIHNob3VsZCBiZSBjaXJjbGVzLCBub3Qg ZWxsaXBzZXMuPGJyPgorVGhlc2Ugc2hvdWxkIG5vdCBiZSBvdmVyZmxvd2VkIGZyb20gb3Jhbmdl IGJvcmRlci4KKzxocj4KK2ltZyBlbGVtZW50IHdpdGggcGVyY2VudCB3aWR0aC9oZWlnaHQuCis8 ZGl2IHN0eWxlPSJ3aWR0aDogMjAwcHg7IGhlaWdodDogMTAwcHg7IGJvcmRlcjogc29saWQgM3B4 IG9yYW5nZTsiPgorICAgIDxpbWcgc3R5bGU9IndpZHRoOiAxMDAlOyBoZWlnaHQ6IDEwMCUiIHNy Yz0icmVzb3VyY2VzLzIwMHgxMDAtY2lyY2xlLnBuZyI+Cis8L2Rpdj4KKzxocj4KK29iamVjdCBl bGVtZW50IHdoaWNoIGRhdGEgaXMgcG5nLgorPGRpdiBzdHlsZT0id2lkdGg6IDIwMHB4OyBoZWln aHQ6IDEwMHB4OyBib3JkZXI6IHNvbGlkIDNweCBvcmFuZ2U7Ij4KKyAgICA8b2JqZWN0IGRhdGE9 InJlc291cmNlcy8yMDB4MTAwLWNpcmNsZS5wbmciIHR5cGU9ImltYWdlL3BuZyIgd2lkdGg9IjIw MCIgaGVpZ2h0PSIxMDAiPjwvb2JqZWN0PgorPC9kaXY+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLXN2Zy1oLWV4cGVjdGVk Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLXN2Zy1o LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzJlOThmZTVjZDg2YTE3MDRmMjcyYzVkNTAwMjJj YzJlZmU0YzdmMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1t b2RlL3BlcnBlbmRpY3VsYXItc3ZnLWgtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDIwIEBACis8 IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPHN0eWxlPgorICAgIGh0bWwgeyAtd2Via2l0LXdyaXRp bmctbW9kZTogaG9yaXpvbnRhbC10YjsgfQorPC9zdHlsZT4KK1RoZXNlIGJsdWUgcmVjdCBTVkdz IHNob3VsZCBiZSAyMDB4MTAwIGluIHZlcnRpY2FsIHdyaXRpbmcgbW9kZS48YnI+CitUaGVzZSBz aG91bGQgbm90IGJlIG92ZXJmbG93ZWQgZnJvbSBvcmFuZ2UgYm9yZGVyLgorPGhyPgorc3ZnIGVs ZW1lbnQuCis8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwcHg7IGhlaWdodDogMTAwcHg7IGJvcmRlcjog c29saWQgM3B4IG9yYW5nZTstd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7Ij4KKyAg ICA8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDIw MCAxMDAiPgorICAgICAgICA8cmVjdCBmaWxsPSJibHVlIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjAw IiBoZWlnaHQ9IjEwMCIgLz4KKyAgICA8L3N2Zz4KKzwvZGl2PgorPGhyPgorb2JqZWN0IGVsZW1l bnQgd2hpY2ggZGF0YSBpcyBTVkcuCis8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwcHg7IGhlaWdodDog MTAwcHg7IGJvcmRlcjogc29saWQgM3B4IG9yYW5nZTsiPgorICAgIDxvYmplY3QgZGF0YT0icmVz b3VyY2VzLzIwMHgxMDAtcmVjdC5zdmciIHR5cGU9ImltYWdlL3N2Zyt4bWwiIHdpZHRoPSIyMDAi IGhlaWdodD0iMTAwIj48L29iamVjdD4KKzwvZGl2PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1zdmctaC5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC93cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1zdmctaC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjZkZjU0YzExYTI3NzhiYWE3YzI5ZjY5MTdjNWMxZWQ5OTEyMzUxMmIKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLXN2 Zy1oLmh0bWwKQEAgLTAsMCArMSwyMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxzdHls ZT4KKyAgICBodG1sIHsgLXdlYmtpdC13cml0aW5nLW1vZGU6IGhvcml6b250YWwtdGI7IH0KKyAg ICBzdmcgeyAtd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7IH0KKzwvc3R5bGU+CitU aGVzZSBibHVlIHJlY3QgU1ZHcyBzaG91bGQgYmUgMjAweDEwMCBpbiB2ZXJ0aWNhbCB3cml0aW5n IG1vZGUuPGJyPgorVGhlc2Ugc2hvdWxkIG5vdCBiZSBvdmVyZmxvd2VkIGZyb20gb3JhbmdlIGJv cmRlci4KKzxocj4KK3N2ZyBlbGVtZW50LgorPGRpdiBzdHlsZT0id2lkdGg6IDIwMHB4OyBoZWln aHQ6IDEwMHB4OyBib3JkZXI6IHNvbGlkIDNweCBvcmFuZ2U7Ij4KKyAgICA8c3ZnIHhtbG5zPSJo dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDIwMCAxMDAiPgorICAgICAg ICA8cmVjdCBmaWxsPSJibHVlIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjEwMCIg Lz4KKyAgICA8L3N2Zz4KKzwvZGl2PgorPGhyPgorb2JqZWN0IGVsZW1lbnQgd2hpY2ggZGF0YSBp cyBTVkcuCis8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwcHg7IGhlaWdodDogMTAwcHg7IGJvcmRlcjog c29saWQgM3B4IG9yYW5nZTsiPgorICAgIDxvYmplY3QgZGF0YT0icmVzb3VyY2VzLzIwMHgxMDAt cmVjdC5zdmciIHR5cGU9ImltYWdlL3N2Zyt4bWwiIHdpZHRoPSIyMDAiIGhlaWdodD0iMTAwIj48 L29iamVjdD4KKzwvZGl2PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC93 cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1zdmctdi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC93cml0aW5nLW1vZGUvcGVycGVuZGljdWxhci1zdmctdi1leHBlY3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmQ0NzhmNTEzOTFlOTk1M2M0MmFjNDVjM2NhYWJiZGIzYTJkOTI5MzkKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFy LXN2Zy12LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8 aHRtbD4KKzxzdHlsZT4KKyAgICBodG1sIHsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2Fs LXJsOyB9CisgICAgZGl2IHsgLXdlYmtpdC13cml0aW5nLW1vZGU6IGhvcml6b250YWwtdGI7IH0K Kzwvc3R5bGU+CitUaGVzZSBibHVlIHJlY3QgU1ZHcyBzaG91bGQgYmUgMjAweDEwMCBpbiBob3Jp em9udGFsIHdyaXRpbmcgbW9kZS48YnI+CitUaGVzZSBzaG91bGQgbm90IGJlIG92ZXJmbG93ZWQg ZnJvbSBvcmFuZ2UgYm9yZGVyLgorPGhyPgorc3ZnIGVsZW1lbnQuCis8ZGl2IHN0eWxlPSJ3aWR0 aDogMjAwcHg7IGhlaWdodDogMTAwcHg7IGJvcmRlcjogc29saWQgM3B4IG9yYW5nZTsiPgorICAg IDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMjAw IDEwMCI+CisgICAgICAgIDxyZWN0IGZpbGw9ImJsdWUiIHg9IjAiIHk9IjAiIHdpZHRoPSIyMDAi IGhlaWdodD0iMTAwIiAvPgorICAgIDwvc3ZnPgorPC9kaXY+Cis8aHI+CitvYmplY3QgZWxlbWVu dCB3aGljaCBkYXRhIGlzIFNWRy4KKzxkaXYgc3R5bGU9IndpZHRoOiAyMDBweDsgaGVpZ2h0OiAx MDBweDsgYm9yZGVyOiBzb2xpZCAzcHggb3JhbmdlOyI+CisgICAgPG9iamVjdCBkYXRhPSJyZXNv dXJjZXMvMjAweDEwMC1yZWN0LnN2ZyIgdHlwZT0iaW1hZ2Uvc3ZnK3htbCIgd2lkdGg9IjIwMCIg aGVpZ2h0PSIxMDAiPjwvb2JqZWN0PgorPC9kaXY+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLXN2Zy12Lmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9wZXJwZW5kaWN1bGFyLXN2Zy12Lmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZTlkZjAxMjI5NDE0NjYyZTlhNjY2ZDMxOTM1ZTgwZTI0NWUzOGU1YwotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL3BlcnBlbmRpY3VsYXItc3Zn LXYuaHRtbApAQCAtMCwwICsxLDIxIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPHN0eWxl PgorICAgIGh0bWwgeyAtd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7IH0KKyAgICBz dmcgeyAtd2Via2l0LXdyaXRpbmctbW9kZTogaG9yaXpvbnRhbC10YjsgfQorPC9zdHlsZT4KK1Ro ZXNlIGJsdWUgcmVjdCBTVkdzIHNob3VsZCBiZSAyMDB4MTAwIGluIGhvcml6b250YWwgd3JpdGlu ZyBtb2RlLjxicj4KK1RoZXNlIHNob3VsZCBub3QgYmUgb3ZlcmZsb3dlZCBmcm9tIG9yYW5nZSBi b3JkZXIuCis8aHI+CitzdmcgZWxlbWVudC4KKzxkaXYgc3R5bGU9IndpZHRoOiAyMDBweDsgaGVp Z2h0OiAxMDBweDsgYm9yZGVyOiBzb2xpZCAzcHggb3JhbmdlOyI+CisgICAgPHN2ZyB4bWxucz0i aHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDAgMTAwIj4KKyAgICAg ICAgPHJlY3QgZmlsbD0iYmx1ZSIgeD0iMCIgeT0iMCIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIxMDAi IC8+CisgICAgPC9zdmc+Cis8L2Rpdj4KKzxocj4KK29iamVjdCBlbGVtZW50IHdoaWNoIGRhdGEg aXMgU1ZHLgorPGRpdiBzdHlsZT0id2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDEwMHB4OyBib3JkZXI6 IHNvbGlkIDNweCBvcmFuZ2U7Ij4KKyAgICA8b2JqZWN0IGRhdGE9InJlc291cmNlcy8yMDB4MTAw LXJlY3Quc3ZnIiB0eXBlPSJpbWFnZS9zdmcreG1sIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjEwMCI+ PC9vYmplY3Q+Cis8L2Rpdj4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv d3JpdGluZy1tb2RlL3Jlc291cmNlcy8yMDB4MTAwLWNpcmNsZS5wbmcgYi9MYXlvdXRUZXN0cy9m YXN0L3dyaXRpbmctbW9kZS9yZXNvdXJjZXMvMjAweDEwMC1jaXJjbGUucG5nCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmRlYjY5ODc2ZDEyN2E3NmMwNzc0MDI0ODc3Y2Y5MDU3MmU3NWYxNDEKR0lUIGJpbmFyeSBwYXRj aApsaXRlcmFsIDgxNwp6Y21lQVNATj8ob2xIeWB1VkJxIWlhMHZwXkN4QUdHZ0FHVT9abVpgOFFZ Xih6bypeN1NQe1diWjBweFFRY3RqUjYKekZtTVpsRmVBZ1BJVDgjRU9xVkBmOTc4SlJ5dUJWKylh PH4rNTsqYkgtK3F9LTUxMDReeCpicVRuRUE0dDtrZU40CnpZJEtOPTUpNXt+YFpeQHNyNUs7SkMw NExEVyVJPEYmTnUjZHJIMWRDO0VCI3ZPJWNDaW5rQE1uTVhhXkUqNDlzcwp6JFApQnV2fGJlOXFf ZFVkTnlFSERLYzQqbUUkQyY8bHpFfEFxUFhRIXBGPiRpNnAqbj16QUAqKzdsVVVVc24jM2EKejxO YkJ9R0Bzc0Z3UDhgcVZhQjJ2QTM1U1MrNyghdj4/elZVdyZyPyQ9aDJMIWQ5fEZ7R2FvYztYdHVv ZXZBeX1ACnpGfS1eY3RfMkVxaVIke192TDdodUIlNDJMRU1UfnteWmtqa24oeXJVK2RyPzxhV0Fp WHVye1ZWJkJ8OztaPisqUAp6XkYtRjtjTyFlPntBZ0ljXlgtTTRtPDBMUjR0TWhROEMkLStsb1lh QHktSVpZKyp2KUdUUEVAIWRBZStPXldpKlIKekg8bndUPzJpZiMtfVM5TXteJjh8YVJIN0E2TD8r ekY1ajx5WVBYbWl1WjVxSHoqRmg5O2o2NjBXd30+NERtWE1iCnpHXz1HaHRhXlhRZjVERkdnQSpJ OVNlUjVlU1VmPTV4TGlLWUtlOVpxbmwwJXUhJlpveGZgOUA8NEApQmhDbGpMKAp6VHJwNVdRU2Ap KjtfdjFTd35ReG52OC0/ZDh4MnluKThXY0wmbDtobGNUY2wyZyghZ3lhNTU0JlRLQDNmJTZCbkYK ejB0Pm93Nmpxcj5eLW4zK21GNVUmMVVqY2c7Z3RRfnkjZTwobU05enV7TTVNT2VuRU5CamtQcmoy TCMwJEUkKTxyCno3dkVnenN2dX5gfEFvdE1fWkNpO2o2fjZuJVYqMlF3IyFEYjNPKVNacGwkaT9v U3J9ZXw3aSFBezZtWEBLYEg2Ywp6QH00Plc7VTRZVjRvWjlFfEFmNz4tbyZUVSM1Xkk8b0pCfWJy cDVvcE4kJG8hNDt9Vnc+XjVoYmA1KnhwU3hocXYKej9HKDshKjhqUWhIfXt0cHt9PUc2VTF2fCFG fTdzTm1FcjM8K35ZMkFnNms+czV9Um56eFElODMpbFpkci1nMmIwCnpGSz41fV8kfXpzeXU4Jig7 dz4tQC1FJnMjZENhbG96ISF5a3ZmUDFKbHFNdlZBOGBfU3R+ZiNYRVByMDgwWlpYcgppTVd0aUFf cEBBQjlzaWBZe3BBflhveSkqOSYqMTZtPWQjV3pwJFB6YiM3P3BSCgpsaXRlcmFsIDAKSGNtVj9k MDAwMDEKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3dyaXRpbmctbW9kZS9yZXNvdXJj ZXMvMjAweDEwMC1yZWN0LnN2ZyBiL0xheW91dFRlc3RzL2Zhc3Qvd3JpdGluZy1tb2RlL3Jlc291 cmNlcy8yMDB4MTAwLXJlY3Quc3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhlYjdhYTIzZTMxYjg3ODk3YTIwMzJi YmYxYzc0YWNlMmIwOGUxY2IKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3dy aXRpbmctbW9kZS9yZXNvdXJjZXMvMjAweDEwMC1yZWN0LnN2ZwpAQCAtMCwwICsxLDQgQEAKKzw/ eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJubyI/PgorPHN2 ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDAgMTAw Ij4KKyAgICA8cmVjdCBmaWxsPSJibHVlIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjAwIiBoZWlnaHQ9 IjEwMCIvPgorPC9zdmc+Cg== 441486 2021-10-16 04:30:17 -0700 2021-10-16 13:22:00 -0700 Patch bug-46496-20211016123016.patch text/plain 4949 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmJkZjgzNTNhN2ZiYzJi MGU5ZDU4MWZlNTBhMTM4Nzk2MTcxYTVmNi4uNjI4Nzg2NGM5OGQ5MTkyYjY5ZTUyNjhkYmQwMGI0 ZjBiMGE4MzlmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTE2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IHBlcmNlbnRhZ2VzIG9uIG9y dGhvZ29uYWwgcmVwbGFjZWQgY2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvd3B0L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9zaXppbmctcGVyY2VudGFn ZXMtcmVwbGFjZWQtb3J0aG9nb25hbC0wMDEuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVSZXBsYWNl ZExvZ2ljYWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodFVzaW5nIGNvbnN0KToKKwogMjAyMS0xMC0xNSAg Um9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmVydCBy Mjg0MjMwLCBteSBsYXN0IGZpeGVzIHRvIHRoZSB3YXRjaCBidWlsZCBtYWtlIGl0IGJyZWFrIHRl c3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGRhMGJiNmQ3ZWI3 ZDQ1MGI5YjU2N2ZlNjVjNzYyOGIxYzlkZDFlZTkuLjY1MWU5OGI0YTM1NDU3MGI5YzgzMjk4MDY1 OGFjYzVhMjJiNzZmNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBA IC0zMzI1LDEwICszMzI1LDEzIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUmVwbGFj ZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0CiAgICAgY2FzZSBM ZW5ndGhUeXBlOjpGaWxsQXZhaWxhYmxlOgogICAgIGNhc2UgTGVuZ3RoVHlwZTo6UGVyY2VudDoK ICAgICBjYXNlIExlbmd0aFR5cGU6OkNhbGN1bGF0ZWQ6IHsKLSAgICAgICAgLy8gRklYTUU6IGNv bnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBpcyB3cm9uZyBpZiB0aGUgcmVw bGFjZWQgZWxlbWVudCdzIGJsb2NrLWZsb3cgaXMgcGVycGVuZGljdWxhciB0byB0aGUKLSAgICAg ICAgLy8gY29udGFpbmluZyBibG9jaydzIGJsb2NrLWZsb3cuCi0gICAgICAgIC8vIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ5NgotICAgICAgICBjb25zdCBMYXlv dXRVbml0IGN3ID0gaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgPyBjb250YWluaW5nQmxvY2tMb2dp Y2FsV2lkdGhGb3JQb3NpdGlvbmVkKGRvd25jYXN0PFJlbmRlckJveE1vZGVsT2JqZWN0PigqY29u dGFpbmVyKCkpKSA6IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKTsKKyAg ICAgICAgTGF5b3V0VW5pdCBjdzsKKyAgICAgICAgaWYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgp KQorICAgICAgICAgICAgY3cgPSBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlv bmVkKGRvd25jYXN0PFJlbmRlckJveE1vZGVsT2JqZWN0PigqY29udGFpbmVyKCkpKTsKKyAgICAg ICAgZWxzZSBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjb250YWluaW5nQmxvY2so KS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgIGN3ID0gY29udGFpbmlu Z0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOworICAgICAgICBlbHNlCisgICAgICAgICAg ICBjdyA9IHBlcnBlbmRpY3VsYXJDb250YWluaW5nQmxvY2tMb2dpY2FsSGVpZ2h0KCk7CiAgICAg ICAgIExlbmd0aCBjb250YWluZXJMb2dpY2FsV2lkdGggPSBjb250YWluaW5nQmxvY2soKS0+c3R5 bGUoKS5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBjYXNlcyB3aGVu IGNvbnRhaW5pbmcgYmxvY2sgd2lkdGggaXMgY2FsY3VsYXRlZCBvciB2aWV3cG9ydCBwZXJjZW50 LgogICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEw NzEKQEAgLTM0NzEsOSArMzQ3NCw2IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUmVw bGFjZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuCiAgICAgICAg ICAgICByZXR1cm4gYWRqdXN0Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JCb3hTaXppbmcodmFs dWVGb3JMZW5ndGgobG9naWNhbEhlaWdodCwgbmV3Q29udGVudEhlaWdodCkpOwogICAgICAgICB9 CiAgICAgICAgIAotICAgICAgICAvLyBGSVhNRTogYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpIGlz IHdyb25nIGlmIHRoZSByZXBsYWNlZCBlbGVtZW50J3MgYmxvY2stZmxvdyBpcyBwZXJwZW5kaWN1 bGFyIHRvIHRoZQotICAgICAgICAvLyBjb250YWluaW5nIGJsb2NrJ3MgYmxvY2stZmxvdy4KLSAg ICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2CiAg ICAgICAgIExheW91dFVuaXQgYXZhaWxhYmxlSGVpZ2h0OwogICAgICAgICBpZiAoaXNPdXRPZkZs b3dQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICBhdmFpbGFibGVIZWlnaHQgPSBjb250YWluaW5n QmxvY2tMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZChkb3duY2FzdDxSZW5kZXJCb3hNb2RlbE9i amVjdD4oKmNvbnRhaW5lcikpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDZlMTkwNGJhNDA3NDJjNTM3YmNlMmY3NmNhOGU1 MzU0NjU2MjFkM2IuLjMwZmRkY2Y3NWQ4MTEwMDhkMjUzYWI2ZDQzMmNiOWJhNTQ3Y2NkMmUgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMC0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIEZpeCBwZXJjZW50YWdlcyBvbiBvcnRob2dvbmFsIHJlcGxhY2VkIGNo aWxkcmVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 NjQ5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMC0xNSAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNz ZXRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmVydCByMjg0MjMwLCBteSBsYXN0IGZpeGVzIHRv IHRoZSB3YXRjaCBidWlsZCBtYWtlIGl0IGJyZWFrIHRlc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl eCA2MjlkZTg4NzQ2YTdkN2IyODNlNmE0MjdkMWQzYzExNGU4ZWE4YWExLi4zYzk0ZDZlNWU1YmVh OWYyNGI2ZmExNmFmZThjMzg0ZGJhMzdmMjViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0 RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQxMDYs NyArNDEwNiw2IEBAIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc2l6aW5nCiB3ZWJraXQub3JnL2IvMjA5MDgw IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3Np emluZy1vcnRob2dvbmFsLXBlcmNlbnRhZ2UtbWFyZ2luLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3NpemluZy1vcnRob2dvbmFsLXBlcmNlbnRhZ2UtbWFy Z2luLTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3Npemlu Zy1vcnRob2dvbmFsLXBlcmNlbnRhZ2UtbWFyZ2luLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy13cml0aW5nLW1vZGVzL3NpemluZy1wZXJjZW50YWdlcy1yZXBsYWNlZC1vcnRob2dv bmFsLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3RhYmxl LWNlbGwtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvdGFi bGUtY2VsbC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4 MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy90 YWJsZS1jb2x1bW4tb3JkZXItMDAyLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQo= 441503 2021-10-16 13:22:05 -0700 2021-10-19 09:08:18 -0700 Patch bug-46496-20211016212204.patch text/plain 5122 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTdlOWY2MTZlMzQ3Mzhi OTFhZjY4MzNjMDlmNjFiNTAxNmY5NTM0NC4uMTdjYTYwMTgzNWU2OGYwZTUyZTI0YzllNWUyMWY2 ZWFlNzE2OGFlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEwLTE2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IHBlcmNlbnRhZ2VzIG9uIG9y dGhvZ29uYWwgcmVwbGFjZWQgY2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTW9kaWZ5IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFVzaW5n IHRvIG1ha2UgaXQgYXdhcmUgb2YgdGhlIG9ydGhvZ29uYWwgZmxvdyBjYXNlCisgICAgICAgIHdo ZW4gZGVhbGluZyB3aXRoIGNhbGMvcGVyY2VudGFnZXMuCisKKyAgICAgICAgVGhpcyBwYXRjaCBh bHNvIHJlbW92ZXMgYW4gb3V0ZGF0ZWQgY29tbWVudCBmcm9tIGNvbXB1dGVSZXBsYWNlZExvZ2lj YWxIZWlnaHRVc2luZy4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dwdC9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc2l6aW5nLXBlcmNlbnRhZ2VzLXJlcGxh Y2VkLW9ydGhvZ29uYWwtMDAxLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2Fs V2lkdGhVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVS ZXBsYWNlZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMTAtMTYgIEFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTW92ZSBvdmVyZmxv d2luZyBjb250ZW50IGNyZWF0aW9uIHRvIExpbmVCdWlsZGVyOjppbml0aWFsaXplCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGRhMGJiNmQ3ZWI3ZDQ1MGI5YjU2N2Zl NjVjNzYyOGIxYzlkZDFlZTkuLjY1MWU5OGI0YTM1NDU3MGI5YzgzMjk4MDY1OGFjYzVhMjJiNzZm NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0zMzI1LDEwICsz MzI1LDEzIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lk dGhVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0CiAgICAgY2FzZSBMZW5ndGhUeXBlOjpG aWxsQXZhaWxhYmxlOgogICAgIGNhc2UgTGVuZ3RoVHlwZTo6UGVyY2VudDoKICAgICBjYXNlIExl bmd0aFR5cGU6OkNhbGN1bGF0ZWQ6IHsKLSAgICAgICAgLy8gRklYTUU6IGNvbnRhaW5pbmdCbG9j a0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBpcyB3cm9uZyBpZiB0aGUgcmVwbGFjZWQgZWxlbWVu dCdzIGJsb2NrLWZsb3cgaXMgcGVycGVuZGljdWxhciB0byB0aGUKLSAgICAgICAgLy8gY29udGFp bmluZyBibG9jaydzIGJsb2NrLWZsb3cuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ5NgotICAgICAgICBjb25zdCBMYXlvdXRVbml0IGN3ID0g aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgPyBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQ b3NpdGlvbmVkKGRvd25jYXN0PFJlbmRlckJveE1vZGVsT2JqZWN0PigqY29udGFpbmVyKCkpKSA6 IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKTsKKyAgICAgICAgTGF5b3V0 VW5pdCBjdzsKKyAgICAgICAgaWYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAgICAg ICAgY3cgPSBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKGRvd25jYXN0 PFJlbmRlckJveE1vZGVsT2JqZWN0PigqY29udGFpbmVyKCkpKTsKKyAgICAgICAgZWxzZSBpZiAo aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjb250YWluaW5nQmxvY2soKS0+aXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgIGN3ID0gY29udGFpbmluZ0Jsb2NrTG9naWNh bFdpZHRoRm9yQ29udGVudCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBjdyA9IHBlcnBl bmRpY3VsYXJDb250YWluaW5nQmxvY2tMb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgIExlbmd0aCBj b250YWluZXJMb2dpY2FsV2lkdGggPSBjb250YWluaW5nQmxvY2soKS0+c3R5bGUoKS5sb2dpY2Fs V2lkdGgoKTsKICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBjYXNlcyB3aGVuIGNvbnRhaW5pbmcg YmxvY2sgd2lkdGggaXMgY2FsY3VsYXRlZCBvciB2aWV3cG9ydCBwZXJjZW50LgogICAgICAgICAv LyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEwNzEKQEAgLTM0NzEs OSArMzQ3NCw2IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2Fs SGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuCiAgICAgICAgICAgICByZXR1cm4g YWRqdXN0Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgo bG9naWNhbEhlaWdodCwgbmV3Q29udGVudEhlaWdodCkpOwogICAgICAgICB9CiAgICAgICAgIAot ICAgICAgICAvLyBGSVhNRTogYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpIGlzIHdyb25nIGlmIHRo ZSByZXBsYWNlZCBlbGVtZW50J3MgYmxvY2stZmxvdyBpcyBwZXJwZW5kaWN1bGFyIHRvIHRoZQot ICAgICAgICAvLyBjb250YWluaW5nIGJsb2NrJ3MgYmxvY2stZmxvdy4KLSAgICAgICAgLy8gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2CiAgICAgICAgIExheW91 dFVuaXQgYXZhaWxhYmxlSGVpZ2h0OwogICAgICAgICBpZiAoaXNPdXRPZkZsb3dQb3NpdGlvbmVk KCkpCiAgICAgICAgICAgICBhdmFpbGFibGVIZWlnaHQgPSBjb250YWluaW5nQmxvY2tMb2dpY2Fs SGVpZ2h0Rm9yUG9zaXRpb25lZChkb3duY2FzdDxSZW5kZXJCb3hNb2RlbE9iamVjdD4oKmNvbnRh aW5lcikpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IGVkYzFlMTg0YjA0ZTQ0ZTNmOTk4ZDFhZTFlYzE1YTQzYjQxODQ0Njgu LjFiOTVlOWJmMTYxNmZhMTY3ZGUxZTI5YzA5YTQ3MGI5N2U3MmY4ZWEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMiBAQAorMjAyMS0xMC0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEZpeCBwZXJjZW50YWdlcyBvbiBvcnRob2dvbmFsIHJlcGxhY2VkIGNoaWxkcmVuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ5NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0 aW9uczoKKwogMjAyMS0xMC0xNiAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5kbyBzb21lIHJlYmFzZWxpbmUgaW4gcjI4NDI5Ni4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmlu ZGV4IDljNjU0NGJjNTI5Y2VlMmQ2Njg0NDFhZDZmODY5NmY4YTkzMTkyOTMuLjJkYTczY2QzNmU2 MmFhZTM5OWViNjY1MzVjZGI5Yzg5ZThhNjMyZjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDEw Nyw3ICs0MTA3LDYgQEAgd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9zaXppbmcKIHdlYmtpdC5vcmcvYi8yMDkw ODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv c2l6aW5nLW9ydGhvZ29uYWwtcGVyY2VudGFnZS1tYXJnaW4tMDA2Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc2l6aW5nLW9ydGhvZ29uYWwtcGVyY2VudGFnZS1t YXJnaW4tMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc2l6 aW5nLW9ydGhvZ29uYWwtcGVyY2VudGFnZS1tYXJnaW4tMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc2l6aW5nLXBlcmNlbnRhZ2VzLXJlcGxhY2VkLW9ydGhv Z29uYWwtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvdGFi bGUtY2VsbC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4 MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy90 YWJsZS1jZWxsLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5 MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz L3RhYmxlLWNvbHVtbi1vcmRlci0wMDIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 441735 2021-10-19 09:08:25 -0700 2021-10-20 10:35:28 -0700 Patch bug-46496-20211019180823.patch text/plain 6113 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY0MGM1ZDJmOWRmODI0 YjBlMzBkNTY2NDlhZDc0YzQ3MTgzYTgzZS4uZjYwMTg5YjM3MmRjNmMwYWQwM2NjNTc0MDY5Y2Fi YmY3MDc4NjJkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEwLTE5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IHBlcmNlbnRhZ2VzIG9uIG9y dGhvZ29uYWwgcmVwbGFjZWQgY2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTW9kaWZ5IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFVzaW5n IHRvIG1ha2UgaXQgYXdhcmUgb2YgdGhlIG9ydGhvZ29uYWwgZmxvdyBjYXNlCisgICAgICAgIHdo ZW4gZGVhbGluZyB3aXRoIGNhbGMvcGVyY2VudGFnZXMuCisKKyAgICAgICAgVGhpcyBwYXRjaCBh bHNvIHJlbW92ZXMgYW4gb3V0ZGF0ZWQgY29tbWVudCBmcm9tIGNvbXB1dGVSZXBsYWNlZExvZ2lj YWxIZWlnaHRVc2luZy4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dwdC9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc2l6aW5nLXBlcmNlbnRhZ2VzLXJlcGxh Y2VkLW9ydGhvZ29uYWwtMDAxLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2Fs V2lkdGhVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVS ZXBsYWNlZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMTAtMTkgIFR5bGVyIFdp bGNvY2sgIDx0eWxlcl93QGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogRml4IGJyb2tlbiBzcGVj IGxpbmtzIGluIEFjY2Vzc2liaWxpdHlPYmplY3QuY3BwIGFuZCBBY2Nlc3NpYmlsaXR5VHJlZS5j cHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZGJhMjRmZTRhMGUx YjZlZGRjNDM1NGZhMWI1NGQwYWI2YjRiZjk4NS4uZDc5OTBlNDMwZjEwYTBjOTYyZmUxMTQ4M2Y5 YTU1ZDY3MzQ5NDMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAg LTMzMjUsMTcgKzMzMjUsMjAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVSZXBsYWNl ZExvZ2ljYWxXaWR0aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3QKICAgICBjYXNlIExl bmd0aFR5cGU6OkZpbGxBdmFpbGFibGU6CiAgICAgY2FzZSBMZW5ndGhUeXBlOjpQZXJjZW50Ogog ICAgIGNhc2UgTGVuZ3RoVHlwZTo6Q2FsY3VsYXRlZDogewotICAgICAgICAvLyBGSVhNRTogY29u dGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpIGlzIHdyb25nIGlmIHRoZSByZXBs YWNlZCBlbGVtZW50J3MgYmxvY2stZmxvdyBpcyBwZXJwZW5kaWN1bGFyIHRvIHRoZQotICAgICAg ICAvLyBjb250YWluaW5nIGJsb2NrJ3MgYmxvY2stZmxvdy4KLSAgICAgICAgLy8gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2Ci0gICAgICAgIGNvbnN0IExheW91 dFVuaXQgY3cgPSBpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSA/IGNvbnRhaW5pbmdCbG9ja0xvZ2lj YWxXaWR0aEZvclBvc2l0aW9uZWQoZG93bmNhc3Q8UmVuZGVyQm94TW9kZWxPYmplY3Q+KCpjb250 YWluZXIoKSkpIDogY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOworICAg ICAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoOworICAgICAgICBpZiAoaXNPdXRPZkZsb3dQ b3NpdGlvbmVkKCkpCisgICAgICAgICAgICBjb250YWluZXJXaWR0aCA9IGNvbnRhaW5pbmdCbG9j a0xvZ2ljYWxXaWR0aEZvclBvc2l0aW9uZWQoZG93bmNhc3Q8UmVuZGVyQm94TW9kZWxPYmplY3Q+ KCpjb250YWluZXIoKSkpOworICAgICAgICBlbHNlIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9k ZSgpID09IGNvbnRhaW5pbmdCbG9jaygpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQorICAg ICAgICAgICAgY29udGFpbmVyV2lkdGggPSBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JD b250ZW50KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNvbnRhaW5lcldpZHRoID0gcGVy cGVuZGljdWxhckNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgTGVuZ3Ro IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCA9IGNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLmxvZ2lj YWxXaWR0aCgpOwogICAgICAgICAvLyBGSVhNRTogSGFuZGxlIGNhc2VzIHdoZW4gY29udGFpbmlu ZyBibG9jayB3aWR0aCBpcyBjYWxjdWxhdGVkIG9yIHZpZXdwb3J0IHBlcmNlbnQuCiAgICAgICAg IC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTA3MQogICAgICAg ICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCi0gICAgICAgICAgICByZXR1cm4gY29t cHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgY3csIGJvcmRlckFu ZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7 Ci0gICAgICAgIGlmIChjdyA+IDAgfHwgKCFjdyAmJiAoY29udGFpbmVyTG9naWNhbFdpZHRoLmlz Rml4ZWQoKSB8fCBjb250YWluZXJMb2dpY2FsV2lkdGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkp KSkKLSAgICAgICAgICAgIHJldHVybiBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94 U2l6aW5nKG1pbmltdW1WYWx1ZUZvckxlbmd0aChsb2dpY2FsV2lkdGgsIGN3KSwgbG9naWNhbFdp ZHRoLnR5cGUoKSk7CisgICAgICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGgsIGJvcmRlckFuZFBhZGRpbmdM b2dpY2FsV2lkdGgoKSkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CisgICAgICAg IGlmIChjb250YWluZXJXaWR0aCA+IDAgfHwgKCFjb250YWluZXJXaWR0aCAmJiAoY29udGFpbmVy TG9naWNhbFdpZHRoLmlzRml4ZWQoKSB8fCBjb250YWluZXJMb2dpY2FsV2lkdGguaXNQZXJjZW50 T3JDYWxjdWxhdGVkKCkpKSkKKyAgICAgICAgICAgIHJldHVybiBhZGp1c3RDb250ZW50Qm94TG9n aWNhbFdpZHRoRm9yQm94U2l6aW5nKG1pbmltdW1WYWx1ZUZvckxlbmd0aChsb2dpY2FsV2lkdGgs IGNvbnRhaW5lcldpZHRoKSwgbG9naWNhbFdpZHRoLnR5cGUoKSk7CiAgICAgICAgIHJldHVybiAw X2x1OwogICAgIH0KICAgICBjYXNlIExlbmd0aFR5cGU6OkludHJpbnNpYzoKQEAgLTM0NzIsOSAr MzQ3NSw2IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVp Z2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuCiAgICAgICAgICAgICByZXR1cm4gYWRq dXN0Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgobG9n aWNhbEhlaWdodCwgbmV3Q29udGVudEhlaWdodCkpOwogICAgICAgICB9CiAgICAgICAgIAotICAg ICAgICAvLyBGSVhNRTogYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpIGlzIHdyb25nIGlmIHRoZSBy ZXBsYWNlZCBlbGVtZW50J3MgYmxvY2stZmxvdyBpcyBwZXJwZW5kaWN1bGFyIHRvIHRoZQotICAg ICAgICAvLyBjb250YWluaW5nIGJsb2NrJ3MgYmxvY2stZmxvdy4KLSAgICAgICAgLy8gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDk2CiAgICAgICAgIExheW91dFVu aXQgYXZhaWxhYmxlSGVpZ2h0OwogICAgICAgICBpZiAoaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkp CiAgICAgICAgICAgICBhdmFpbGFibGVIZWlnaHQgPSBjb250YWluaW5nQmxvY2tMb2dpY2FsSGVp Z2h0Rm9yUG9zaXRpb25lZChkb3duY2FzdDxSZW5kZXJCb3hNb2RlbE9iamVjdD4oKmNvbnRhaW5l cikpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDY3MmIwNGY2MzNlZDdkYjk4NmRjZjg3MGZkOGYyOTg1MmUzNjE3NDcuLmVm NTdlYTRjNzJiOTgyNzcwMzgyNmQxNzBiYzI2NmNmZWU3NDM5ZTUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MiBAQAorMjAyMS0xMC0xOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAg IEZpeCBwZXJjZW50YWdlcyBvbiBvcnRob2dvbmFsIHJlcGxhY2VkIGNoaWxkcmVuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ5NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9u czoKKwogMjAyMS0xMC0xOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAg IFVuc2tpcCBwYXNzaW5nIGZsZXgtYmFzaXM6IGNvbnRlbnQgKyBhc3BlY3QgcmF0aW8gV1BUIHRl c3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBjNzliYjJmMGQwZDgzOWZjYzc3YzU4ZWUxYWVjZTRj MjJiMGU5ODU3Li5lYzM3NGQ3NGE3YmVlNjJiNmQ1N2M3NzRiOTg5OTQ0ZGFhYTJjMjM3IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMKQEAgLTQxMDcsNyArNDEwNyw2IEBAIHdlYmtpdC5vcmcvYi8yMDkwODAg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc2l6 aW5nCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy13cml0aW5nLW1vZGVzL3NpemluZy1vcnRob2dvbmFsLXBlcmNlbnRhZ2UtbWFyZ2lu LTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3NpemluZy1v cnRob2dvbmFsLXBlcmNlbnRhZ2UtbWFyZ2luLTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy13cml0aW5nLW1vZGVzL3NpemluZy1vcnRob2dvbmFsLXBlcmNlbnRhZ2UtbWFyZ2luLTAw OC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3NpemluZy1wZXJj ZW50YWdlcy1yZXBsYWNlZC1vcnRob2dvbmFsLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy13cml0aW5nLW1vZGVzL3RhYmxlLWNlbGwtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXdyaXRpbmctbW9kZXMvdGFibGUtY2VsbC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy90YWJsZS1jb2x1bW4tb3JkZXItMDAyLnhodCBbIEltYWdl T25seUZhaWx1cmUgXQo=