236359 2022-02-09 05:33:06 -0800 Expose the correct role, subrole and role description properties for the <dialog> element. 2022-02-13 08:01:50 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs ntim samuel_white webkit-bug-importer oldest_to_newest 1839104 0 andresg_22 2022-02-09 05:33:06 -0800 Expose the AXRoleDescription property for objects with role alert and dialog. 1839105 1 webkit-bug-importer 2022-02-09 05:33:18 -0800 <rdar://problem/88684714> 1839107 2 451363 andresg_22 2022-02-09 05:40:33 -0800 Created attachment 451363 Patch 1839199 3 451363 jcraig 2022-02-09 09:05:15 -0800 Comment on attachment 451363 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451363&action=review > Source/WebCore/ChangeLog:3 > + Expose the AXRoleDescription property for objects with role alert and dialog. Clarity: “alertdialog and dialog” not “alert and dialog” role. This isn’t for the transient non-dialog “alert” role. > Source/WebCore/platform/LocalizedStrings.cpp:520 > + return WEB_UI_STRING("alert", "accessibility role description for an alert"); Role desc of “alert” (e.g. not the more verbose “alert dialog”) seems okay for alert dialogs though, so I think the diff itself is good to go. 1839203 4 jcraig 2022-02-09 09:09:18 -0800 Would be good to include a layout test of <div role=dialog> and <dialog open> 1840094 5 451630 andresg_22 2022-02-10 19:23:30 -0800 Created attachment 451630 Patch 1840097 6 andresg_22 2022-02-10 19:25:50 -0800 In further investigation turns out that the behavior is already correct for elements with role="dialog". Thus this patch implements the same behavior for <dialog> elements. 1840099 7 andresg_22 2022-02-10 19:28:16 -0800 (In reply to James Craig from comment #4) > Would be good to include a layout test of <div role=dialog> and <dialog open> Added a new layout test for <dialog>. role="dialog" is already implemented and covered in tests. Thanks. 1840184 8 451630 cfleizach 2022-02-10 21:37:18 -0800 Comment on attachment 451630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451630&action=review > Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm:152 > + // INclude <dialog> elements and elements with role="dialog". INclude -> Include > Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm:153 > + if (roleValue() == AccessibilityRole::ApplicationDialog) is this Mac only? seems like it might be good for this to be accessibilityIsIgnored()==true in the base class 1840320 9 451684 andresg_22 2022-02-11 06:26:39 -0800 Created attachment 451684 Patch 1840321 10 andresg_22 2022-02-11 06:29:06 -0800 (In reply to chris fleizach from comment #8) > Comment on attachment 451630 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=451630&action=review > > > Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm:152 > > + // INclude <dialog> elements and elements with role="dialog". > > INclude -> Include > > > Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm:153 > > + if (roleValue() == AccessibilityRole::ApplicationDialog) > > is this Mac only? seems like it might be good for this to be > accessibilityIsIgnored()==true in the base class Fixed typo and moved it to the platform-independent code. 1840344 11 cfleizach 2022-02-11 07:27:20 -0800 Need to update the GTK results I think for this test too 1840374 12 451700 andresg_22 2022-02-11 08:23:59 -0800 Created attachment 451700 Patch 1841003 13 ews-feeder 2022-02-13 08:01:47 -0800 Committed r289713 (247198@main): <https://commits.webkit.org/247198@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451700. 451363 2022-02-09 05:40:33 -0800 2022-02-10 19:23:27 -0800 Patch bug-236359-20220209084032.patch text/plain 3531 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdjYjhhYTUzOWE3MTA5 ZGI3YjE3YTllMzQ0OTEyNjVkODA3ODgwMi4uNmQ3ZjU4OTgzMDViYjhhMTIzNGJlYzZjMDJkZTE1 NGQ5ZTcwMDkxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIyLTAyLTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBvc2UgdGhl IEFYUm9sZURlc2NyaXB0aW9uIHByb3BlcnR5IGZvciBvYmplY3RzIHdpdGggcm9sZSBhbGVydCBh bmQgZGlhbG9nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM2MzU5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84ODY4NDcxND4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIYW5kbGUgdGhlIGNhc2VzIG9m IEFwcGxpY2F0aW9uQWxlcnRkaWFsb2cgYW5kIEFwcGxpY2F0aW9uRGlhbG9nIHJvbGVzCisgICAg ICAgIGluIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnJvbGVQbGF0Zm9ybURlc2NyaXB0aW9uIG1ldGhv ZC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojpyb2xlUGxhdGZvcm1E ZXNjcmlwdGlvbiBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBWEFsZXJ0RGlhbG9nVGV4dCk6CisgICAgICAgIChXZWJD b3JlOjpBWERpYWxvZ1RleHQpOgorICAgICAgICAqIHBsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3Mu aDoKKwogMjAyMi0wMi0wOCAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+ CiAKICAgICAgICAgSW5pdGlhbGl6ZSB0aGUgQVhJc29sYXRlZE9iamVjdCBBY2Nlc3NpYmlsaXR5 VGV4dCBwcm9wZXJ0eSBsYXppbHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdE1hYy5tbQppbmRleCBhMjg5NTM4NzRj ODA1NTEyN2Y4MGIyZmMzNjJkOWNlODIxZTcwMWM0Li5mODQ1MDkxOTdjODM3YzFkODc5ZjJiMjcy ZmVmZDBiNzZkZjY0MmY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RNYWMubW0KQEAgLTQzNSw2ICs0MzUsMTAg QEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnJvbGVQbGF0Zm9ybURlc2NyaXB0aW9uKCkg Y29uc3QKICAgICAgICAgICAgIHJldHVybiBhcmlhTGFuZG1hcmtSb2xlRGVzY3JpcHRpb247CiAK ICAgICAgICAgc3dpdGNoIChyb2xlKSB7CisgICAgICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6 OkFwcGxpY2F0aW9uQWxlcnREaWFsb2c6CisgICAgICAgICAgICByZXR1cm4gQVhBbGVydERpYWxv Z1RleHQoKTsKKyAgICAgICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6QXBwbGljYXRpb25EaWFs b2c6CisgICAgICAgICAgICByZXR1cm4gQVhEaWFsb2dUZXh0KCk7CiAgICAgICAgIGNhc2UgQWNj ZXNzaWJpbGl0eVJvbGU6OkF1ZGlvOgogICAgICAgICAgICAgcmV0dXJuIGxvY2FsaXplZE1lZGlh Q29udHJvbEVsZW1lbnRTdHJpbmcoIkF1ZGlvRWxlbWVudCIpOwogICAgICAgICBjYXNlIEFjY2Vz c2liaWxpdHlSb2xlOjpEZWZpbml0aW9uOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vTG9jYWxpemVkU3RyaW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2Nh bGl6ZWRTdHJpbmdzLmNwcAppbmRleCBjZjVkMGUwMjZjZGY4MzM3MjJlNTFjYWMwYmNjN2YxMzRh NjI1ZTllLi42Zjk3NDUyYzkxMGFhMmEzNGJlNjkyYjEwZTEyOWU2MjgxM2EwNTg3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcApAQCAtNTE1LDYgKzUx NSwxNiBAQCBTdHJpbmcgc2VhcmNoTWVudUNsZWFyUmVjZW50U2VhcmNoZXNUZXh0KCkKIAogI2Vu ZGlmIC8vICFQTEFURk9STShJT1NfRkFNSUxZKQogCitTdHJpbmcgQVhBbGVydERpYWxvZ1RleHQo KQoreworICAgIHJldHVybiBXRUJfVUlfU1RSSU5HKCJhbGVydCIsICJhY2Nlc3NpYmlsaXR5IHJv bGUgZGVzY3JpcHRpb24gZm9yIGFuIGFsZXJ0Iik7Cit9CisKK1N0cmluZyBBWERpYWxvZ1RleHQo KQoreworICAgIHJldHVybiBXRUJfVUlfU1RSSU5HKCJkaWFsb2ciLCAiYWNjZXNzaWJpbGl0eSBy b2xlIGRlc2NyaXB0aW9uIGZvciBhIGRpYWxvZyIpOworfQorCiBTdHJpbmcgQVhXZWJBcmVhVGV4 dCgpCiB7CiAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkcoIkhUTUwgY29udGVudCIsICJhY2Nlc3Np YmlsaXR5IHJvbGUgZGVzY3JpcHRpb24gZm9yIHdlYiBhcmVhIik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmgKaW5kZXggNjUwYzcyODFmNjJkMDhjZWIwYTUzZWY3 NDgzNTJiMzJjMGFlZTA1Zi4uYzUwOTJiY2RkOGMwNmIyODk3ZjBiNTFmZmYzZWE2MzRiOTZkYjIx YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaApAQCAtMTY3 LDYgKzE2Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBTdHJpbmcgc2VhcmNoTWVudUNs ZWFyUmVjZW50U2VhcmNoZXNUZXh0KCk7CiAjZW5kaWYKIAorICAgIFN0cmluZyBBWEFsZXJ0RGlh bG9nVGV4dCgpOwogICAgIFN0cmluZyBBWFdlYkFyZWFUZXh0KCk7CiAgICAgU3RyaW5nIEFYTGlu a1RleHQoKTsKICAgICBTdHJpbmcgQVhMaXN0TWFya2VyVGV4dCgpOwpAQCAtMTc3LDYgKzE3OCw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBTdHJpbmcgQVhEZXNjcmlwdGlvbkxpc3RUZXh0 KCk7CiAgICAgU3RyaW5nIEFYRGVzY3JpcHRpb25MaXN0VGVybVRleHQoKTsKICAgICBTdHJpbmcg QVhEZXNjcmlwdGlvbkxpc3REZXRhaWxUZXh0KCk7CisgICAgU3RyaW5nIEFYRGlhbG9nVGV4dCgp OwogICAgIFN0cmluZyBBWEZvb3RlclJvbGVEZXNjcmlwdGlvblRleHQoKTsKICAgICBTdHJpbmcg QVhGaWxlVXBsb2FkQnV0dG9uVGV4dCgpOwogICAgIFN0cmluZyBBWE91dHB1dFRleHQoKTsK 451630 2022-02-10 19:23:30 -0800 2022-02-11 06:26:36 -0800 Patch bug-236359-20220210222329.patch text/plain 7064 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdjYjhhYTUzOWE3MTA5 ZGI3YjE3YTllMzQ0OTEyNjVkODA3ODgwMi4uY2M5MDhlNDNjNjY4NDM4NzBjN2MyYTM5NTdlMGVk YzhkN2M0NjE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTEwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBvc2UgdGhl IGNvcnJlY3Qgcm9sZSwgc3Vicm9sZSBhbmQgcm9sZSBkZXNjcmlwdGlvbiBwcm9wZXJ0aWVzIGZv ciB0aGUgPGRpYWxvZz4gZWxlbWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNjM1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRlc3Q6IGFjY2Vzc2liaWxpdHkvbWFjL2RpYWxvZy1wcm9wZXJ0aWVz Lmh0bWwKKworICAgICAgICBPbiBNYWMsIGVsZW1lbnRzIHdpdGggcm9sZT0iZGlhbG9nIiBhcmUg ZXhwb3NlZCB0byBhY2Nlc3NpYmlsaXR5IGNsaWVudHMKKyAgICAgICAgd2l0aCByb2xlIEFYR3Jv dXAsIHN1YnJvbGUgQVhBcHBsaWNhdGlvbkRpYWxvZyBhbmQgcm9sZSBkZXNjcmlwdGlvbgorICAg ICAgICAid2ViIGRpYWxvZyIuIFRoaXMgcGF0Y2ggaW1wbGVtZW50cyB0aGlzIGJlaGF2aW9yIGZv ciB0aGUgPGRpYWxvZz4KKyAgICAgICAgZWxlbWVudC4KKworICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eU5vZGVPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlRnJvbU5vZGUgY29u c3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5 UGxhdGZvcm1JbmNsdWRlc09iamVjdCBjb25zdCk6CisKIDIwMjItMDItMDggIEFuZHJlcyBHb256 YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIEluaXRpYWxpemUgdGhlIEFY SXNvbGF0ZWRPYmplY3QgQWNjZXNzaWJpbGl0eVRleHQgcHJvcGVydHkgbGF6aWx5LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVj dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2Jq ZWN0LmNwcAppbmRleCBkNTVlNDkwN2FiNzU5OGM2NzdiZDEyMTA4YzRmMTYzNmFjZGZmMDE0Li44 OGYyNWJhNzMwNzEyZjQ0NzZjZTc4OWY4ZmRjMzM5ZTUzMTZhZDUwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNw cApAQCAtMzU3LDYgKzM1Nyw4IEBAIEFjY2Vzc2liaWxpdHlSb2xlIEFjY2Vzc2liaWxpdHlOb2Rl T2JqZWN0OjpkZXRlcm1pbmVBY2Nlc3NpYmlsaXR5Um9sZUZyb21Ob2RlKFRyCiAgICAgICAgIHJl dHVybiBBY2Nlc3NpYmlsaXR5Um9sZTo6QmxvY2txdW90ZTsKICAgICBpZiAobm9kZSgpLT5oYXNU YWdOYW1lKGNhcHRpb25UYWcpKQogICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eVJvbGU6OkNh cHRpb247CisgICAgaWYgKG5vZGUoKS0+aGFzVGFnTmFtZShkaWFsb2dUYWcpKQorICAgICAgICBy ZXR1cm4gQWNjZXNzaWJpbGl0eVJvbGU6OkFwcGxpY2F0aW9uRGlhbG9nOwogICAgIGlmIChub2Rl KCktPmhhc1RhZ05hbWUobWFya1RhZykpCiAgICAgICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5Um9s ZTo6TWFyazsKICAgICBpZiAobm9kZSgpLT5oYXNUYWdOYW1lKHByZVRhZykpCkBAIC00MTMsNyAr NDE1LDcgQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmRldGVy bWluZUFjY2Vzc2liaWxpdHlSb2xlRnJvbU5vZGUoVHIKICAgICAgICAgcmV0dXJuIEFjY2Vzc2li aWxpdHlSb2xlOjpHcm91cDsKICAgICBpZiAoaXM8RWxlbWVudD4oKm5vZGUoKSkgJiYgZG93bmNh c3Q8RWxlbWVudD4oKm5vZGUoKSkuaXNGb2N1c2FibGUoKSkKICAgICAgICAgcmV0dXJuIEFjY2Vz c2liaWxpdHlSb2xlOjpHcm91cDsKLSAgICAKKwogICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5Um9s ZTo6VW5rbm93bjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RNYWMubW0KaW5kZXggYTI4OTUzODc0YzgwNTUx MjdmODBiMmZjMzYyZDljZTgyMWU3MDFjNC4uYjVkYzYwNTMwYzFjNzJlZDgwNzZlYmY4YmIxZmI3 MzM0ODQzMWJkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMv QWNjZXNzaWJpbGl0eU9iamVjdE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0TWFjLm1tCkBAIC0xNDgsNyArMTQ4LDExIEBAIEFj Y2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJp bGl0eVBsYXRmb3JtSW5jbHVkZXNPCiAKICAgICBpZiAocm9sZVZhbHVlKCkgPT0gQWNjZXNzaWJp bGl0eVJvbGU6OkNhcHRpb24gJiYgYXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBBY2Nlc3NpYmlsaXR5 Um9sZTo6VW5rbm93bikKICAgICAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNp b246Oklnbm9yZU9iamVjdDsKLSAgICAKKworICAgIC8vIElOY2x1ZGUgPGRpYWxvZz4gZWxlbWVu dHMgYW5kIGVsZW1lbnRzIHdpdGggcm9sZT0iZGlhbG9nIi4KKyAgICBpZiAocm9sZVZhbHVlKCkg PT0gQWNjZXNzaWJpbGl0eVJvbGU6OkFwcGxpY2F0aW9uRGlhbG9nKQorICAgICAgICByZXR1cm4g QWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbjo6SW5jbHVkZU9iamVjdDsKKwogICAgIGlmIChy b2xlVmFsdWUoKSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6TWFyaykKICAgICAgICAgcmV0dXJuIEFj Y2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb246OkluY2x1ZGVPYmplY3Q7CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMDAw NDMwZjQ5N2Y4NDg5ZTQ5YTIwMTA1YzEwZWJhOTBhYTFlYTM0Li5kM2IxOWM2YjBlMmIwNmMxODA3 YTZjM2YzY2FhMDk1ZDhjYTcxMzdmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMTAg IEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9z ZSB0aGUgY29ycmVjdCByb2xlLCBzdWJyb2xlIGFuZCByb2xlIGRlc2NyaXB0aW9uIHByb3BlcnRp ZXMgZm9yIHRoZSA8ZGlhbG9nPiBlbGVtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGVzdHMgdGhhdCB0aGVzZSBBWCBwcm9wZXJ0aWVzIGhhdmUg dGhlIGV4cGVjdGVkIHZhbHVlcyBib3RoIHdoZW4gdGhlCisgICAgICAgIGRpYWxvZyBpcyBzaG93 biBtb2RhbCBvciBtb2RlbGVzcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL2RpYWxv Zy1wcm9wZXJ0aWVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9tYWMvZGlhbG9nLXByb3BlcnRpZXMuaHRtbDogQWRkZWQuCisKIDIwMjItMDItMDggIFJhenZh biBDYWxpbWFuICA8cmNhbGltYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtGbGV4Ym94XSBBZGQgc3VwcG9ydCBmb3Igc2hvd2luZy9oaWRpbmcgZmxleCBjb250YWluZXIg b3ZlcmxheXMgYW5kIGJhc2ljIG92ZXJsYXkgZHJhd2luZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9tYWMvZGlhbG9nLXByb3BlcnRpZXMtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvZGlhbG9nLXByb3BlcnRpZXMtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjNjMzM1YmU0NTE2YzQ5NmM2ZGVlYjFjMWVjZjRmNTA3YzA1NGJiYmMKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9kaWFsb2ctcHJv cGVydGllcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBAQAorVGhpcyB0ZXN0IHZlcmlmaWVz IHNldmVyYWwgQVggcHJvcGVydGllcyBvZiB0aGUgZGlhbG9nIGVsZW1lbnQuCisKK09uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KKworCitNb2RhbCBkaWFsb2c6CitBWFJvbGU6IEFYR3JvdXAgQVhT dWJyb2xlOiBBWEFwcGxpY2F0aW9uRGlhbG9nIEFYUm9sZURlc2NyaXB0aW9uOiB3ZWIgZGlhbG9n CitNb2RlbGVzcyBkaWFsb2c6CitBWFJvbGU6IEFYR3JvdXAgQVhTdWJyb2xlOiBBWEFwcGxpY2F0 aW9uRGlhbG9nIEFYUm9sZURlc2NyaXB0aW9uOiB3ZWIgZGlhbG9nCitQQVNTIHN1Y2Nlc3NmdWxs eVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKK0p1c3QgYSBkaWFsb2cuCisKK09LICBD YW5jZWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2RpYWxvZy1w cm9wZXJ0aWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9kaWFsb2ctcHJv cGVydGllcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRjM2ZmMGE0Y2ZlNDEzNjYwMWM1NmI2OTgxYTViNDVm OWI0OWRjZTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21h Yy9kaWFsb2ctcHJvcGVydGllcy5odG1sCkBAIC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBIVE1M IFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0 IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 Ii4uLy4uL3Jlc291cmNlcy9hY2Nlc3NpYmlsaXR5LWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8L2hl YWQ+Cis8Ym9keSBpZD0iYm9keSI+CisKKzxkaWFsb2cgaWQ9ImRpYWxvZyI+CisgICAgPGgzPkp1 c3QgYSBkaWFsb2cuPC9oMz4KKyAgICA8YnV0dG9uIGlkPSJvayIgb25jbGljaz0iZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2RpYWxvZycpLmNsb3NlKCk7IiBjbGFzcz0iY2xvc2UtYnV0dG9uIj5P SzwvYnV0dG9uPgorICAgIDxidXR0b24gb25jbGljaz0iZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2RpYWxvZycpLmNsb3NlKCk7IiBjbGFzcz0iY2xvc2UtYnV0dG9uIj5DYW5jZWw8L2J1dHRvbj4K KzwvZGlhbG9nPgorCis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3QgdmVyaWZp ZXMgc2V2ZXJhbCBBWCBwcm9wZXJ0aWVzIG9mIHRoZSBkaWFsb2cgZWxlbWVudC4iKTsKKworICAg IGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgd2luZG93Lmpz VGVzdElzQXN5bmMgPSB0cnVlOworCisgICAgICAgIHNldFRpbWVvdXQoYXN5bmMgKCkgPT4gewor ICAgICAgICAgICAgLy8gU2hvdyB0aGUgZGlhbG9nIGFzIG1vZGFsLgorICAgICAgICAgICAgZGVi dWcoIk1vZGFsIGRpYWxvZzoiKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJkaWFsb2ciKS5zaG93TW9kYWwoKTsKKyAgICAgICAgICAgIGxldCBkaWFsb2cgPSBudWxsOwor ICAgICAgICAgICAgYXdhaXQgd2FpdEZvcigoKSA9PiB7CisgICAgICAgICAgICAgICAgZGlhbG9n ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJkaWFsb2ci KTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZGlhbG9nOworICAgICAgICAgICAgfSk7CisgICAg ICAgICAgICBsZXQgcHJvcGVydGllcyA9IGAke2RpYWxvZy5yb2xlfSAke2RpYWxvZy5zdWJyb2xl fSAke2RpYWxvZy5yb2xlRGVzY3JpcHRpb259YDsKKyAgICAgICAgICAgIGRlYnVnKHByb3BlcnRp ZXMpOworCisgICAgICAgICAgICAvLyBEaXNtaXNzIHRoZSBtb2RhbCBhbmQgc2hvdyB0aGUgZGlh bG9nIGFzIG1vZGVsZXNzLgorICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImRp YWxvZyIpLmNsb3NlKCk7CisgICAgICAgICAgICBkZWJ1ZygiTW9kZWxlc3MgZGlhbG9nOiIpOwor ICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImRpYWxvZyIpLnNob3coKTsKKyAg ICAgICAgICAgIGRpYWxvZyA9IG51bGw7CisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+ IHsKKyAgICAgICAgICAgICAgICBkaWFsb2cgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nl c3NpYmxlRWxlbWVudEJ5SWQoImRpYWxvZyIpOworICAgICAgICAgICAgICAgIHJldHVybiBkaWFs b2c7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHByb3BlcnRpZXMgPSBgJHtkaWFsb2cu cm9sZX0gJHtkaWFsb2cuc3Vicm9sZX0gJHtkaWFsb2cucm9sZURlc2NyaXB0aW9ufWA7CisgICAg ICAgICAgICBkZWJ1Zyhwcm9wZXJ0aWVzKTsKKworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7 CisgICAgICAgIH0sIDApOworICAgIH0KKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo= 451684 2022-02-11 06:26:39 -0800 2022-02-11 08:23:56 -0800 Patch bug-236359-20220211092638.patch text/plain 7365 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdjYjhhYTUzOWE3MTA5 ZGI3YjE3YTllMzQ0OTEyNjVkODA3ODgwMi4uZDY0NzE1ZmZjMGE2YzY0NWJlZTFiNjRlN2QwYmM3 ZmY5MjUwMjdiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTEwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBvc2UgdGhl IGNvcnJlY3Qgcm9sZSwgc3Vicm9sZSBhbmQgcm9sZSBkZXNjcmlwdGlvbiBwcm9wZXJ0aWVzIGZv ciB0aGUgPGRpYWxvZz4gZWxlbWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNjM1OQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIEZsZWl6 YWNoLgorCisgICAgICAgIFRlc3Q6IGFjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3BlcnRpZXMuaHRt bAorCisgICAgICAgIEVsZW1lbnRzIHdpdGggcm9sZT0iZGlhbG9nIiBhcmUgZXhwb3NlZCB0byBh Y2Nlc3NpYmlsaXR5IGNsaWVudHMgd2l0aAorICAgICAgICByb2xlIEFYR3JvdXAsIHN1YnJvbGUg QVhBcHBsaWNhdGlvbkRpYWxvZyBhbmQgcm9sZSBkZXNjcmlwdGlvbgorICAgICAgICAid2ViIGRp YWxvZyIuIFRoaXMgcGF0Y2ggaW1wbGVtZW50cyB0aGlzIGJlaGF2aW9yIGZvciB0aGUgPGRpYWxv Zz4KKyAgICAgICAgZWxlbWVudC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlRnJvbU5vZGUgY29uc3QpOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjpkZWZhdWx0T2JqZWN0SW5jbHVzaW9uIGNvbnN0KToK KwogMjAyMi0wMi0wOCAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK ICAgICAgICAgSW5pdGlhbGl6ZSB0aGUgQVhJc29sYXRlZE9iamVjdCBBY2Nlc3NpYmlsaXR5VGV4 dCBwcm9wZXJ0eSBsYXppbHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCmluZGV4IGQ1NWU0OTA3YWI3NTk4YzY3 N2JkMTIxMDhjNGYxNjM2YWNkZmYwMTQuLjg4ZjI1YmE3MzA3MTJmNDQ3NmNlNzg5ZjhmZGMzMzll NTMxNmFkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU5vZGVPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCkBAIC0zNTcsNiArMzU3LDggQEAgQWNjZXNzaWJp bGl0eVJvbGUgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlS b2xlRnJvbU5vZGUoVHIKICAgICAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlSb2xlOjpCbG9ja3F1 b3RlOwogICAgIGlmIChub2RlKCktPmhhc1RhZ05hbWUoY2FwdGlvblRhZykpCiAgICAgICAgIHJl dHVybiBBY2Nlc3NpYmlsaXR5Um9sZTo6Q2FwdGlvbjsKKyAgICBpZiAobm9kZSgpLT5oYXNUYWdO YW1lKGRpYWxvZ1RhZykpCisgICAgICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5Um9sZTo6QXBwbGlj YXRpb25EaWFsb2c7CiAgICAgaWYgKG5vZGUoKS0+aGFzVGFnTmFtZShtYXJrVGFnKSkKICAgICAg ICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlSb2xlOjpNYXJrOwogICAgIGlmIChub2RlKCktPmhhc1Rh Z05hbWUocHJlVGFnKSkKQEAgLTQxMyw3ICs0MTUsNyBAQCBBY2Nlc3NpYmlsaXR5Um9sZSBBY2Nl c3NpYmlsaXR5Tm9kZU9iamVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGVGcm9tTm9kZShU cgogICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eVJvbGU6Okdyb3VwOwogICAgIGlmIChpczxF bGVtZW50Pigqbm9kZSgpKSAmJiBkb3duY2FzdDxFbGVtZW50Pigqbm9kZSgpKS5pc0ZvY3VzYWJs ZSgpKQogICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eVJvbGU6Okdyb3VwOwotICAgIAorCiAg ICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlSb2xlOjpVbmtub3duOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAppbmRleCA2 ZDU4ZTEwYjU1YWZjOWZiZmJjOGU2MzgzYjE3M2Y4NGIxZjU2YmIyLi44Mjc3MGE3ZjJkNjZmNzgx YjhjNzM2M2NlOTcwYWFiNTQ4ZTg5YTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKQEAgLTM2MTIsMTYgKzM2MTIsMjAg QEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnZhbGlkYXRpb25NZXNzYWdlKCkgY29uc3QK IEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6ZGVmYXVs dE9iamVjdEluY2x1c2lvbigpIGNvbnN0CiB7CiAgICAgYm9vbCB1c2VQYXJlbnREYXRhID0gIW1f aXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNOdWxsKCk7Ci0gICAgCisKICAgICBpZiAodXNlUGFy ZW50RGF0YSA/IG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNBWEhpZGRlbiA6IGlzQVhIaWRk ZW4oKSkKICAgICAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb246Oklnbm9y ZU9iamVjdDsKIAogICAgIGlmICgocmVuZGVyZXIoKSAmJiByZW5kZXJlcigpLT5zdHlsZSgpLmVm ZmVjdGl2ZUluZXJ0KCkpIHx8IGlnbm9yZWRGcm9tTW9kYWxQcmVzZW5jZSgpKQogICAgICAgICBy ZXR1cm4gQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbjo6SWdub3JlT2JqZWN0OwotICAgIAor CiAgICAgaWYgKHVzZVBhcmVudERhdGEgPyBtX2lzSWdub3JlZEZyb21QYXJlbnREYXRhLmlzUHJl c2VudGF0aW9uYWxDaGlsZE9mQXJpYVJvbGUgOiBpc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFyaWFS b2xlKCkpCiAgICAgICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uOjpJZ25v cmVPYmplY3Q7Ci0gICAgCisKKyAgICAvLyBJbmNsdWRlIDxkaWFsb2c+IGVsZW1lbnRzIGFuZCBl bGVtZW50cyB3aXRoIHJvbGU9ImRpYWxvZyIuCisgICAgaWYgKHJvbGVWYWx1ZSgpID09IEFjY2Vz c2liaWxpdHlSb2xlOjpBcHBsaWNhdGlvbkRpYWxvZykKKyAgICAgICAgcmV0dXJuIEFjY2Vzc2li aWxpdHlPYmplY3RJbmNsdXNpb246OkluY2x1ZGVPYmplY3Q7CisKICAgICByZXR1cm4gYWNjZXNz aWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKTsKIH0KICAgICAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMDAwNDMw ZjQ5N2Y4NDg5ZTQ5YTIwMTA1YzEwZWJhOTBhYTFlYTM0Li44OTg2MDkyNzM3NjdlZjNiYWQ5MTRl NDQ0NTdlOThlZTBjYWY0OTg3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMTAgIEFu ZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9zZSB0 aGUgY29ycmVjdCByb2xlLCBzdWJyb2xlIGFuZCByb2xlIGRlc2NyaXB0aW9uIHByb3BlcnRpZXMg Zm9yIHRoZSA8ZGlhbG9nPiBlbGVtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxl aXphY2guCisKKyAgICAgICAgVGVzdHMgdGhhdCB0aGVzZSBBWCBwcm9wZXJ0aWVzIGhhdmUgdGhl IGV4cGVjdGVkIHZhbHVlcyBib3RoIHdoZW4gdGhlCisgICAgICAgIGRpYWxvZyBpcyBzaG93biBt b2RhbCBvciBtb2RlbGVzcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3Bl cnRpZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2RpYWxv Zy1wcm9wZXJ0aWVzLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAyLTA4ICBSYXp2YW4gQ2FsaW1hbiAg PHJjYWxpbWFuQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRmxleGJveF0g QWRkIHN1cHBvcnQgZm9yIHNob3dpbmcvaGlkaW5nIGZsZXggY29udGFpbmVyIG92ZXJsYXlzIGFu ZCBiYXNpYyBvdmVybGF5IGRyYXdpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvZGlhbG9nLXByb3BlcnRpZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9kaWFsb2ctcHJvcGVydGllcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2MzMzVi ZTQ1MTZjNDk2YzZkZWViMWMxZWNmNGY1MDdjMDU0YmJiYwotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3BlcnRpZXMtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTUgQEAKK1RoaXMgdGVzdCB2ZXJpZmllcyBzZXZlcmFsIEFYIHByb3BlcnRpZXMg b2YgdGhlIGRpYWxvZyBlbGVtZW50LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJp ZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKwor TW9kYWwgZGlhbG9nOgorQVhSb2xlOiBBWEdyb3VwIEFYU3Vicm9sZTogQVhBcHBsaWNhdGlvbkRp YWxvZyBBWFJvbGVEZXNjcmlwdGlvbjogd2ViIGRpYWxvZworTW9kZWxlc3MgZGlhbG9nOgorQVhS b2xlOiBBWEdyb3VwIEFYU3Vicm9sZTogQVhBcHBsaWNhdGlvbkRpYWxvZyBBWFJvbGVEZXNjcmlw dGlvbjogd2ViIGRpYWxvZworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNU IENPTVBMRVRFCitKdXN0IGEgZGlhbG9nLgorCitPSyAgQ2FuY2VsCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RpYWxvZy1wcm9wZXJ0aWVzLmh0bWwgYi9MYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L2RpYWxvZy1wcm9wZXJ0aWVzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGUyZGJi YTJiNzMwNTI0OWM0N2FhOWY0ZWRiMTZlNDZkODIxYjBjMQotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3BlcnRpZXMuaHRtbApAQCAtMCwwICsx LDUwIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8 aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3Nj cmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvYWNjZXNzaWJpbGl0eS1oZWxwZXIuanMi Pjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorCis8ZGlhbG9nIGlkPSJkaWFs b2ciPgorICAgIDxoMz5KdXN0IGEgZGlhbG9nLjwvaDM+CisgICAgPGJ1dHRvbiBpZD0ib2siIG9u Y2xpY2s9ImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdkaWFsb2cnKS5jbG9zZSgpOyIgY2xhc3M9 ImNsb3NlLWJ1dHRvbiI+T0s8L2J1dHRvbj4KKyAgICA8YnV0dG9uIG9uY2xpY2s9ImRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdkaWFsb2cnKS5jbG9zZSgpOyIgY2xhc3M9ImNsb3NlLWJ1dHRvbiI+ Q2FuY2VsPC9idXR0b24+Cis8L2RpYWxvZz4KKworPHNjcmlwdD4KKyAgICBkZXNjcmlwdGlvbigi VGhpcyB0ZXN0IHZlcmlmaWVzIHNldmVyYWwgQVggcHJvcGVydGllcyBvZiB0aGUgZGlhbG9nIGVs ZW1lbnQuIik7CisKKyAgICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7Cisg ICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworICAgICAgICBzZXRUaW1lb3V0 KGFzeW5jICgpID0+IHsKKyAgICAgICAgICAgIC8vIFNob3cgdGhlIGRpYWxvZyBhcyBtb2RhbC4K KyAgICAgICAgICAgIGRlYnVnKCJNb2RhbCBkaWFsb2c6Iik7CisgICAgICAgICAgICBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgiZGlhbG9nIikuc2hvd01vZGFsKCk7CisgICAgICAgICAgICBsZXQg ZGlhbG9nID0gbnVsbDsKKyAgICAgICAgICAgIGF3YWl0IHdhaXRGb3IoKCkgPT4geworICAgICAg ICAgICAgICAgIGRpYWxvZyA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVt ZW50QnlJZCgiZGlhbG9nIik7CisgICAgICAgICAgICAgICAgcmV0dXJuIGRpYWxvZzsKKyAgICAg ICAgICAgIH0pOworICAgICAgICAgICAgbGV0IHByb3BlcnRpZXMgPSBgJHtkaWFsb2cucm9sZX0g JHtkaWFsb2cuc3Vicm9sZX0gJHtkaWFsb2cucm9sZURlc2NyaXB0aW9ufWA7CisgICAgICAgICAg ICBkZWJ1Zyhwcm9wZXJ0aWVzKTsKKworICAgICAgICAgICAgLy8gRGlzbWlzcyB0aGUgbW9kYWwg YW5kIHNob3cgdGhlIGRpYWxvZyBhcyBtb2RlbGVzcy4KKyAgICAgICAgICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJkaWFsb2ciKS5jbG9zZSgpOworICAgICAgICAgICAgZGVidWcoIk1vZGVs ZXNzIGRpYWxvZzoiKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJkaWFs b2ciKS5zaG93KCk7CisgICAgICAgICAgICBkaWFsb2cgPSBudWxsOworICAgICAgICAgICAgYXdh aXQgd2FpdEZvcigoKSA9PiB7CisgICAgICAgICAgICAgICAgZGlhbG9nID0gYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJkaWFsb2ciKTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gZGlhbG9nOworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBwcm9wZXJ0 aWVzID0gYCR7ZGlhbG9nLnJvbGV9ICR7ZGlhbG9nLnN1YnJvbGV9ICR7ZGlhbG9nLnJvbGVEZXNj cmlwdGlvbn1gOworICAgICAgICAgICAgZGVidWcocHJvcGVydGllcyk7CisKKyAgICAgICAgICAg IGZpbmlzaEpTVGVzdCgpOworICAgICAgICB9LCAwKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4K 451700 2022-02-11 08:23:59 -0800 2022-02-13 08:01:49 -0800 Patch bug-236359-20220211112358.patch text/plain 8610 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRhYzQ3ZjU2YzVlZTQ5 ODdlZTZmNjdhZTRlMTg5MjcxOWUzY2FiNi4uYWM5NmE5NmEyNjM5ZDQzNDllNzBlODE3MDU3Mjkx MDQzNmI3YWU1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTExICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBvc2UgdGhl IGNvcnJlY3Qgcm9sZSwgc3Vicm9sZSBhbmQgcm9sZSBkZXNjcmlwdGlvbiBwcm9wZXJ0aWVzIGZv ciB0aGUgPGRpYWxvZz4gZWxlbWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNjM1OQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIEZsZWl6 YWNoLgorCisgICAgICAgIFRlc3Q6IGFjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3BlcnRpZXMuaHRt bAorCisgICAgICAgIEVsZW1lbnRzIHdpdGggcm9sZT0iZGlhbG9nIiBhcmUgZXhwb3NlZCB0byBh Y2Nlc3NpYmlsaXR5IGNsaWVudHMgd2l0aAorICAgICAgICByb2xlIEFYR3JvdXAsIHN1YnJvbGUg QVhBcHBsaWNhdGlvbkRpYWxvZyBhbmQgcm9sZSBkZXNjcmlwdGlvbgorICAgICAgICAid2ViIGRp YWxvZyIuIFRoaXMgcGF0Y2ggaW1wbGVtZW50cyB0aGlzIGJlaGF2aW9yIGZvciB0aGUgPGRpYWxv Zz4KKyAgICAgICAgZWxlbWVudC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlRnJvbU5vZGUgY29uc3QpOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjpkZWZhdWx0T2JqZWN0SW5jbHVzaW9uIGNvbnN0KToK KwogMjAyMi0wMi0xMSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgW0NTUyBDb250YWluZXIgUXVlcmllc10gSW1wbGVtZW50IGNvbnRhaW5lciBuYW1lIG1hdGNo aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlOb2RlT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU5vZGVPYmplY3QuY3BwCmluZGV4IGFlODcwNDlmMDAyNDFlZWEyY2Y0YWZlMzIyMTE5OTE2 MjQyZDE2MmMuLjVjZjgzNDUxZjNlMjI5ZDRlM2Q4MzY0YjFkOTVlMTY4ZWMyMGI4YjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5v ZGVPYmplY3QuY3BwCkBAIC0zNTgsNiArMzU4LDggQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNz aWJpbGl0eU5vZGVPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlRnJvbU5vZGUoVHIK ICAgICAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlSb2xlOjpCbG9ja3F1b3RlOwogICAgIGlmIChu b2RlKCktPmhhc1RhZ05hbWUoY2FwdGlvblRhZykpCiAgICAgICAgIHJldHVybiBBY2Nlc3NpYmls aXR5Um9sZTo6Q2FwdGlvbjsKKyAgICBpZiAobm9kZSgpLT5oYXNUYWdOYW1lKGRpYWxvZ1RhZykp CisgICAgICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5Um9sZTo6QXBwbGljYXRpb25EaWFsb2c7CiAg ICAgaWYgKG5vZGUoKS0+aGFzVGFnTmFtZShtYXJrVGFnKSkKICAgICAgICAgcmV0dXJuIEFjY2Vz c2liaWxpdHlSb2xlOjpNYXJrOwogICAgIGlmIChub2RlKCktPmhhc1RhZ05hbWUocHJlVGFnKSkK QEAgLTQxNCw3ICs0MTYsNyBAQCBBY2Nlc3NpYmlsaXR5Um9sZSBBY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGVGcm9tTm9kZShUcgogICAgICAgICByZXR1 cm4gQWNjZXNzaWJpbGl0eVJvbGU6Okdyb3VwOwogICAgIGlmIChpczxFbGVtZW50Pigqbm9kZSgp KSAmJiBkb3duY2FzdDxFbGVtZW50Pigqbm9kZSgpKS5pc0ZvY3VzYWJsZSgpKQogICAgICAgICBy ZXR1cm4gQWNjZXNzaWJpbGl0eVJvbGU6Okdyb3VwOwotICAgIAorCiAgICAgcmV0dXJuIEFjY2Vz c2liaWxpdHlSb2xlOjpVbmtub3duOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAppbmRleCA2ZDU4ZTEwYjU1YWZjOWZi ZmJjOGU2MzgzYjE3M2Y4NGIxZjU2YmIyLi44Mjc3MGE3ZjJkNjZmNzgxYjhjNzM2M2NlOTcwYWFi NTQ4ZTg5YTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU9iamVjdC5jcHAKQEAgLTM2MTIsMTYgKzM2MTIsMjAgQEAgU3RyaW5nIEFjY2Vz c2liaWxpdHlPYmplY3Q6OnZhbGlkYXRpb25NZXNzYWdlKCkgY29uc3QKIEFjY2Vzc2liaWxpdHlP YmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6ZGVmYXVsdE9iamVjdEluY2x1c2lv bigpIGNvbnN0CiB7CiAgICAgYm9vbCB1c2VQYXJlbnREYXRhID0gIW1faXNJZ25vcmVkRnJvbVBh cmVudERhdGEuaXNOdWxsKCk7Ci0gICAgCisKICAgICBpZiAodXNlUGFyZW50RGF0YSA/IG1faXNJ Z25vcmVkRnJvbVBhcmVudERhdGEuaXNBWEhpZGRlbiA6IGlzQVhIaWRkZW4oKSkKICAgICAgICAg cmV0dXJuIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb246Oklnbm9yZU9iamVjdDsKIAogICAg IGlmICgocmVuZGVyZXIoKSAmJiByZW5kZXJlcigpLT5zdHlsZSgpLmVmZmVjdGl2ZUluZXJ0KCkp IHx8IGlnbm9yZWRGcm9tTW9kYWxQcmVzZW5jZSgpKQogICAgICAgICByZXR1cm4gQWNjZXNzaWJp bGl0eU9iamVjdEluY2x1c2lvbjo6SWdub3JlT2JqZWN0OwotICAgIAorCiAgICAgaWYgKHVzZVBh cmVudERhdGEgPyBtX2lzSWdub3JlZEZyb21QYXJlbnREYXRhLmlzUHJlc2VudGF0aW9uYWxDaGls ZE9mQXJpYVJvbGUgOiBpc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFyaWFSb2xlKCkpCiAgICAgICAg IHJldHVybiBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uOjpJZ25vcmVPYmplY3Q7Ci0gICAg CisKKyAgICAvLyBJbmNsdWRlIDxkaWFsb2c+IGVsZW1lbnRzIGFuZCBlbGVtZW50cyB3aXRoIHJv bGU9ImRpYWxvZyIuCisgICAgaWYgKHJvbGVWYWx1ZSgpID09IEFjY2Vzc2liaWxpdHlSb2xlOjpB cHBsaWNhdGlvbkRpYWxvZykKKyAgICAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNs dXNpb246OkluY2x1ZGVPYmplY3Q7CisKICAgICByZXR1cm4gYWNjZXNzaWJpbGl0eVBsYXRmb3Jt SW5jbHVkZXNPYmplY3QoKTsKIH0KICAgICAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0ZTEwOTc4ZmQ0MzdhYTFlMGFjNjRi ZmFhOGI4NGE0ZjQ3YTA4YjM5Li5jYjQxNmQ0ZTZlOGMwNGIxMDNhYTUzODRiZTZiMjM0MTViYzE0 ODRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMTEgIEFuZHJlcyBHb256YWxleiAg PGFuZHJlc2dfMjJAYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9zZSB0aGUgY29ycmVjdCByb2xl LCBzdWJyb2xlIGFuZCByb2xlIGRlc2NyaXB0aW9uIHByb3BlcnRpZXMgZm9yIHRoZSA8ZGlhbG9n PiBlbGVtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM2MzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCisKKyAgICAg ICAgVGVzdHMgdGhhdCB0aGVzZSBBWCBwcm9wZXJ0aWVzIGhhdmUgdGhlIGV4cGVjdGVkIHZhbHVl cyBib3RoIHdoZW4gdGhlCisgICAgICAgIGRpYWxvZyBpcyBzaG93biBtb2RhbCBvciBtb2RlbGVz cy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3BlcnRpZXMtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2RpYWxvZy1wcm9wZXJ0aWVzLmh0 bWw6IEFkZGVkLgorCiAyMDIyLTAyLTExICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CiAKICAgICAgICAgVGFiIGNoYXJhY3RlcnMgYW5kIGNoIHVuaXRzIGRvIG5vdCBv YmV5IHN5bnRoZXRpYyBib2xkIHdpZHRoIGFkanVzdG1lbnRzIGNvcnJlY3RseQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaWFsb2ctcHJvcGVydGllcy1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RpYWxvZy1wcm9wZXJ0aWVzLWV4cGVjdGVk LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4zYzMzNWJlNDUxNmM0OTZjNmRlZWIxYzFlY2Y0ZjUwN2MwNTRiYmJj Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaWFsb2ctcHJv cGVydGllcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBAQAorVGhpcyB0ZXN0IHZlcmlmaWVz IHNldmVyYWwgQVggcHJvcGVydGllcyBvZiB0aGUgZGlhbG9nIGVsZW1lbnQuCisKK09uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KKworCitNb2RhbCBkaWFsb2c6CitBWFJvbGU6IEFYR3JvdXAgQVhT dWJyb2xlOiBBWEFwcGxpY2F0aW9uRGlhbG9nIEFYUm9sZURlc2NyaXB0aW9uOiB3ZWIgZGlhbG9n CitNb2RlbGVzcyBkaWFsb2c6CitBWFJvbGU6IEFYR3JvdXAgQVhTdWJyb2xlOiBBWEFwcGxpY2F0 aW9uRGlhbG9nIEFYUm9sZURlc2NyaXB0aW9uOiB3ZWIgZGlhbG9nCitQQVNTIHN1Y2Nlc3NmdWxs eVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKK0p1c3QgYSBkaWFsb2cuCisKK09LICBD YW5jZWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3Bl cnRpZXMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3BlcnRpZXMu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4wZTJkYmJhMmI3MzA1MjQ5YzQ3YWE5ZjRlZGIxNmU0NmQ4MjFiMGMx Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaWFsb2ctcHJv cGVydGllcy5odG1sCkBAIC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8v SUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVz b3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9h Y2Nlc3NpYmlsaXR5LWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9k eSI+CisKKzxkaWFsb2cgaWQ9ImRpYWxvZyI+CisgICAgPGgzPkp1c3QgYSBkaWFsb2cuPC9oMz4K KyAgICA8YnV0dG9uIGlkPSJvayIgb25jbGljaz0iZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2Rp YWxvZycpLmNsb3NlKCk7IiBjbGFzcz0iY2xvc2UtYnV0dG9uIj5PSzwvYnV0dG9uPgorICAgIDxi dXR0b24gb25jbGljaz0iZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2RpYWxvZycpLmNsb3NlKCk7 IiBjbGFzcz0iY2xvc2UtYnV0dG9uIj5DYW5jZWw8L2J1dHRvbj4KKzwvZGlhbG9nPgorCis8c2Ny aXB0PgorICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3QgdmVyaWZpZXMgc2V2ZXJhbCBBWCBwcm9w ZXJ0aWVzIG9mIHRoZSBkaWFsb2cgZWxlbWVudC4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVl OworCisgICAgICAgIHNldFRpbWVvdXQoYXN5bmMgKCkgPT4geworICAgICAgICAgICAgLy8gU2hv dyB0aGUgZGlhbG9nIGFzIG1vZGFsLgorICAgICAgICAgICAgZGVidWcoIk1vZGFsIGRpYWxvZzoi KTsKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJkaWFsb2ciKS5zaG93TW9k YWwoKTsKKyAgICAgICAgICAgIGxldCBkaWFsb2cgPSBudWxsOworICAgICAgICAgICAgYXdhaXQg d2FpdEZvcigoKSA9PiB7CisgICAgICAgICAgICAgICAgZGlhbG9nID0gYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJkaWFsb2ciKTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gZGlhbG9nOworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBsZXQgcHJvcGVy dGllcyA9IGAke2RpYWxvZy5yb2xlfSAke2RpYWxvZy5zdWJyb2xlfSAke2RpYWxvZy5yb2xlRGVz Y3JpcHRpb259YDsKKyAgICAgICAgICAgIGRlYnVnKHByb3BlcnRpZXMpOworCisgICAgICAgICAg ICAvLyBEaXNtaXNzIHRoZSBtb2RhbCBhbmQgc2hvdyB0aGUgZGlhbG9nIGFzIG1vZGVsZXNzLgor ICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImRpYWxvZyIpLmNsb3NlKCk7Cisg ICAgICAgICAgICBkZWJ1ZygiTW9kZWxlc3MgZGlhbG9nOiIpOworICAgICAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImRpYWxvZyIpLnNob3coKTsKKyAgICAgICAgICAgIGRpYWxvZyA9 IG51bGw7CisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+IHsKKyAgICAgICAgICAgICAg ICBkaWFsb2cgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQo ImRpYWxvZyIpOworICAgICAgICAgICAgICAgIHJldHVybiBkaWFsb2c7CisgICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgIHByb3BlcnRpZXMgPSBgJHtkaWFsb2cucm9sZX0gJHtkaWFsb2cuc3Vi cm9sZX0gJHtkaWFsb2cucm9sZURlc2NyaXB0aW9ufWA7CisgICAgICAgICAgICBkZWJ1Zyhwcm9w ZXJ0aWVzKTsKKworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH0sIDApOwor ICAgIH0KKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBiMGQyOWQ0OTliNDZlY2JiMzAwYmM5OTUzNjM2MzY3 Y2JjZjZlMzcyLi4xMDg3YzMyZDIwNmUzY2IyMGNjZGY4NTRlMDhkYTNkY2JiYzBmZTQ0IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucworKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTg0OSw0ICsxODQ5 LDYgQEAgd2Via2l0Lm9yZy9iLzE2MDExOSBmYXN0L3JlcGFpbnQvc2VsZWN0aW9uLWdhcC1mbGlw cGVkLWZpeGVkLWNoaWxkLmh0bWwgWyBGYWlsdXIKICMgVU5TT1JURUQgRXhwZWN0YXRpb25zLiBX aGVuIGluIGRvdWJ0LCBwdXQgaXQgaGVyZS4KICMvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vCiAKK2FjY2Vzc2liaWxpdHkvZGlhbG9nLXByb3BlcnRpZXMuaHRtbCBbIFNraXAgXQorCiAj IFRoZXNlIHRlc3RzIHJlcXVpcmUgcGxhdGZvcm0gc3VwcG9ydC4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2luL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYmE4ZmQ3MTYzOGNhNTRjOTgwZDg1N2YzZThh MTJhMmVkZTYyNzNmYS4uMjNmMWQ3NDdjZDJhYTIzYzRmZTE4YWEwMzc4MzljODkyOTdkOGZiMiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlvbnMKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ5MjAsNiAr NDkyMCw3IEBAIHdlYmtpdC5vcmcvYi8yMjkzMDAgaHR0cC90ZXN0cy9zZWN1cml0eS9uby1qYXZh c2NyaXB0LXJlZnJlc2gtc3BhY2VzLnB5IFsgUGFzcyBDCiAKIGFjY2Vzc2liaWxpdHkvc2VsZWN0 ZWQtc3RhdGUtY2hhbmdlZC1ub3RpZmljYXRpb25zLmh0bWwgWyBTa2lwIF0KIGFjY2Vzc2liaWxp dHkvZWxlbWVudC1saW5lLXJlY3RzLWFuZC10ZXh0Lmh0bWwgWyBTa2lwIF0KK2FjY2Vzc2liaWxp dHkvZGlhbG9nLXByb3BlcnRpZXMuaHRtbCBbIFNraXAgXQogCiB3ZWJraXQub3JnL2IvMjI5MjQ3 IGh0dHAvdGVzdHMvZmV0Y2gva2VlcGFsaXZlLWZldGNoLTIuaHRtbCBbIFBhc3MgRmFpbHVyZSBd CiAK