115156 2013-04-25 00:55:21 -0700 Fix table sizing when 'max-width' is used 2020-05-20 09:06:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate, InRadar P2 Normal --- 127997 1 rniwa noam changseok commit-queue esprehn+autocc ews-watchlist glenn hyatt jchaffraix kling kondapallykalyan llango.u-szeged mmaxfield noam pdr rniwa simon.fraser webkit-bug-importer zalan oldest_to_newest 881127 0 rniwa 2013-04-25 00:55:21 -0700 https://chromium.googlesource.com/chromium/blink/+/0bca0dec4895aeeb2054ba36316e984e4ebed06f Fix table sizing when 'max-width' is used r143534 make <table> abide by 'max-width' all the time which is wrong. Per the CSS specification, a table should be wide enough to fit its content, regardless of 'max-width'. r140479 fixed part of the regression from that change but made the same fatal mistake by constraining min-content to fit 'max-width'. The fix is to avoid constraining min-content and ensure that the table logical width is at least its min-content size. 958309 1 218857 llango.u-szeged 2013-12-10 05:47:12 -0800 Created attachment 218857 Patch 968301 2 llango.u-szeged 2014-01-15 06:18:48 -0800 Can anyone review this? 974230 3 218857 kling 2014-01-30 23:37:02 -0800 Comment on attachment 218857 Patch OK 974238 4 218857 commit-queue 2014-01-31 00:04:27 -0800 Comment on attachment 218857 Patch Clearing flags on attachment: 218857 Committed r163165: <http://trac.webkit.org/changeset/163165> 974239 5 commit-queue 2014-01-31 00:04:31 -0800 All reviewed patches have been landed. Closing bug. 974324 6 ap 2014-01-31 09:28:04 -0800 This change made two regression tests assert: fast/table/multiple-captions-crash.xhtml fast/table/multiple-captions-crash2.xhtml Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x0000000105bf7daa WTFCrash + 42 (Assertions.cpp:333) 1 com.apple.WebCore 0x0000000108ae4712 WebCore::RenderTable::updateLogicalWidth() + 3618 (RenderTable.cpp:334) 2 com.apple.WebCore 0x0000000108ae53c9 WebCore::RenderTable::layout() + 569 (RenderTable.cpp:437) 3 com.apple.WebCore 0x0000000109148ebb WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, WebCore::LayoutUnit&) + 1323 (RenderBlockFlow.cpp:640) 4 com.apple.WebCore 0x0000000109146ada WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + 618 (RenderBlockFlow.cpp:557) 5 com.apple.WebCore 0x00000001091456b7 WebCore::RenderBlockFlow::layoutBlock(bool, WebCore::LayoutUnit) + 1191 (RenderBlockFlow.cpp:407) 6 com.apple.WebCore 0x000000010887c55d WebCore::RenderBlock::layout() + 125 (RenderBlock.cpp:1318) 7 com.apple.WebCore 0x0000000109148ebb WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, WebCore::LayoutUnit&) + 1323 (RenderBlockFlow.cpp:640) 8 com.apple.WebCore 0x0000000109146ada WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + 618 (RenderBlockFlow.cpp:557) 974330 7 commit-queue 2014-01-31 09:35:52 -0800 Re-opened since this is blocked by bug 127997 975002 8 llango.u-szeged 2014-02-03 03:10:28 -0800 I cannot reproduce the assertions. (In reply to comment #6) > This change made two regression tests assert: > > fast/table/multiple-captions-crash.xhtml > fast/table/multiple-captions-crash2.xhtml > > Thread 0 Crashed:: Dispatch queue: com.apple.main-thread > 0 com.apple.JavaScriptCore 0x0000000105bf7daa WTFCrash + 42 (Assertions.cpp:333) > 1 com.apple.WebCore 0x0000000108ae4712 WebCore::RenderTable::updateLogicalWidth() + 3618 (RenderTable.cpp:334) > 2 com.apple.WebCore 0x0000000108ae53c9 WebCore::RenderTable::layout() + 569 (RenderTable.cpp:437) > 3 com.apple.WebCore 0x0000000109148ebb WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, WebCore::LayoutUnit&) + 1323 (RenderBlockFlow.cpp:640) > 4 com.apple.WebCore 0x0000000109146ada WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + 618 (RenderBlockFlow.cpp:557) > 5 com.apple.WebCore 0x00000001091456b7 WebCore::RenderBlockFlow::layoutBlock(bool, WebCore::LayoutUnit) + 1191 (RenderBlockFlow.cpp:407) > 6 com.apple.WebCore 0x000000010887c55d WebCore::RenderBlock::layout() + 125 (RenderBlock.cpp:1318) > 7 com.apple.WebCore 0x0000000109148ebb WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, WebCore::LayoutUnit&) + 1323 (RenderBlockFlow.cpp:640) > 8 com.apple.WebCore 0x0000000109146ada WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + 618 (RenderBlockFlow.cpp:557) 1654367 9 noam 2020-05-20 02:41:46 -0700 *** Bug 203589 has been marked as a duplicate of this bug. *** 1654373 10 399826 noam 2020-05-20 03:44:14 -0700 Created attachment 399826 Patch 1654375 11 noam 2020-05-20 03:46:11 -0700 This bug makes the wikipedia infobox create horizontal scroll: https://en.wikipedia.org/wiki/Normal_distribution The patch is verified to fix that. 1654378 12 noam 2020-05-20 04:07:17 -0700 *** Bug 109462 has been marked as a duplicate of this bug. *** 1654379 13 noam 2020-05-20 04:09:30 -0700 (In reply to Alexey Proskuryakov from comment #6) > This change made two regression tests assert: > > fast/table/multiple-captions-crash.xhtml > fast/table/multiple-captions-crash2.xhtml > > Thread 0 Crashed:: Dispatch queue: com.apple.main-thread > 0 com.apple.JavaScriptCore 0x0000000105bf7daa WTFCrash + 42 > (Assertions.cpp:333) > 1 com.apple.WebCore 0x0000000108ae4712 > WebCore::RenderTable::updateLogicalWidth() + 3618 (RenderTable.cpp:334) > 2 com.apple.WebCore 0x0000000108ae53c9 > WebCore::RenderTable::layout() + 569 (RenderTable.cpp:437) > 3 com.apple.WebCore 0x0000000109148ebb > WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, > WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, > WebCore::LayoutUnit&) + 1323 (RenderBlockFlow.cpp:640) > 4 com.apple.WebCore 0x0000000109146ada > WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + > 618 (RenderBlockFlow.cpp:557) > 5 com.apple.WebCore 0x00000001091456b7 > WebCore::RenderBlockFlow::layoutBlock(bool, WebCore::LayoutUnit) + 1191 > (RenderBlockFlow.cpp:407) > 6 com.apple.WebCore 0x000000010887c55d > WebCore::RenderBlock::layout() + 125 (RenderBlock.cpp:1318) > 7 com.apple.WebCore 0x0000000109148ebb > WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&, > WebCore::RenderBlockFlow::MarginInfo&, WebCore::LayoutUnit&, > WebCore::LayoutUnit&) + 1323 (RenderBlockFlow.cpp:640) > 8 com.apple.WebCore 0x0000000109146ada > WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&) + > 618 (RenderBlockFlow.cpp:557) There was a bug in the original patch from 2014 - (was modifying minPreferredWidth instead of maxPreferredWidth). The new patch should fix this. 1654467 14 ews-feeder 2020-05-20 09:05:47 -0700 Committed r261924: <https://trac.webkit.org/changeset/261924> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399826. 1654468 15 webkit-bug-importer 2020-05-20 09:06:18 -0700 <rdar://problem/63449424> 218857 2013-12-10 05:47:12 -0800 2020-05-20 03:44:10 -0700 Patch bug-115156-20131210054710.patch text/plain 10772 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWIwNzA2OTViNGMyNzhm NjExZWNiODAwMzZiNGQ2MTU4NGY3ZTk2OC4uNjY4ODExMWY2M2MxZDRiZmIxZDk0NzA1ZjRmNjQ2 MTEzOGI3NzVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTEyLTEwICBMw6Fz emzDsyBMYW5nw7MgIDxsYW5nb0BpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgRml4IHRhYmxl IHNpemluZyB3aGVuICdtYXgtd2lkdGgnIGlzIHVzZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUxNTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICByMTQzNTM0IG1ha2UgPHRhYmxlPiBhYmlkZSBieSAn bWF4LXdpZHRoJyBhbGwgdGhlIHRpbWUgd2hpY2ggaXMgd3JvbmcuCisgICAgICAgIFBlciB0aGUg Q1NTIHNwZWNpZmljYXRpb24sIGEgdGFibGUgc2hvdWxkIGJlIHdpZGUgZW5vdWdoIHRvIGZpdCBp dHMKKyAgICAgICAgY29udGVudCwgcmVnYXJkbGVzcyBvZiAnbWF4LXdpZHRoJy4KKworICAgICAg ICByMTQwNDc5IGZpeGVkIHBhcnQgb2YgdGhlIHJlZ3Jlc3Npb24gZnJvbSB0aGF0IGNoYW5nZSBi dXQgbWFkZSB0aGUKKyAgICAgICAgc2FtZSBmYXRhbCBtaXN0YWtlIGJ5IGNvbnN0cmFpbmluZyBt aW4tY29udGVudCB0byBmaXQgJ21heC13aWR0aCcuCisKKyAgICAgICAgVGhlIGZpeCBpcyB0byBh dm9pZCBjb25zdHJhaW5pbmcgbWluLWNvbnRlbnQgYW5kIGVuc3VyZSB0aGF0IHRoZSB0YWJsZQor ICAgICAgICBsb2dpY2FsIHdpZHRoIGlzIGF0IGxlYXN0IGl0cyBtaW4tY29udGVudCBzaXplLgor CisgICAgICAgIEJhY2twb3J0ZWQgZnJvbSBCbGluazoKKyAgICAgICAgaHR0cHM6Ly9jaHJvbWl1 bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysvMGJjYTBkZWM0ODk1YWVlYjIwNTRi YTM2MzE2ZTk4NGU0ZWJlZDA2ZgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGFibGUvaHRtbC10YWJs ZS13aWR0aC1tYXgtd2lkdGgtY29uc3RyYWluZWQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjp1cGRhdGVM b2dpY2FsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OmNvbXB1dGVQcmVm ZXJyZWRMb2dpY2FsV2lkdGhzKToKKwogMjAxMy0xMi0wOSAgQW5kcmVhcyBLbGluZyAgPGFrbGlu Z0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXIgb3V0IGZvbnQgd2lkdGggbWVhc3VyZW1lbnQg Y2FjaGVzIG9uIG1lbW9yeSBwcmVzc3VyZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGUuY3BwCmluZGV4IDc0YjAyNmNlODFmMTcyZjk5YTU0NmMyM2U0OGU4MDQ4ZDFkMDM2Mzgu LjEyNGRiYmI2YzY5ZmJhMjhiNzI1ZDdkYmE2ZDc4M2I5MWEyZjVjNGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcApAQCAtMjkyLDE2ICsyOTIsMTYgQEAgdm9pZCBS ZW5kZXJUYWJsZTo6dXBkYXRlTG9naWNhbFdpZHRoKCkKICAgICAgICAgc2V0TG9naWNhbFdpZHRo KHN0ZDo6bWluPGludD4oYXZhaWxhYmxlQ29udGVudExvZ2ljYWxXaWR0aCwgbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoKCkpKTsKICAgICB9CiAKLSAgICAvLyBFbnN1cmUgd2UgYXJlbid0IHNtYWxs ZXIgdGhhbiBvdXIgbWluIHByZWZlcnJlZCB3aWR0aC4KLSAgICBzZXRMb2dpY2FsV2lkdGgoc3Rk OjptYXg8aW50Pihsb2dpY2FsV2lkdGgoKSwgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkpKTsK LQotICAgIAogICAgIC8vIEVuc3VyZSB3ZSBhcmVuJ3QgYmlnZ2VyIHRoYW4gb3VyIG1heC13aWR0 aCBzdHlsZS4KICAgICBMZW5ndGggc3R5bGVNYXhMb2dpY2FsV2lkdGggPSBzdHlsZSgpLmxvZ2lj YWxNYXhXaWR0aCgpOwogICAgIGlmICgoc3R5bGVNYXhMb2dpY2FsV2lkdGguaXNTcGVjaWZpZWQo KSAmJiAhc3R5bGVNYXhMb2dpY2FsV2lkdGguaXNOZWdhdGl2ZSgpKSB8fCBzdHlsZU1heExvZ2lj YWxXaWR0aC5pc0ludHJpbnNpYygpKSB7CiAgICAgICAgIExheW91dFVuaXQgY29tcHV0ZWRNYXhM b2dpY2FsV2lkdGggPSBjb252ZXJ0U3R5bGVMb2dpY2FsV2lkdGhUb0NvbXB1dGVkV2lkdGgoc3R5 bGVNYXhMb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk7CiAgICAgICAgIHNldExv Z2ljYWxXaWR0aChzdGQ6Om1pbjxpbnQ+KGxvZ2ljYWxXaWR0aCgpLCBjb21wdXRlZE1heExvZ2lj YWxXaWR0aCkpOwogICAgIH0KKyAgICAKKyAgICAvLyBFbnN1cmUgd2UgYXJlbid0IHNtYWxsZXIg dGhhbiBvdXIgbWluIHByZWZlcnJlZCB3aWR0aC4gVGhpcyBNVVNUIGJlIGRvbmUgYWZ0ZXIgJ21h eC13aWR0aCcgYXMKKyAgICAvLyB3ZSBpZ25vcmUgaXQgaWYgaXQgbWVhbnMgd2Ugd291bGRuJ3Qg YWNjb21vZGF0ZSBvdXIgY29udGVudC4KKyAgICBzZXRMb2dpY2FsV2lkdGgoc3RkOjptYXg8aW50 Pihsb2dpY2FsV2lkdGgoKSwgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkpKTsKIAogICAgIC8v IEVuc3VyZSB3ZSBhcmVuJ3Qgc21hbGxlciB0aGFuIG91ciBtaW4td2lkdGggc3R5bGUuCiAgICAg TGVuZ3RoIHN0eWxlTWluTG9naWNhbFdpZHRoID0gc3R5bGUoKS5sb2dpY2FsTWluV2lkdGgoKTsK QEAgLTMyOCw2ICszMjgsMTAgQEAgdm9pZCBSZW5kZXJUYWJsZTo6dXBkYXRlTG9naWNhbFdpZHRo KCkKICAgICAgICAgc2V0TWFyZ2luU3RhcnQobWluaW11bVZhbHVlRm9yTGVuZ3RoKHN0eWxlKCku bWFyZ2luU3RhcnQoKSwgYXZhaWxhYmxlTG9naWNhbFdpZHRoKSk7CiAgICAgICAgIHNldE1hcmdp bkVuZChtaW5pbXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5tYXJnaW5FbmQoKSwgYXZhaWxhYmxl TG9naWNhbFdpZHRoKSk7CiAgICAgfQorCisgICAgLy8gV2Ugc2hvdWxkIE5FVkVSIHNocmluayB0 aGUgdGFibGUgYmVsb3cgdGhlIG1pbi1jb250ZW50IGxvZ2ljYWwgd2lkdGgsIG9yIGVsc2UgdGhl IHRhYmxlIGNhbid0IGFjY29tb2RhdGUKKyAgICAvLyBpdHMgb3duIGNvbnRlbnQgd2hpY2ggZG9l c24ndCBtYXRjaCBDU1Mgbm9yIHdoYXQgYXV0aG9ycyBleHBlY3QuCisgICAgQVNTRVJUKGxvZ2lj YWxXaWR0aCgpID49IG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpKTsKIH0KIAogLy8gVGhpcyBt ZXRob2QgdGFrZXMgYSBSZW5kZXJTdHlsZSdzIGxvZ2ljYWwgd2lkdGgsIG1pbi13aWR0aCwgb3Ig bWF4LXdpZHRoIGxlbmd0aCBhbmQgY29tcHV0ZXMgaXRzIGFjdHVhbCB2YWx1ZS4KQEAgLTc4Miw4 ICs3ODYsOSBAQCB2b2lkIFJlbmRlclRhYmxlOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRo cygpCiAKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgYmUgY2hlY2tpbmcgZm9y IGlzU3BlY2lmaWVkIHNpbmNlIHlvdSBzaG91bGQgYmUgYWJsZSB0byB1c2UgcGVyY2VudGFnZSwg Y2FsYyBvciB2aWV3cG9ydCByZWxhdGl2ZSB2YWx1ZXMgZm9yIG1heFdpZHRoLgogICAgIGlmIChz dHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzRml4ZWQoKSkgeworICAgICAgICAvLyBXZSBk b24ndCBjb25zdHJhaW4gbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggYXMgdGhlIHRhYmxlIHNo b3VsZCBiZSBhdCBsZWFzdCB0aGUgc2l6ZSBvZiBpdHMgbWluLWNvbnRlbnQsIHJlZ2FyZGxlc3Mg b2YgJ21heC13aWR0aCcuCiAgICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3Rk OjptaW4obV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2Fs V2lkdGhGb3JCb3hTaXppbmcoc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS52YWx1ZSgpKSk7 Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptaW4obV9taW5QcmVm ZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXpp bmcoc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS52YWx1ZSgpKSk7CisgICAgICAgIG1fbWlu UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lk dGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKICAgICB9CiAKICAgICAvLyBGSVhNRTog V2Ugc2hvdWxkIGJlIGFkZGluZyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoIGhlcmUsIGJ1 dCBtX3RhYmxlTGF5b3V0LT5jb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyBhbHJlYWR5IGRv ZXMsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggYzQzMDJlNDQ0ODgwYjg0NTI3ZmEzN2Q1MzYxZmJmZDBiYmYzOTQ0Ni4uMmZj MTg5YmI1YzJlZDEyMTgyOGZiNjM1YTg0YWFlYjFiOGQyYWQyNiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEzLTEyLTEwICBMw6FzemzDsyBMYW5nw7MgIDxsYW5nb0BpbmYudS1zemVnZWQuaHU+ CisKKyAgICAgICAgRml4IHRhYmxlIHNpemluZyB3aGVuICdtYXgtd2lkdGgnIGlzIHVzZWQuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUxNTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvdGFi bGUvY3NzLXRhYmxlLW1heC13aWR0aC1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC90YWJs ZS9jc3MtdGFibGUtbWF4LXdpZHRoLmh0bWw6CisgICAgICAgICogZmFzdC90YWJsZS9odG1sLXRh YmxlLXdpZHRoLW1heC13aWR0aC1jb25zdHJhaW5lZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvdGFibGUvaHRtbC10YWJsZS13aWR0aC1tYXgtd2lkdGgtY29uc3RyYWluZWQu aHRtbDogQWRkZWQuCisKIDIwMTMtMTItMDkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTM2MjgwKTogaW5wdXRbdHlwZT1pbWFnZV0gc2hv dWxkIGFzc3VtZSBjb29yZHMgb2YgMCwwIHdoZW4gYWN0aXZhdGVkIHdpdGhvdXQgcGh5c2ljYWxs eSBjbGlja2luZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9jc3MtdGFibGUt bWF4LXdpZHRoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvY3NzLXRhYmxl LW1heC13aWR0aC1leHBlY3RlZC50eHQKaW5kZXggODMxZGYyYjUwMmU2MThiMGI5NWJkN2YyYTA2 ZTJiNDU5MGZiZWQxYy4uOTkzZDg0YWVjMzA2YzRjNmQ2Y2MyMDc3ODA1OTg1YWFjZjZlMmRkNSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9jc3MtdGFibGUtbWF4LXdpZHRoLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2Nzcy10YWJsZS1tYXgtd2lk dGgtZXhwZWN0ZWQudHh0CkBAIC0xMCwxMSArMTAsMTEgQEAgTm90ZTpUaGUgd2lkdGggb2YgdGhl IGNzcyB0YWJsZXMgaW5jbHVzaXZlIG9mIGl0cyBib3JkZXIgd2lkdGguCiBQQVNTIG1heEdyZWF0 VGhhbk1pbldpZHRoQXV0b0xheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCBpcyAy MDIKIFBBU1MgbWluR3JlYXRUaGFuTWF4V2lkdGhBdXRvTGF5b3V0LmdldEJvdW5kaW5nQ2xpZW50 UmVjdCgpLndpZHRoIGlzIDIwMgogUEFTUyBvbmx5TWF4V2lkdGhBdXRvTGF5b3V0LmdldEJvdW5k aW5nQ2xpZW50UmVjdCgpLndpZHRoIGlzIDIwMgotUEFTUyBtYXhXaWR0aFplcm9BdXRvTGF5b3V0 LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIGlzIDAKK1BBU1MgbWF4V2lkdGhaZXJvQXV0 b0xheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCBpcyAxODIKIFBBU1MgbWF4R3Jl YXRUaGFuTWluV2lkdGhGaXhlZExheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCBp cyAyMDIKIFBBU1MgbWluR3JlYXRUaGFuTWF4V2lkdGhGaXhlZExheW91dC5nZXRCb3VuZGluZ0Ns aWVudFJlY3QoKS53aWR0aCBpcyAyMDIKIFBBU1Mgb25seU1heFdpZHRoRml4ZWRMYXlvdXQuZ2V0 Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGggaXMgMjAyCi1QQVNTIG1heFdpZHRoWmVyb0ZpeGVk TGF5b3V0LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIGlzIDAKK1BBU1MgbWF4V2lkdGha ZXJvRml4ZWRMYXlvdXQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGggaXMgMgogUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L3RhYmxlL2Nzcy10YWJsZS1tYXgtd2lkdGguaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvdGFibGUvY3NzLXRhYmxlLW1heC13aWR0aC5odG1sCmluZGV4IDdkNjcwNTZmMDM1 Nzc3NDBhYzkzMDIwZDYyMjYwODc5NGVmMThhZDcuLmJlNTU5NzE3NjM3OWI2N2M0MjBmMjhkZjIy MTJhMzIwMjU0NjZjMDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvY3NzLXRh YmxlLW1heC13aWR0aC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvY3NzLXRhYmxl LW1heC13aWR0aC5odG1sCkBAIC00Miw3ICs0Miw3IEBACiAgICAgICAgIGZ1Z2lhdCBudWxsYSBw YXJpYXR1ci5FeGNlcHRldXIgc2ludCBvY2NhZWNhdCBjdXBpZGF0YXQgbm9uIHByb2lkZW50LCBz dW50IGluIGN1bHBhIAogICAgICAgICBxdWkgb2ZmaWNpYSBkZXNlcnVudCBtb2xsaXQgYW5pbSBp ZCBlc3QgbGFib3J1bS4KICAgICA8L2Rpdj4KLSAgICA8ZGl2IGlkPSJtYXhXaWR0aFplcm9BdXRv TGF5b3V0IiBjbGFzcz0iY2hpbGQiIHN0eWxlPSJkaXNwbGF5OnRhYmxlOyBtYXgtd2lkdGg6MDsg d2lkdGg6MTAwJTsiPgorICAgIDxkaXYgaWQ9Im1heFdpZHRoWmVyb0F1dG9MYXlvdXQiIGNsYXNz PSJjaGlsZCIgc3R5bGU9ImRpc3BsYXk6dGFibGU7IG1heC13aWR0aDowOyB3aWR0aDoxMDAlOyBm b250OiAxMHB4LzEgQWhlbTsiPgogICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwg Y29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgCiAgICAgICAgIHRl bXBvciBpbmNpZGlkdW50IHV0IGxhYm9yZSBldCBkb2xvcmUgbWFnbmEgYWxpcXVhLiBVdCBlbmlt IGFkIG1pbmltIHZlbmlhbSwgCiAgICAgICAgIHF1aXMgbm9zdHJ1ZCBleGVyY2l0YXRpb24gdWxs YW1jbyBsYWJvcmlzIG5pc2kgdXQgYWxpcXVpcCBleCBlYSBjb21tb2RvIGNvbnNlcXVhdC4gCkBA IC05Nyw3ICs5Nyw3IEBAIHNob3VsZEJlKCJtaW5HcmVhdFRoYW5NYXhXaWR0aEF1dG9MYXlvdXQu Z2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGgiLCIyMDIiKTsKIG9ubHlNYXhXaWR0aEF1dG9M YXlvdXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib25seU1heFdpZHRoQXV0b0xheW91dCIp Owogc2hvdWxkQmUoIm9ubHlNYXhXaWR0aEF1dG9MYXlvdXQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0 KCkud2lkdGgiLCIyMDIiKTsKIG1heFdpZHRoWmVyb0F1dG9MYXlvdXQgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgibWF4V2lkdGhaZXJvQXV0b0xheW91dCIpOwotc2hvdWxkQmUoIm1heFdpZHRo WmVyb0F1dG9MYXlvdXQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGgiLCIwIik7CitzaG91 bGRCZSgibWF4V2lkdGhaZXJvQXV0b0xheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0 aCIsIjE4MiIpOwogbWF4R3JlYXRUaGFuTWluV2lkdGhGaXhlZExheW91dCA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJtYXhHcmVhdFRoYW5NaW5XaWR0aEZpeGVkTGF5b3V0Iik7CiBzaG91bGRC ZSgibWF4R3JlYXRUaGFuTWluV2lkdGhGaXhlZExheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3Qo KS53aWR0aCIsIjIwMiIpOwogbWluR3JlYXRUaGFuTWF4V2lkdGhGaXhlZExheW91dCA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJtaW5HcmVhdFRoYW5NYXhXaWR0aEZpeGVkTGF5b3V0Iik7CkBA IC0xMDUsNyArMTA1LDcgQEAgc2hvdWxkQmUoIm1pbkdyZWF0VGhhbk1heFdpZHRoRml4ZWRMYXlv dXQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGgiLCIyMDIiKTsKIG9ubHlNYXhXaWR0aEZp eGVkTGF5b3V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm9ubHlNYXhXaWR0aEZpeGVkTGF5 b3V0Iik7CiBzaG91bGRCZSgib25seU1heFdpZHRoRml4ZWRMYXlvdXQuZ2V0Qm91bmRpbmdDbGll bnRSZWN0KCkud2lkdGgiLCIyMDIiKTsKIG1heFdpZHRoWmVyb0ZpeGVkTGF5b3V0ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoIm1heFdpZHRoWmVyb0ZpeGVkTGF5b3V0Iik7Ci1zaG91bGRCZSgi bWF4V2lkdGhaZXJvRml4ZWRMYXlvdXQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGgiLCIw Iik7CitzaG91bGRCZSgibWF4V2lkdGhaZXJvRml4ZWRMYXlvdXQuZ2V0Qm91bmRpbmdDbGllbnRS ZWN0KCkud2lkdGgiLCIyIik7CiAKIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2NvbnRhaW5lcicpKTsKIDwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC90YWJsZS9odG1sLXRhYmxlLXdpZHRoLW1heC13aWR0aC1jb25zdHJhaW5l ZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2h0bWwtdGFibGUtd2lkdGgt bWF4LXdpZHRoLWNvbnN0cmFpbmVkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iOWZlMmU5YTZm NWZlYTlkMTczMWY4YzcxOGUyNWEwYjliNGU2ZmM0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC90YWJsZS9odG1sLXRhYmxlLXdpZHRoLW1heC13aWR0aC1jb25zdHJhaW5lZC1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgYSBmaXhl ZCB0YWJsZSBsYXlvdXQgd2l0aCBtYXgtd2lkdGggZG9lc24ndCBvdmVyLWNvbnN0cmFpbnQgdGhl IGNlbGwgKGllIHRoZSBjb250ZW50IHdpZHRoIHN0aWxsIHdpbnMgb3ZlciBtYXgtd2lkdGggcGVy IHRoZSBzcGVjaWZpY2F0aW9uKS4KK0ZvciB0aGlzIHRlc3QgdG8gcGFzcywgdGhlIHNlY29uZCBj ZWxsIHNob3VsZG4ndCBibGVlZCBvdXQgb2YgdGhlIHRhYmxlLgorQ2VsbCB0ZXh0CUNlbGwgdGV4 dCB0ZXh0IHRleHQgdGV4dAorUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90YWJs ZS9odG1sLXRhYmxlLXdpZHRoLW1heC13aWR0aC1jb25zdHJhaW5lZC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC90YWJsZS9odG1sLXRhYmxlLXdpZHRoLW1heC13aWR0aC1jb25zdHJhaW5lZC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjYwMjEyMTI5OWY0MGEzNmIwMGViMmQzNjc1ZDQ1MTc4YWZlNGQxOWMKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2h0bWwtdGFibGUtd2lkdGgt bWF4LXdpZHRoLWNvbnN0cmFpbmVkLmh0bWwKQEAgLTAsMCArMSwzNCBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgordGFibGUgeworICAgIGZvbnQ6IDIwcHgvMSBB aGVtOworICAgIGJvcmRlci1jb2xsYXBzZTogc2VwYXJhdGU7CisgICAgdGFibGUtbGF5b3V0OiBm aXhlZDsKKyAgICBtYXgtd2lkdGg6IDMwMHB4OworICAgIHdpZHRoOiAzMDBweDsKKyAgICBib3Jk ZXI6IDFweCBzb2xpZCAjZGRkZGRkOworICAgIGJvcmRlci1zcGFjaW5nOiAwcHg7Cit9CisKK3Rk IHsKKyAgICBwYWRkaW5nOiAwcHg7CisgICAgd2lkdGg6IDIwMHB4OworICAgIGJvcmRlci1sZWZ0 OiAxcHggc29saWQgI2RkZGRkZDsKK30KKzwvc3R5bGU+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVz b3VyY2VzL2NoZWNrLWxheW91dC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9 ImNoZWNrTGF5b3V0KCd0YWJsZScpIj4KKyAgICA8ZGl2PlRoaXMgdGVzdCBjaGVja3MgdGhhdCBh IGZpeGVkIHRhYmxlIGxheW91dCB3aXRoIG1heC13aWR0aCBkb2Vzbid0IG92ZXItY29uc3RyYWlu dCB0aGUgY2VsbCAoaWUgdGhlIGNvbnRlbnQgd2lkdGggc3RpbGwgd2lucyBvdmVyIG1heC13aWR0 aCBwZXIgdGhlIHNwZWNpZmljYXRpb24pLjwvZGl2PgorICAgIDxkaXY+Rm9yIHRoaXMgdGVzdCB0 byBwYXNzLCB0aGUgc2Vjb25kIGNlbGwgc2hvdWxkbid0IGJsZWVkIG91dCBvZiB0aGUgdGFibGUu PC9kaXY+CisgICAgPHRhYmxlIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwNCI+CisgICAgICAgIDx0 Ym9keT4KKyAgICAgICAgICAgIDx0cj4KKyAgICAgICAgICAgIDx0ZD5DZWxsIHRleHQ8L3RkPgor ICAgICAgICAgICAgPHRkPkNlbGwgdGV4dCB0ZXh0IHRleHQgdGV4dDwvdGQ+CisgICAgICAgICAg ICA8L3RyPgorICAgICAgICA8L3Rib2R5PgorICAgIDwvdGFibGU+Cis8L2JvZHk+PC9odG1sPgo= 399826 2020-05-20 03:44:14 -0700 2020-05-20 09:05:47 -0700 Patch bug-115156-20200520134412.patch text/plain 9543 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MTkwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA1LTIwICBOb2FtIFJv c2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBGaXggdGFibGUgc2l6aW5nIHdo ZW4gJ21heC13aWR0aCcgaXMgdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE1MTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQmFzZWQgb24gcHJldmlvdXMgcGF0Y2ggYnkgTMOhc3psw7MgTGFuZ8Oz ICA8bGFuZ29AaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGFibGUvaHRt bC10YWJsZS13aWR0aC1tYXgtd2lkdGgtY29uc3RyYWluZWQuaHRtbAorCisgICAgICAgIEEgdGFi bGUgc2hvdWxkIGFsd2F5cyBiZSB3aWRlIGVub3VnaCB0byBjb250YWluIGl0cyBjb250ZW50IChw cmVmZXJyZWQgbG9naWNhbCB3aWR0aCkuCisgICAgICAgIFRoaXMgY29uc3RyYWludCBzaG91bGQg YmUgc3Ryb25nZXIgdGhhbiB0aGUgdGFibGUgc3R5bGUncyBzcGVjaWZpZWQgbWluLXdpZHRoL3dp ZHRoLgorCisgICAgICAgIFRoZSBiZWhhdmlvciBtYXRjaGVzIHRoZSBzcGVjLCBhbmQgYmVoYXZp b3Igb24gRmlyZWZveC9DaHJvbWUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OnVwZGF0ZUxvZ2ljYWxXaWR0aCk6 CisgICAgICAgICAgICAgICAgTWF4LXdpZHRoIHNob3VsZCBvbmx5IGFmZmVjdCB0aGUgdGFibGUn cyBtYXggcHJlZmVycmVkIHdpZHRoLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6 Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAgICAgICAgIENoYW5nZSB0 aGUgb3JkZXIgb2YgY29uc3RyYWludHMgc28gdGhhdCBjb250ZW50IGNvbnN0cmFpbnQgaXMgc3Ry b25nZXIgdGhhbiBzdHlsZSB3aWR0aC9tYXgtd2lkdGggY29uc3RyYWludC4KKwogMjAyMC0wNS0y MCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgY2Fs bGluZyBWaWRlb1NhbXBsZU9ic2VydmVyOjp2aWRlb1NhbXBsZUF2YWlsYWJsZSBmcm9tIGEgYmFj a2dyb3VuZCB0aHJlYWQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl LmNwcAkocmV2aXNpb24gMjYxOTA2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgwLDEwICsyODAsNiBAQCB2b2lkIFJlbmRl clRhYmxlOjp1cGRhdGVMb2dpY2FsV2lkdGgoKQogICAgICAgICBzZXRMb2dpY2FsV2lkdGgoc3Rk OjptaW4oYXZhaWxhYmxlQ29udGVudExvZ2ljYWxXaWR0aCwgbWF4V2lkdGgpKTsKICAgICB9CiAK LSAgICAvLyBFbnN1cmUgd2UgYXJlbid0IHNtYWxsZXIgdGhhbiBvdXIgbWluIHByZWZlcnJlZCB3 aWR0aC4KLSAgICBzZXRMb2dpY2FsV2lkdGgoc3RkOjptYXgobG9naWNhbFdpZHRoKCksIG1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCgpKSk7Ci0KLSAgICAKICAgICAvLyBFbnN1cmUgd2UgYXJlbid0 IGJpZ2dlciB0aGFuIG91ciBtYXgtd2lkdGggc3R5bGUuCiAgICAgTGVuZ3RoIHN0eWxlTWF4TG9n aWNhbFdpZHRoID0gc3R5bGUoKS5sb2dpY2FsTWF4V2lkdGgoKTsKICAgICBpZiAoKHN0eWxlTWF4 TG9naWNhbFdpZHRoLmlzU3BlY2lmaWVkKCkgJiYgIXN0eWxlTWF4TG9naWNhbFdpZHRoLmlzTmVn YXRpdmUoKSkgfHwgc3R5bGVNYXhMb2dpY2FsV2lkdGguaXNJbnRyaW5zaWMoKSkgewpAQCAtMjkx LDYgKzI4Nyw5IEBAIHZvaWQgUmVuZGVyVGFibGU6OnVwZGF0ZUxvZ2ljYWxXaWR0aCgpCiAgICAg ICAgIHNldExvZ2ljYWxXaWR0aChzdGQ6Om1pbihsb2dpY2FsV2lkdGgoKSwgY29tcHV0ZWRNYXhM b2dpY2FsV2lkdGgpKTsKICAgICB9CiAKKyAgICAvLyBFbnN1cmUgd2UgYXJlbid0IHNtYWxsZXIg dGhhbiBvdXIgbWluIHByZWZlcnJlZCB3aWR0aC4KKyAgICBzZXRMb2dpY2FsV2lkdGgoc3RkOjpt YXgobG9naWNhbFdpZHRoKCksIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpKSk7ICAgIAorCiAg ICAgLy8gRW5zdXJlIHdlIGFyZW4ndCBzbWFsbGVyIHRoYW4gb3VyIG1pbi13aWR0aCBzdHlsZS4K ICAgICBMZW5ndGggc3R5bGVNaW5Mb2dpY2FsV2lkdGggPSBzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0 aCgpOwogICAgIGlmICgoc3R5bGVNaW5Mb2dpY2FsV2lkdGguaXNTcGVjaWZpZWQoKSAmJiAhc3R5 bGVNaW5Mb2dpY2FsV2lkdGguaXNOZWdhdGl2ZSgpKSB8fCBzdHlsZU1pbkxvZ2ljYWxXaWR0aC5p c0ludHJpbnNpYygpKSB7CkBAIC04MjcsNyArODI2LDcgQEAgdm9pZCBSZW5kZXJUYWJsZTo6Y29t cHV0ZVByZWZlcnJlZExvZ2ljYQogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJseSBi ZSBjaGVja2luZyBmb3IgaXNTcGVjaWZpZWQgc2luY2UgeW91IHNob3VsZCBiZSBhYmxlIHRvIHVz ZSBwZXJjZW50YWdlIG9yIGNhbGMgdmFsdWVzIGZvciBtYXhXaWR0aC4KICAgICBpZiAoc3R5bGVU b1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc0ZpeGVkKCkpIHsKICAgICAgICAgbV9tYXhQcmVmZXJy ZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRq dXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZVRvVXNlLmxvZ2ljYWxN YXhXaWR0aCgpLnZhbHVlKCkpKTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSBzdGQ6Om1pbihtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExv Z2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLnZhbHVl KCkpKTsKKyAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1heChtX21h eFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwogICAg IH0KIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYmUgYWRkaW5nIGJvcmRlckFuZFBhZGRpbmdM b2dpY2FsV2lkdGggaGVyZSwgYnV0IG1fdGFibGVMYXlvdXQtPmNvbXB1dGVQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzIGFscmVhZHkgZG9lcywKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MTkwNikKKysrIExh eW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIw LTA1LTIwICBOb2FtIFJvc2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBGaXgg dGFibGUgc2l6aW5nIHdoZW4gJ21heC13aWR0aCcgaXMgdXNlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MTU2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmFzZWQgb24gYSBwcmV2aW91cyBwYXRjaCBi eSBMw6FzemzDsyBMYW5nw7MgIDxsYW5nb0BpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgKiBm YXN0L3RhYmxlL2Nzcy10YWJsZS1tYXgtd2lkdGgtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZh c3QvdGFibGUvY3NzLXRhYmxlLW1heC13aWR0aC5odG1sOgorICAgICAgICAgICAgICAgIENoYW5n ZSBpbiBiZWhhdmlvciwgdGVzdCB3YXMgZXhwZWN0aW5nIGJ1Z2d5IGJlaGF2aW9yLgorCisgICAg ICAgICogZmFzdC90YWJsZS9odG1sLXRhYmxlLXdpZHRoLW1heC13aWR0aC1jb25zdHJhaW5lZC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGFibGUvaHRtbC10YWJsZS13aWR0 aC1tYXgtd2lkdGgtY29uc3RyYWluZWQuaHRtbDogQWRkZWQuCisgICAgICAgICAgICAgICAgVGVz dCB0aGUgZGVzaXJlZCBiZWhhdmlvciB3aXRoIGNvbnRlbnQtY29uc3RyYWluZWQgdGFibGVzLgor CiAyMDIwLTA1LTE5ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtHVEtdW1dQRV0gVXBkYXRlIHNvbWUgZXhwZWN0YXRpb25zCkluZGV4OiBMYXlvdXRUZXN0cy9m YXN0L3RhYmxlL2Nzcy10YWJsZS1tYXgtd2lkdGgtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvdGFibGUvY3NzLXRhYmxlLW1heC13aWR0aC1leHBlY3RlZC50eHQJ KHJldmlzaW9uIDI2MTkwNikKKysrIExheW91dFRlc3RzL2Zhc3QvdGFibGUvY3NzLXRhYmxlLW1h eC13aWR0aC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTEwLDExICsxMCwxMSBAQCBO b3RlOlRoZSB3aWR0aCBvZiB0aGUgY3NzIHRhYmxlcyBpbmNsdXNpCiBQQVNTIG1heEdyZWF0VGhh bk1pbldpZHRoQXV0b0xheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCBpcyAyMDIK IFBBU1MgbWluR3JlYXRUaGFuTWF4V2lkdGhBdXRvTGF5b3V0LmdldEJvdW5kaW5nQ2xpZW50UmVj dCgpLndpZHRoIGlzIDIwMgogUEFTUyBvbmx5TWF4V2lkdGhBdXRvTGF5b3V0LmdldEJvdW5kaW5n Q2xpZW50UmVjdCgpLndpZHRoIGlzIDIwMgotUEFTUyBtYXhXaWR0aFplcm9BdXRvTGF5b3V0Lmdl dEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIGlzIDAKK1BBU1MgbWF4V2lkdGhaZXJvQXV0b0xh eW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCBpcyAxODIKIFBBU1MgbWF4R3JlYXRU aGFuTWluV2lkdGhGaXhlZExheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCBpcyAy MDIKIFBBU1MgbWluR3JlYXRUaGFuTWF4V2lkdGhGaXhlZExheW91dC5nZXRCb3VuZGluZ0NsaWVu dFJlY3QoKS53aWR0aCBpcyAyMDIKIFBBU1Mgb25seU1heFdpZHRoRml4ZWRMYXlvdXQuZ2V0Qm91 bmRpbmdDbGllbnRSZWN0KCkud2lkdGggaXMgMjAyCi1QQVNTIG1heFdpZHRoWmVyb0ZpeGVkTGF5 b3V0LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIGlzIDAKK1BBU1MgbWF4V2lkdGhaZXJv Rml4ZWRMYXlvdXQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGggaXMgMgogUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCkluZGV4OiBMYXlvdXRUZXN0 cy9mYXN0L3RhYmxlL2Nzcy10YWJsZS1tYXgtd2lkdGguaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L3RhYmxlL2Nzcy10YWJsZS1tYXgtd2lkdGguaHRtbAkocmV2aXNpb24gMjYx OTA2KQorKysgTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9jc3MtdGFibGUtbWF4LXdpZHRoLmh0bWwJ KHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDcgQEAKICAgICAgICAgZnVnaWF0IG51bGxhIHBh cmlhdHVyLkV4Y2VwdGV1ciBzaW50IG9jY2FlY2F0IGN1cGlkYXRhdCBub24gcHJvaWRlbnQsIHN1 bnQgaW4gY3VscGEgCiAgICAgICAgIHF1aSBvZmZpY2lhIGRlc2VydW50IG1vbGxpdCBhbmltIGlk IGVzdCBsYWJvcnVtLgogICAgIDwvZGl2PgotICAgIDxkaXYgaWQ9Im1heFdpZHRoWmVyb0F1dG9M YXlvdXQiIGNsYXNzPSJjaGlsZCIgc3R5bGU9ImRpc3BsYXk6dGFibGU7IG1heC13aWR0aDowOyB3 aWR0aDoxMDAlOyI+CisgICAgPGRpdiBpZD0ibWF4V2lkdGhaZXJvQXV0b0xheW91dCIgY2xhc3M9 ImNoaWxkIiBzdHlsZT0iZGlzcGxheTp0YWJsZTsgbWF4LXdpZHRoOjA7IHdpZHRoOjEwMCU7IGZv bnQ6IDEwcHgvMSBBaGVtOyI+CiAgICAgICAgIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBj b25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCAKICAgICAgICAgdGVt cG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIFV0IGVuaW0g YWQgbWluaW0gdmVuaWFtLCAKICAgICAgICAgcXVpcyBub3N0cnVkIGV4ZXJjaXRhdGlvbiB1bGxh bWNvIGxhYm9yaXMgbmlzaSB1dCBhbGlxdWlwIGV4IGVhIGNvbW1vZG8gY29uc2VxdWF0LiAKQEAg LTk3LDcgKzk3LDcgQEAgc2hvdWxkQmUoIm1pbkdyZWF0VGhhbk1heFdpZHRoQXV0b0xheW91dAog b25seU1heFdpZHRoQXV0b0xheW91dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvbmx5TWF4 V2lkdGhBdXRvTGF5b3V0Iik7CiBzaG91bGRCZSgib25seU1heFdpZHRoQXV0b0xheW91dC5nZXRC b3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCIsIjIwMiIpOwogbWF4V2lkdGhaZXJvQXV0b0xheW91 dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtYXhXaWR0aFplcm9BdXRvTGF5b3V0Iik7Ci1z aG91bGRCZSgibWF4V2lkdGhaZXJvQXV0b0xheW91dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53 aWR0aCIsIjAiKTsKK3Nob3VsZEJlKCJtYXhXaWR0aFplcm9BdXRvTGF5b3V0LmdldEJvdW5kaW5n Q2xpZW50UmVjdCgpLndpZHRoIiwiMTgyIik7CiBtYXhHcmVhdFRoYW5NaW5XaWR0aEZpeGVkTGF5 b3V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1heEdyZWF0VGhhbk1pbldpZHRoRml4ZWRM YXlvdXQiKTsKIHNob3VsZEJlKCJtYXhHcmVhdFRoYW5NaW5XaWR0aEZpeGVkTGF5b3V0LmdldEJv dW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIiwiMjAyIik7CiBtaW5HcmVhdFRoYW5NYXhXaWR0aEZp eGVkTGF5b3V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1pbkdyZWF0VGhhbk1heFdpZHRo Rml4ZWRMYXlvdXQiKTsKQEAgLTEwNSw3ICsxMDUsNyBAQCBzaG91bGRCZSgibWluR3JlYXRUaGFu TWF4V2lkdGhGaXhlZExheW91CiBvbmx5TWF4V2lkdGhGaXhlZExheW91dCA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJvbmx5TWF4V2lkdGhGaXhlZExheW91dCIpOwogc2hvdWxkQmUoIm9ubHlN YXhXaWR0aEZpeGVkTGF5b3V0LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIiwiMjAyIik7 CiBtYXhXaWR0aFplcm9GaXhlZExheW91dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtYXhX aWR0aFplcm9GaXhlZExheW91dCIpOwotc2hvdWxkQmUoIm1heFdpZHRoWmVyb0ZpeGVkTGF5b3V0 LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIiwiMCIpOworc2hvdWxkQmUoIm1heFdpZHRo WmVyb0ZpeGVkTGF5b3V0LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIiwiMiIpOwogCiBk b2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb250YWlu ZXInKSk7CiA8L3NjcmlwdD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvdGFibGUvaHRtbC10YWJs ZS13aWR0aC1tYXgtd2lkdGgtY29uc3RyYWluZWQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvdGFibGUvaHRtbC10YWJsZS13aWR0aC1tYXgtd2lkdGgtY29uc3Ry YWluZWQtZXhwZWN0ZWQudHh0CShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL2Zhc3QvdGFi bGUvaHRtbC10YWJsZS13aWR0aC1tYXgtd2lkdGgtY29uc3RyYWluZWQtZXhwZWN0ZWQudHh0CSh3 b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNCBAQAorVGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGEgZml4 ZWQgdGFibGUgbGF5b3V0IHdpdGggbWF4LXdpZHRoIGRvZXNuJ3Qgb3Zlci1jb25zdHJhaW50IHRo ZSBjZWxsIChpZSB0aGUgY29udGVudCB3aWR0aCBzdGlsbCB3aW5zIG92ZXIgbWF4LXdpZHRoIHBl ciB0aGUgc3BlY2lmaWNhdGlvbikuCitGb3IgdGhpcyB0ZXN0IHRvIHBhc3MsIHRoZSBzZWNvbmQg Y2VsbCBzaG91bGRuJ3QgYmxlZWQgb3V0IG9mIHRoZSB0YWJsZS4KK0NlbGwgdGV4dAlDZWxsIHRl eHQgdGV4dCB0ZXh0IHRleHQKK1BBU1MKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvdGFibGUvaHRt bC10YWJsZS13aWR0aC1tYXgtd2lkdGgtY29uc3RyYWluZWQuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9mYXN0L3RhYmxlL2h0bWwtdGFibGUtd2lkdGgtbWF4LXdpZHRoLWNvbnN0cmFp bmVkLmh0bWwJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9odG1sLXRh YmxlLXdpZHRoLW1heC13aWR0aC1jb25zdHJhaW5lZC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0w LDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KK3Rh YmxlIHsKKyAgICBmb250OiAyMHB4LzEgQWhlbTsKKyAgICBib3JkZXItY29sbGFwc2U6IHNlcGFy YXRlOworICAgIHRhYmxlLWxheW91dDogZml4ZWQ7CisgICAgbWF4LXdpZHRoOiAzMDBweDsKKyAg ICB3aWR0aDogMzAwcHg7CisgICAgYm9yZGVyOiAxcHggc29saWQgI2RkZGRkZDsKKyAgICBib3Jk ZXItc3BhY2luZzogMHB4OworfQorCit0ZCB7CisgICAgcGFkZGluZzogMHB4OworICAgIHdpZHRo OiAyMDBweDsKKyAgICBib3JkZXItbGVmdDogMXB4IHNvbGlkICNkZGRkZGQ7Cit9Cis8L3N0eWxl PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9jaGVjay1sYXlvdXQuanMiPjwvc2NyaXB0 PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJjaGVja0xheW91dCgndGFibGUnKSI+CisgICAgPGRp dj5UaGlzIHRlc3QgY2hlY2tzIHRoYXQgYSBmaXhlZCB0YWJsZSBsYXlvdXQgd2l0aCBtYXgtd2lk dGggZG9lc24ndCBvdmVyLWNvbnN0cmFpbnQgdGhlIGNlbGwgKGllIHRoZSBjb250ZW50IHdpZHRo IHN0aWxsIHdpbnMgb3ZlciBtYXgtd2lkdGggcGVyIHRoZSBzcGVjaWZpY2F0aW9uKS48L2Rpdj4K KyAgICA8ZGl2PkZvciB0aGlzIHRlc3QgdG8gcGFzcywgdGhlIHNlY29uZCBjZWxsIHNob3VsZG4n dCBibGVlZCBvdXQgb2YgdGhlIHRhYmxlLjwvZGl2PgorICAgIDx0YWJsZSBkYXRhLWV4cGVjdGVk LXdpZHRoPSI0MDQiPgorICAgICAgICA8dGJvZHk+CisgICAgICAgICAgICA8dHI+CisgICAgICAg ICAgICA8dGQ+Q2VsbCB0ZXh0PC90ZD4KKyAgICAgICAgICAgIDx0ZD5DZWxsIHRleHQgdGV4dCB0 ZXh0IHRleHQ8L3RkPgorICAgICAgICAgICAgPC90cj4KKyAgICAgICAgPC90Ym9keT4KKyAgICA8 L3RhYmxlPgorPC9ib2R5PjwvaHRtbD4K