<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>238035</bug_id>
          
          <creation_ts>2022-03-17 12:00:34 -0700</creation_ts>
          <short_desc>nj.gov: Background color incorrect for &apos;State Vehicles&apos; section</short_desc>
          <delta_ts>2022-05-04 15:31:24 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>240087</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Kate Cheney">katherine_cheney</reporter>
          <assigned_to name="Kate Cheney">katherine_cheney</assigned_to>
          <cc>akeerthi</cc>
    
    <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>clopez</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>koivisto</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1852399</commentid>
    <comment_count>0</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-17 12:00:34 -0700</bug_when>
    <thetext>nj.gov: Background color incorrect for &apos;State Vehicles&apos; section</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852423</commentid>
    <comment_count>1</comment_count>
      <attachid>455006</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-17 12:53:53 -0700</bug_when>
    <thetext>Created attachment 455006
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852426</commentid>
    <comment_count>2</comment_count>
      <attachid>455006</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2022-03-17 12:57:28 -0700</bug_when>
    <thetext>Comment on attachment 455006
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=455006&amp;action=review

&gt; Source/WebCore/rendering/RenderTheme.cpp:114
&gt; +static bool shouldIgnoreAppearance(RenderStyle&amp; style)

Not really my area but it feels like this parameter could/should be const.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852432</commentid>
    <comment_count>3</comment_count>
      <attachid>455009</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-17 13:03:37 -0700</bug_when>
    <thetext>Created attachment 455009
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852449</commentid>
    <comment_count>4</comment_count>
      <attachid>455006</attachid>
    <who name="Aditya Keerthi">akeerthi</who>
    <bug_when>2022-03-17 13:18:07 -0700</bug_when>
    <thetext>Comment on attachment 455006
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=455006&amp;action=review

&gt; Source/WebCore/ChangeLog:12
&gt; +        controlled elements when they are styled by the author.

&quot;controlled&quot; -&gt; &quot;control&quot;

&gt;&gt; Source/WebCore/rendering/RenderTheme.cpp:114
&gt;&gt; +static bool shouldIgnoreAppearance(RenderStyle&amp; style)
&gt; 
&gt; Not really my area but it feels like this parameter could/should be const.

Would be nice if this method took two RenderStyle parameters, and was renamed, so that `RenderTheme::isControlStyled` can share the logic.

(and make the parameters const, as Chris said)

&gt; LayoutTests/fast/css/non-form-control-element-drop-appearance.html:3
&gt; +  -webkit-appearance: button;

Let&apos;s use the unprefixed &quot;appearance&quot;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852458</commentid>
    <comment_count>5</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-17 13:28:37 -0700</bug_when>
    <thetext>(In reply to Aditya Keerthi from comment #4)
&gt; Comment on attachment 455006 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=455006&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/ChangeLog:12
&gt; &gt; +        controlled elements when they are styled by the author.
&gt; 
&gt; &quot;controlled&quot; -&gt; &quot;control&quot;
&gt; 

will fix. 

&gt; &gt;&gt; Source/WebCore/rendering/RenderTheme.cpp:114
&gt; &gt;&gt; +static bool shouldIgnoreAppearance(RenderStyle&amp; style)
&gt; &gt; 
&gt; &gt; Not really my area but it feels like this parameter could/should be const.
&gt; 
&gt; Would be nice if this method took two RenderStyle parameters, and was
&gt; renamed, so that `RenderTheme::isControlStyled` can share the logic.
&gt; 
&gt; (and make the parameters const, as Chris said)
&gt; 
sounds good, will fix

&gt; &gt; LayoutTests/fast/css/non-form-control-element-drop-appearance.html:3
&gt; &gt; +  -webkit-appearance: button;
&gt; 
&gt; Let&apos;s use the unprefixed &quot;appearance&quot;.

ok. why?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852465</commentid>
    <comment_count>6</comment_count>
    <who name="Aditya Keerthi">akeerthi</who>
    <bug_when>2022-03-17 13:45:49 -0700</bug_when>
    <thetext>(In reply to Kate Cheney from comment #5)
&gt; (In reply to Aditya Keerthi from comment #4)
&gt; &gt; Comment on attachment 455006 [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; View in context:
&gt; &gt; https://bugs.webkit.org/attachment.cgi?id=455006&amp;action=review
&gt; &gt; 
&gt; &gt; &gt; Source/WebCore/ChangeLog:12
&gt; &gt; &gt; +        controlled elements when they are styled by the author.
&gt; &gt; 
&gt; &gt; &quot;controlled&quot; -&gt; &quot;control&quot;
&gt; &gt; 
&gt; 
&gt; will fix. 
&gt; 
&gt; &gt; &gt;&gt; Source/WebCore/rendering/RenderTheme.cpp:114
&gt; &gt; &gt;&gt; +static bool shouldIgnoreAppearance(RenderStyle&amp; style)
&gt; &gt; &gt; 
&gt; &gt; &gt; Not really my area but it feels like this parameter could/should be const.
&gt; &gt; 
&gt; &gt; Would be nice if this method took two RenderStyle parameters, and was
&gt; &gt; renamed, so that `RenderTheme::isControlStyled` can share the logic.
&gt; &gt; 
&gt; &gt; (and make the parameters const, as Chris said)
&gt; &gt; 
&gt; sounds good, will fix
&gt; 
&gt; &gt; &gt; LayoutTests/fast/css/non-form-control-element-drop-appearance.html:3
&gt; &gt; &gt; +  -webkit-appearance: button;
&gt; &gt; 
&gt; &gt; Let&apos;s use the unprefixed &quot;appearance&quot;.
&gt; 
&gt; ok. why?

There&apos;s no behavioral difference, because it&apos;s an alias, but I think it&apos;s better to use the unprefixed version of the property in new code.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852468</commentid>
    <comment_count>7</comment_count>
      <attachid>455021</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-17 13:50:16 -0700</bug_when>
    <thetext>Created attachment 455021
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852480</commentid>
    <comment_count>8</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-17 14:01:52 -0700</bug_when>
    <thetext>failing layout tests seem possibly related..</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852581</commentid>
    <comment_count>9</comment_count>
      <attachid>455054</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-17 17:33:52 -0700</bug_when>
    <thetext>Created attachment 455054
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852615</commentid>
    <comment_count>10</comment_count>
      <attachid>455054</attachid>
    <who name="Aditya Keerthi">akeerthi</who>
    <bug_when>2022-03-17 21:58:54 -0700</bug_when>
    <thetext>Comment on attachment 455054
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=455054&amp;action=review

&gt; Source/WebCore/rendering/RenderTheme.cpp:114
&gt; +static bool styleBorderAndBackgroundDiffer(const RenderStyle&amp; style, const RenderStyle&amp; otherStyle)

I saw that we have the following methods in RenderStyle which compare two styles:

```
bool inheritedEqual(const RenderStyle&amp;) const;
bool descendantAffectingNonInheritedPropertiesEqual(const RenderStyle&amp;) const;
```

Consider declaring this as `bool borderAndBackgroundEqual(const RenderStyle&amp;) const;` and implementing in `RenderStyle`.

&gt; Source/WebCore/rendering/RenderTheme.cpp:124
&gt; +    auto part = adjustAppearanceForElement(style, element, autoAppearanceForElement);

I prefer to avoid out-parameters when possible, as they add indirection when reading code, and can give a single method too much responsibility.

Consider moving the call to `autoAppearanceForElement()` to the line above, and passing the result into `adjustAppearanceForElement`.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852616</commentid>
    <comment_count>11</comment_count>
      <attachid>455054</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2022-03-17 22:08:53 -0700</bug_when>
    <thetext>Comment on attachment 455054
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=455054&amp;action=review

(just style comments, leaving substantive review to Aditya)

&gt; Source/WebCore/rendering/RenderTheme.cpp:87
&gt; +ControlPart RenderTheme::adjustAppearanceForElement(RenderStyle&amp; style, const Element* element, ControlPart&amp; autoAppearance) const

It would be more stylish to return both ControlPart as return values, either as struct or std::pair. Caller can then use structured bindings to unpack

auto [appareance, autoAppearance] = adjustAppearanceForElement(...).

&gt; Source/WebCore/rendering/RenderTheme.cpp:114
&gt; +static bool styleBorderAndBackgroundDiffer(const RenderStyle&amp; style, const RenderStyle&amp; otherStyle)

&quot;differ&quot; is an odd function name. Maybe something more descriptive like shouldIgnoreApparanceForStyle(style, baseStyle)?

&gt; Source/WebCore/rendering/RenderTheme.cpp:151
&gt; +    if (!userAgentAppearanceStyle &amp;&amp; autoAppearanceForElement == NoControlPart &amp;&amp; styleBorderAndBackgroundDiffer(style, style.defaultStyle()))

defaultStyle() is a static function, it is clearer to use RenderStyle::defaultStyle() to call it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852749</commentid>
    <comment_count>12</comment_count>
      <attachid>455102</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-18 09:50:12 -0700</bug_when>
    <thetext>Created attachment 455102
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1852751</commentid>
    <comment_count>13</comment_count>
      <attachid>455103</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-18 09:57:58 -0700</bug_when>
    <thetext>Created attachment 455103
PFL once EWS is happy</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1853303</commentid>
    <comment_count>14</comment_count>
      <attachid>455266</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2022-03-21 13:01:23 -0700</bug_when>
    <thetext>Created attachment 455266
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1853409</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-03-21 16:40:33 -0700</bug_when>
    <thetext>Committed r291588 (248683@main): &lt;https://commits.webkit.org/248683@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 455266.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1853410</commentid>
    <comment_count>16</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-03-21 16:41:15 -0700</bug_when>
    <thetext>&lt;rdar://problem/90600712&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1864932</commentid>
    <comment_count>17</comment_count>
    <who name="Arcady Goldmints-Orlov">crzwdjk</who>
    <bug_when>2022-04-27 14:11:33 -0700</bug_when>
    <thetext>*** Bug 223980 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>455006</attachid>
            <date>2022-03-17 12:53:53 -0700</date>
            <delta_ts>2022-03-17 13:03:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238035-20220317125352.patch</filename>
            <type>text/plain</type>
            <size>4348</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjZjBhYTkwZGVlOGIz
ZDBmYjZlZjRlZWQ1MGIzNzA3NzcwNjFjOS4uZmJjM2JhZGQ4MzQyYmZhMWZmNWFkMzI0MmIxZjc2
MzQ1OTNmODUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAzLTE3ICBLYXRl
IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjog
QmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwKKworICAgICAgICBVcGRhdGUgUmVuZGVyVGhl
bWU6OmFkanVzdFN0eWxlIHRvIGRyb3AgYXBwZWFyYW5jZSBmb3Igbm9uLWZvcm0KKyAgICAgICAg
Y29udHJvbGxlZCBlbGVtZW50cyB3aGVuIHRoZXkgYXJlIHN0eWxlZCBieSB0aGUgYXV0aG9yLgor
CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OnNob3VsZElnbm9yZUFwcGVhcmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6
OmFkanVzdFN0eWxlKToKKwogMjAyMi0wMy0xMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j
b20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIEVuYWJsZSBSZW5kZXJMaXN0SXRlbSBh
bmQgUmVuZGVyTGlzdE1hcmtlciBmb3IgSUZDCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
clRoZW1lLmNwcAppbmRleCA5ODA3M2ZkMWUzYWZlMTkyNDgyNzMyMWQxNDgwNjdlMzkzMTg3ZGNm
Li4zZmFkMWY3NDQ0ODg5MjNjYTQ4MTJiMWUyNmI3NzhhY2RmNzI5N2NlIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTExMSw2ICsxMTEsMTMgQEAgQ29udHJv
bFBhcnQgUmVuZGVyVGhlbWU6OmFkanVzdEFwcGVhcmFuY2VGb3JFbGVtZW50KFJlbmRlclN0eWxl
JiBzdHlsZSwgY29uc3QgRWwKICAgICByZXR1cm4gcGFydDsKIH0KIAorc3RhdGljIGJvb2wgc2hv
dWxkSWdub3JlQXBwZWFyYW5jZShSZW5kZXJTdHlsZSYgc3R5bGUpCit7CisgICAgcmV0dXJuIHN0
eWxlLmJvcmRlcigpICE9IHN0eWxlLmRlZmF1bHRTdHlsZSgpLmJvcmRlcigpCisgICAgICAgIHx8
IHN0eWxlLmJhY2tncm91bmRMYXllcnMoKSAhPSBzdHlsZS5kZWZhdWx0U3R5bGUoKS5iYWNrZ3Jv
dW5kTGF5ZXJzKCkKKyAgICAgICAgfHwgIXN0eWxlLmJhY2tncm91bmRDb2xvckVxdWFsc1RvQ29s
b3JJZ25vcmluZ1Zpc2l0ZWQoc3R5bGUuZGVmYXVsdFN0eWxlKCkuYmFja2dyb3VuZENvbG9yKCkp
OworfQorCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTdHlsZShSZW5kZXJTdHlsZSYgc3R5bGUs
IGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBl
YXJhbmNlU3R5bGUpCiB7CiAgICAgYXV0byBwYXJ0ID0gYWRqdXN0QXBwZWFyYW5jZUZvckVsZW1l
bnQoc3R5bGUsIGVsZW1lbnQpOwpAQCAtMTQwLDYgKzE0Nyw5IEBAIHZvaWQgUmVuZGVyVGhlbWU6
OmFkanVzdFN0eWxlKFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRWxlbWVudCogZWxlbWVudCwg
Y29uc3QKICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlQXBwZWFyYW5jZShwYXJ0KTsKICAgICB9
CiAKKyAgICBpZiAoIXVzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZSAmJiBzaG91bGRJZ25vcmVBcHBl
YXJhbmNlKHN0eWxlKSkKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlQXBwZWFyYW5jZShOb0Nv
bnRyb2xQYXJ0KTsKKwogICAgIGlmICghc3R5bGUuaGFzRWZmZWN0aXZlQXBwZWFyYW5jZSgpKQog
ICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZWRmYmJiNjI3N2RiNDg0NTMzYjE2N2ZjYjUyNTM5
YzI4ZjQ5MGRjLi43YTYxZTA2MTgwYmEwZDNhNzdlODA4OWM4NjY5ZDA2ODJmNjk4ZGI0IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDMtMTcgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2No
ZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgbmouZ292OiBCYWNrZ3JvdW5kIGNvbG9yIGluY29y
cmVjdCBmb3IgJ1N0YXRlIFZlaGljbGVzJyBzZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzgwMzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt
Lzg0NTQzNzk1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg
ICAgICogZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS1l
eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAzLTEwICBNYXR0
ZW8gRmxvcmVzICA8bWF0dGVvX2Zsb3Jlc0BhcHBsZS5jb20+CiAKICAgICAgICAgWyBpT1MgTWFj
IF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZXJ2aWNlLXdvcmtlcnMvc2Vydmlj
ZS13b3JrZXIvcGFydGl0aW9uZWQtc2VydmljZS13b3JrZXItbWF0Y2hBbGwudGVudGF0aXZlLmh0
dHBzLmh0bWwgaXMgYSBmbGFreSB0ZXh0IGZhaWx1cmUgb24gYWxsIHF1ZXVlcwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBw
ZWFyYW5jZS1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29u
dHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ0
NzdjMjlmNTg4ZjdjMzJlYmI4OGM4NTA5ZDc1MzI1NmM3ZjA3YTEKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9ub24tZm9ybS1jb250cm9sLWVsZW1lbnQtZHJvcC1hcHBl
YXJhbmNlLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyIEBACis8ZGl2IHN0eWxlPSJiYWNrZ3Jv
dW5kLWNvbG9yOiBncmVlbiI+UEFTUyBpZiB0aGUgYmFja2dyb3VuZCBjb2xvciBpcyBncmVlbjwv
ZGl2PgorPGRpdiBzdHlsZT0iYm9yZGVyOiBkb3R0ZWQiPlBBU1MgaWYgdGhlIGJvcmRlciBpcyBk
b3R0ZWQ8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNv
bnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3Nz
L25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbApuZXcgZmlsZSBt
b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
Li5iYjVhODZmZGU2OTg4ZDMyYzJmMDEzZjFlMmJiYmQ5MzhmNzVhYTMwCi0tLSAvZGV2L251bGwK
KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3At
YXBwZWFyYW5jZS5odG1sCkBAIC0wLDAgKzEsMTQgQEAKKzxzdHlsZT4KKy5iYWNrZ3JvdW5kQ29s
b3JDbGFzcyB7CisgIC13ZWJraXQtYXBwZWFyYW5jZTogYnV0dG9uOworICBiYWNrZ3JvdW5kLWNv
bG9yOiBncmVlbjsKK30KKworLmJvcmRlckNsYXNzIHsKKyAgLXdlYmtpdC1hcHBlYXJhbmNlOiBi
dXR0b247CisgIGJvcmRlci1zdHlsZTogZG90dGVkOworfQorCis8L3N0eWxlPgorPGRpdiBjbGFz
cz0iYmFja2dyb3VuZENvbG9yQ2xhc3MiPlBBU1MgaWYgdGhlIGJhY2tncm91bmQgY29sb3IgaXMg
Z3JlZW48L2Rpdj4KKzxkaXYgY2xhc3M9ImJvcmRlckNsYXNzIj5QQVNTIGlmIHRoZSBib3JkZXIg
aXMgZG90dGVkPC9kaXY+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>455009</attachid>
            <date>2022-03-17 13:03:37 -0700</date>
            <delta_ts>2022-03-17 13:50:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238035-20220317130336.patch</filename>
            <type>text/plain</type>
            <size>4354</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjZjBhYTkwZGVlOGIz
ZDBmYjZlZjRlZWQ1MGIzNzA3NzcwNjFjOS4uZmJjM2JhZGQ4MzQyYmZhMWZmNWFkMzI0MmIxZjc2
MzQ1OTNmODUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAzLTE3ICBLYXRl
IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjog
QmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwKKworICAgICAgICBVcGRhdGUgUmVuZGVyVGhl
bWU6OmFkanVzdFN0eWxlIHRvIGRyb3AgYXBwZWFyYW5jZSBmb3Igbm9uLWZvcm0KKyAgICAgICAg
Y29udHJvbGxlZCBlbGVtZW50cyB3aGVuIHRoZXkgYXJlIHN0eWxlZCBieSB0aGUgYXV0aG9yLgor
CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OnNob3VsZElnbm9yZUFwcGVhcmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6
OmFkanVzdFN0eWxlKToKKwogMjAyMi0wMy0xMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j
b20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIEVuYWJsZSBSZW5kZXJMaXN0SXRlbSBh
bmQgUmVuZGVyTGlzdE1hcmtlciBmb3IgSUZDCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
clRoZW1lLmNwcAppbmRleCA5ODA3M2ZkMWUzYWZlMTkyNDgyNzMyMWQxNDgwNjdlMzkzMTg3ZGNm
Li4zYzk4ZGY1MWJlNmJiMTU2NDc5ZDMxNjVmYTIyZmM1N2FhMzc3YzI4IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTExMSw2ICsxMTEsMTMgQEAgQ29udHJv
bFBhcnQgUmVuZGVyVGhlbWU6OmFkanVzdEFwcGVhcmFuY2VGb3JFbGVtZW50KFJlbmRlclN0eWxl
JiBzdHlsZSwgY29uc3QgRWwKICAgICByZXR1cm4gcGFydDsKIH0KIAorc3RhdGljIGJvb2wgc2hv
dWxkSWdub3JlQXBwZWFyYW5jZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCit7CisgICAgcmV0
dXJuIHN0eWxlLmJvcmRlcigpICE9IHN0eWxlLmRlZmF1bHRTdHlsZSgpLmJvcmRlcigpCisgICAg
ICAgIHx8IHN0eWxlLmJhY2tncm91bmRMYXllcnMoKSAhPSBzdHlsZS5kZWZhdWx0U3R5bGUoKS5i
YWNrZ3JvdW5kTGF5ZXJzKCkKKyAgICAgICAgfHwgIXN0eWxlLmJhY2tncm91bmRDb2xvckVxdWFs
c1RvQ29sb3JJZ25vcmluZ1Zpc2l0ZWQoc3R5bGUuZGVmYXVsdFN0eWxlKCkuYmFja2dyb3VuZENv
bG9yKCkpOworfQorCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTdHlsZShSZW5kZXJTdHlsZSYg
c3R5bGUsIGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdl
bnRBcHBlYXJhbmNlU3R5bGUpCiB7CiAgICAgYXV0byBwYXJ0ID0gYWRqdXN0QXBwZWFyYW5jZUZv
ckVsZW1lbnQoc3R5bGUsIGVsZW1lbnQpOwpAQCAtMTQwLDYgKzE0Nyw5IEBAIHZvaWQgUmVuZGVy
VGhlbWU6OmFkanVzdFN0eWxlKFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRWxlbWVudCogZWxl
bWVudCwgY29uc3QKICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlQXBwZWFyYW5jZShwYXJ0KTsK
ICAgICB9CiAKKyAgICBpZiAoIXVzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZSAmJiBzaG91bGRJZ25v
cmVBcHBlYXJhbmNlKHN0eWxlKSkKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlQXBwZWFyYW5j
ZShOb0NvbnRyb2xQYXJ0KTsKKwogICAgIGlmICghc3R5bGUuaGFzRWZmZWN0aXZlQXBwZWFyYW5j
ZSgpKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZWRmYmJiNjI3N2RiNDg0NTMzYjE2N2Zj
YjUyNTM5YzI4ZjQ5MGRjLi43YTYxZTA2MTgwYmEwZDNhNzdlODA4OWM4NjY5ZDA2ODJmNjk4ZGI0
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDMtMTcgIEthdGUgQ2hlbmV5ICA8a2F0aGVy
aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgbmouZ292OiBCYWNrZ3JvdW5kIGNvbG9y
IGluY29ycmVjdCBmb3IgJ1N0YXRlIFZlaGljbGVzJyBzZWN0aW9uCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzgwMzUKKyAgICAgICAgPHJkYXI6Ly9w
cm9ibGVtLzg0NTQzNzk1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgICogZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFy
YW5jZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9ub24tZm9ybS1j
b250cm9sLWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAzLTEw
ICBNYXR0ZW8gRmxvcmVzICA8bWF0dGVvX2Zsb3Jlc0BhcHBsZS5jb20+CiAKICAgICAgICAgWyBp
T1MgTWFjIF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZXJ2aWNlLXdvcmtlcnMv
c2VydmljZS13b3JrZXIvcGFydGl0aW9uZWQtc2VydmljZS13b3JrZXItbWF0Y2hBbGwudGVudGF0
aXZlLmh0dHBzLmh0bWwgaXMgYSBmbGFreSB0ZXh0IGZhaWx1cmUgb24gYWxsIHF1ZXVlcwpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRy
b3AtYXBwZWFyYW5jZS1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZv
cm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS1leHBlY3RlZC5odG1sCm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLmQ0NzdjMjlmNTg4ZjdjMzJlYmI4OGM4NTA5ZDc1MzI1NmM3ZjA3YTEKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9ub24tZm9ybS1jb250cm9sLWVsZW1lbnQtZHJv
cC1hcHBlYXJhbmNlLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyIEBACis8ZGl2IHN0eWxlPSJi
YWNrZ3JvdW5kLWNvbG9yOiBncmVlbiI+UEFTUyBpZiB0aGUgYmFja2dyb3VuZCBjb2xvciBpcyBn
cmVlbjwvZGl2PgorPGRpdiBzdHlsZT0iYm9yZGVyOiBkb3R0ZWQiPlBBU1MgaWYgdGhlIGJvcmRl
ciBpcyBkb3R0ZWQ8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1m
b3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbCBiL0xheW91dFRlc3RzL2Zh
c3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi5iYjVhODZmZGU2OTg4ZDMyYzJmMDEzZjFlMmJiYmQ5MzhmNzVhYTMwCi0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50
LWRyb3AtYXBwZWFyYW5jZS5odG1sCkBAIC0wLDAgKzEsMTQgQEAKKzxzdHlsZT4KKy5iYWNrZ3Jv
dW5kQ29sb3JDbGFzcyB7CisgIC13ZWJraXQtYXBwZWFyYW5jZTogYnV0dG9uOworICBiYWNrZ3Jv
dW5kLWNvbG9yOiBncmVlbjsKK30KKworLmJvcmRlckNsYXNzIHsKKyAgLXdlYmtpdC1hcHBlYXJh
bmNlOiBidXR0b247CisgIGJvcmRlci1zdHlsZTogZG90dGVkOworfQorCis8L3N0eWxlPgorPGRp
diBjbGFzcz0iYmFja2dyb3VuZENvbG9yQ2xhc3MiPlBBU1MgaWYgdGhlIGJhY2tncm91bmQgY29s
b3IgaXMgZ3JlZW48L2Rpdj4KKzxkaXYgY2xhc3M9ImJvcmRlckNsYXNzIj5QQVNTIGlmIHRoZSBi
b3JkZXIgaXMgZG90dGVkPC9kaXY+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>455021</attachid>
            <date>2022-03-17 13:50:16 -0700</date>
            <delta_ts>2022-03-17 17:33:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238035-20220317135015.patch</filename>
            <type>text/plain</type>
            <size>5360</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjZjBhYTkwZGVlOGIz
ZDBmYjZlZjRlZWQ1MGIzNzA3NzcwNjFjOS4uMjgzZWU5ODVlYzI3NWRlM2RjNjVmMmM4Yjg1MWVm
ZDdiMDhkMjM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIyLTAzLTE3ICBLYXRl
IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjog
QmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwKKworICAgICAgICBVcGRhdGUgUmVuZGVyVGhl
bWU6OmFkanVzdFN0eWxlIHRvIGRyb3AgYXBwZWFyYW5jZSBmb3Igbm9uLWZvcm0KKyAgICAgICAg
Y29udHJvbCBlbGVtZW50cyB3aGVuIHRoZXkgYXJlIHN0eWxlZCBieSB0aGUgYXV0aG9yLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnN0
eWxlQm9yZGVyQW5kQmFja2dyb3VuZERpZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU
aGVtZTo6YWRqdXN0U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OmlzQ29u
dHJvbFN0eWxlZCk6CisKIDIwMjItMDMtMTAgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t
PgogCiAgICAgICAgIFtJRkNdW0ludGVncmF0aW9uXSBFbmFibGUgUmVuZGVyTGlzdEl0ZW0gYW5k
IFJlbmRlckxpc3RNYXJrZXIgZm9yIElGQwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU
aGVtZS5jcHAKaW5kZXggOTgwNzNmZDFlM2FmZTE5MjQ4MjczMjFkMTQ4MDY3ZTM5MzE4N2RjZi4u
NzgxOGM2OThlNjE4YmVmNzEwMzlkN2M3ZjIzMTYwNDQwY2QxZThiYiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCkBAIC0xMTEsNiArMTExLDEzIEBAIENvbnRyb2xQ
YXJ0IFJlbmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudChSZW5kZXJTdHlsZSYg
c3R5bGUsIGNvbnN0IEVsCiAgICAgcmV0dXJuIHBhcnQ7CiB9CiAKK3N0YXRpYyBib29sIHN0eWxl
Qm9yZGVyQW5kQmFja2dyb3VuZERpZmZlcihjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0
IFJlbmRlclN0eWxlJiBvdGhlclN0eWxlKQoreworICAgIHJldHVybiBzdHlsZS5ib3JkZXIoKSAh
PSBvdGhlclN0eWxlLmJvcmRlcigpCisgICAgICAgIHx8IHN0eWxlLmJhY2tncm91bmRMYXllcnMo
KSAhPSBvdGhlclN0eWxlLmJhY2tncm91bmRMYXllcnMoKQorICAgICAgICB8fCAhc3R5bGUuYmFj
a2dyb3VuZENvbG9yRXF1YWxzVG9Db2xvcklnbm9yaW5nVmlzaXRlZChvdGhlclN0eWxlLmJhY2tn
cm91bmRDb2xvcigpKTsKK30KKwogdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUoUmVuZGVy
U3R5bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSog
dXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKQogewogICAgIGF1dG8gcGFydCA9IGFkanVzdEFwcGVh
cmFuY2VGb3JFbGVtZW50KHN0eWxlLCBlbGVtZW50KTsKQEAgLTE0MCw2ICsxNDcsOSBAQCB2b2lk
IFJlbmRlclRoZW1lOjphZGp1c3RTdHlsZShSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEVsZW1l
bnQqIGVsZW1lbnQsIGNvbnN0CiAgICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZUFwcGVhcmFuY2Uo
cGFydCk7CiAgICAgfQogCisgICAgaWYgKCF1c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUgJiYgc3R5
bGVCb3JkZXJBbmRCYWNrZ3JvdW5kRGlmZmVyKHN0eWxlLCBzdHlsZS5kZWZhdWx0U3R5bGUoKSkp
CisgICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZUFwcGVhcmFuY2UoTm9Db250cm9sUGFydCk7CisK
ICAgICBpZiAoIXN0eWxlLmhhc0VmZmVjdGl2ZUFwcGVhcmFuY2UoKSkKICAgICAgICAgcmV0dXJu
OwogCkBAIC05MjMsOSArOTMzLDcgQEAgYm9vbCBSZW5kZXJUaGVtZTo6aXNDb250cm9sU3R5bGVk
KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIHUKICAgICBjYXNl
IFRleHRGaWVsZFBhcnQ6CiAgICAgY2FzZSBUZXh0QXJlYVBhcnQ6CiAgICAgICAgIC8vIFRlc3Qg
dGhlIHN0eWxlIHRvIHNlZSBpZiB0aGUgVUEgYm9yZGVyIGFuZCBiYWNrZ3JvdW5kIG1hdGNoLgot
ICAgICAgICByZXR1cm4gc3R5bGUuYm9yZGVyKCkgIT0gdXNlckFnZW50U3R5bGUuYm9yZGVyKCkK
LSAgICAgICAgICAgIHx8IHN0eWxlLmJhY2tncm91bmRMYXllcnMoKSAhPSB1c2VyQWdlbnRTdHls
ZS5iYWNrZ3JvdW5kTGF5ZXJzKCkKLSAgICAgICAgICAgIHx8ICFzdHlsZS5iYWNrZ3JvdW5kQ29s
b3JFcXVhbHNUb0NvbG9ySWdub3JpbmdWaXNpdGVkKHVzZXJBZ2VudFN0eWxlLmJhY2tncm91bmRD
b2xvcigpKTsKKyAgICAgICAgcmV0dXJuIHN0eWxlQm9yZGVyQW5kQmFja2dyb3VuZERpZmZlcihz
dHlsZSwgdXNlckFnZW50U3R5bGUpOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxz
ZTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKaW5kZXggMGVkZmJiYjYyNzdkYjQ4NDUzM2IxNjdmY2I1MjUzOWMyOGY0OTBk
Yy4uN2E2MWUwNjE4MGJhMGQzYTc3ZTgwODljODY2OWQwNjgyZjY5OGRiNCAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDE0IEBACisyMDIyLTAzLTE3ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw
bGUuY29tPgorCisgICAgICAgIG5qLmdvdjogQmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9y
ICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5
NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZh
c3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UtZXhwZWN0ZWQu
aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50
LWRyb3AtYXBwZWFyYW5jZS5odG1sOiBBZGRlZC4KKwogMjAyMi0wMy0xMCAgTWF0dGVvIEZsb3Jl
cyAgPG1hdHRlb19mbG9yZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TIE1hYyBdIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2Vy
L3BhcnRpdGlvbmVkLXNlcnZpY2Utd29ya2VyLW1hdGNoQWxsLnRlbnRhdGl2ZS5odHRwcy5odG1s
IGlzIGEgZmxha3kgdGV4dCBmYWlsdXJlIG9uIGFsbCBxdWV1ZXMKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2Ut
ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxl
bWVudC1kcm9wLWFwcGVhcmFuY2UtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp
bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45ZTM1MDVjYWI4
N2UyNGRmYmU2MTViOThlODBkOWNlYTk3MTJmMDhlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0
VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS1l
eHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMyBAQAorPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xv
cjogZ3JlZW4iPlBBU1MgaWYgdGhlIGJhY2tncm91bmQgY29sb3IgaXMgZ3JlZW48L2Rpdj4KKzxk
aXYgc3R5bGU9ImJvcmRlcjogZG90dGVkIj5QQVNTIGlmIHRoZSBib3JkZXIgaXMgZG90dGVkPC9k
aXY+Cis8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy4uL2JvZHktcHJvcGFnYXRp
b24vYmFja2dyb3VuZC1pbWFnZS9yZXNvdXJjZXMvbGltZS5wbmcnKSI+UEFTUyBpZiB0aGVyZSBp
cyBhIGJhY2tncm91bmQgaW1hZ2U8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv
Y3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbCBiL0xheW91
dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2Uu
aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi5hNjlhYmRjNWMxY2Q2M2E2Y2Y3YWRiMDU5NGMzOTE3OTEzNmJjYjMz
Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJv
bC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS5odG1sCkBAIC0wLDAgKzEsMjAgQEAKKzxzdHlsZT4K
Ky5iYWNrZ3JvdW5kQ29sb3JDbGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsKKyAgYmFja2dy
b3VuZC1jb2xvcjogZ3JlZW47Cit9CisKKy5ib3JkZXJDbGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1
dHRvbjsKKyAgYm9yZGVyLXN0eWxlOiBkb3R0ZWQ7Cit9CisKKy5iYWNrZ3JvdW5kSW1hZ2VDbGFz
cyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsKKyAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCcuLi9i
b2R5LXByb3BhZ2F0aW9uL2JhY2tncm91bmQtaW1hZ2UvcmVzb3VyY2VzL2xpbWUucG5nJyk7Cit9
CisKKzwvc3R5bGU+Cis8ZGl2IGNsYXNzPSJiYWNrZ3JvdW5kQ29sb3JDbGFzcyI+UEFTUyBpZiB0
aGUgYmFja2dyb3VuZCBjb2xvciBpcyBncmVlbjwvZGl2PgorPGRpdiBjbGFzcz0iYm9yZGVyQ2xh
c3MiPlBBU1MgaWYgdGhlIGJvcmRlciBpcyBkb3R0ZWQ8L2Rpdj4KKzxkaXYgY2xhc3M9ImJhY2tn
cm91bmRJbWFnZUNsYXNzIj5QQVNTIGlmIHRoZXJlIGlzIGEgYmFja2dyb3VuZCBpbWFnZTwvZGl2
Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>455054</attachid>
            <date>2022-03-17 17:33:52 -0700</date>
            <delta_ts>2022-03-18 09:50:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238035-20220317173351.patch</filename>
            <type>text/plain</type>
            <size>6881</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjZjBhYTkwZGVlOGIz
ZDBmYjZlZjRlZWQ1MGIzNzA3NzcwNjFjOS4uYjJiNGE1ZWU0YTgyODM2MjcyNjYwOWFmYzYxZTYw
M2ExOTdhMTQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAzLTE3ICBLYXRl
IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjog
QmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwKKworICAgICAgICBVcGRhdGUgUmVuZGVyVGhl
bWU6OmFkanVzdFN0eWxlIHRvIGRyb3AgYXBwZWFyYW5jZSBmb3Igbm9uLWZvcm0KKyAgICAgICAg
Y29udHJvbCBlbGVtZW50cyB3aGVuIHRoZXkgYXJlIHN0eWxlZCBieSB0aGUgYXV0aG9yLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudCBjb25zdCk6CisgICAgICAgIChX
ZWJDb3JlOjpzdHlsZUJvcmRlckFuZEJhY2tncm91bmREaWZmZXIpOgorICAgICAgICAoV2ViQ29y
ZTo6UmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo
ZW1lOjppc0NvbnRyb2xTdHlsZWQpOgorCiAyMDIyLTAzLTEwICBBbGFuIEJ1anRhcyAgPHphbGFu
QGFwcGxlLmNvbT4KIAogICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0gRW5hYmxlIFJlbmRlckxp
c3RJdGVtIGFuZCBSZW5kZXJMaXN0TWFya2VyIGZvciBJRkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyVGhlbWUuY3BwCmluZGV4IDk4MDczZmQxZTNhZmUxOTI0ODI3MzIxZDE0ODA2N2Uz
OTMxODdkY2YuLmM2OWJkYzU1YzVkOWE2MGNmYzg2NTVmMDBkYTFjODU4MGQxM2MwMzggMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcApAQCAtODQsMTMgKzg0LDEzIEBA
IFJlbmRlclRoZW1lOjpSZW5kZXJUaGVtZSgpCiB7CiB9CiAKLUNvbnRyb2xQYXJ0IFJlbmRlclRo
ZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0
IEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CitDb250cm9sUGFydCBSZW5kZXJUaGVtZTo6YWRqdXN0
QXBwZWFyYW5jZUZvckVsZW1lbnQoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBl
bGVtZW50LCBDb250cm9sUGFydCYgYXV0b0FwcGVhcmFuY2UpIGNvbnN0CiB7CiAgICAgaWYgKCFl
bGVtZW50KQogICAgICAgICByZXR1cm4gTm9Db250cm9sUGFydDsKIAogICAgIENvbnRyb2xQYXJ0
IHBhcnQgPSBzdHlsZS5lZmZlY3RpdmVBcHBlYXJhbmNlKCk7Ci0gICAgQ29udHJvbFBhcnQgYXV0
b0FwcGVhcmFuY2UgPSBhdXRvQXBwZWFyYW5jZUZvckVsZW1lbnQoZWxlbWVudCk7CisgICAgYXV0
b0FwcGVhcmFuY2UgPSBhdXRvQXBwZWFyYW5jZUZvckVsZW1lbnQoZWxlbWVudCk7CiAgICAgaWYg
KHBhcnQgPT0gYXV0b0FwcGVhcmFuY2UpCiAgICAgICAgIHJldHVybiBwYXJ0OwogCkBAIC0xMTEs
OSArMTExLDE3IEBAIENvbnRyb2xQYXJ0IFJlbmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9y
RWxlbWVudChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEVsCiAgICAgcmV0dXJuIHBhcnQ7CiB9
CiAKK3N0YXRpYyBib29sIHN0eWxlQm9yZGVyQW5kQmFja2dyb3VuZERpZmZlcihjb25zdCBSZW5k
ZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBvdGhlclN0eWxlKQoreworICAgIHJl
dHVybiBzdHlsZS5ib3JkZXIoKSAhPSBvdGhlclN0eWxlLmJvcmRlcigpCisgICAgICAgIHx8IHN0
eWxlLmJhY2tncm91bmRMYXllcnMoKSAhPSBvdGhlclN0eWxlLmJhY2tncm91bmRMYXllcnMoKQor
ICAgICAgICB8fCAhc3R5bGUuYmFja2dyb3VuZENvbG9yRXF1YWxzVG9Db2xvcklnbm9yaW5nVmlz
aXRlZChvdGhlclN0eWxlLmJhY2tncm91bmRDb2xvcigpKTsKK30KKwogdm9pZCBSZW5kZXJUaGVt
ZTo6YWRqdXN0U3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBlbGVtZW50
LCBjb25zdCBSZW5kZXJTdHlsZSogdXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKQogewotICAgIGF1
dG8gcGFydCA9IGFkanVzdEFwcGVhcmFuY2VGb3JFbGVtZW50KHN0eWxlLCBlbGVtZW50KTsKKyAg
ICBDb250cm9sUGFydCBhdXRvQXBwZWFyYW5jZUZvckVsZW1lbnQ7CisgICAgYXV0byBwYXJ0ID0g
YWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQoc3R5bGUsIGVsZW1lbnQsIGF1dG9BcHBlYXJhbmNl
Rm9yRWxlbWVudCk7CiAKICAgICBpZiAocGFydCA9PSBOb0NvbnRyb2xQYXJ0KQogICAgICAgICBy
ZXR1cm47CkBAIC0xNDAsNiArMTQ4LDkgQEAgdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUo
UmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBlbGVtZW50LCBjb25zdAogICAgICAg
ICBzdHlsZS5zZXRFZmZlY3RpdmVBcHBlYXJhbmNlKHBhcnQpOwogICAgIH0KIAorICAgIGlmICgh
dXNlckFnZW50QXBwZWFyYW5jZVN0eWxlICYmIGF1dG9BcHBlYXJhbmNlRm9yRWxlbWVudCA9PSBO
b0NvbnRyb2xQYXJ0ICYmIHN0eWxlQm9yZGVyQW5kQmFja2dyb3VuZERpZmZlcihzdHlsZSwgc3R5
bGUuZGVmYXVsdFN0eWxlKCkpKQorICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVBcHBlYXJhbmNl
KE5vQ29udHJvbFBhcnQpOworCiAgICAgaWYgKCFzdHlsZS5oYXNFZmZlY3RpdmVBcHBlYXJhbmNl
KCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtOTIzLDkgKzkzNCw3IEBAIGJvb2wgUmVuZGVyVGhl
bWU6OmlzQ29udHJvbFN0eWxlZChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRl
clN0eWxlJiB1CiAgICAgY2FzZSBUZXh0RmllbGRQYXJ0OgogICAgIGNhc2UgVGV4dEFyZWFQYXJ0
OgogICAgICAgICAvLyBUZXN0IHRoZSBzdHlsZSB0byBzZWUgaWYgdGhlIFVBIGJvcmRlciBhbmQg
YmFja2dyb3VuZCBtYXRjaC4KLSAgICAgICAgcmV0dXJuIHN0eWxlLmJvcmRlcigpICE9IHVzZXJB
Z2VudFN0eWxlLmJvcmRlcigpCi0gICAgICAgICAgICB8fCBzdHlsZS5iYWNrZ3JvdW5kTGF5ZXJz
KCkgIT0gdXNlckFnZW50U3R5bGUuYmFja2dyb3VuZExheWVycygpCi0gICAgICAgICAgICB8fCAh
c3R5bGUuYmFja2dyb3VuZENvbG9yRXF1YWxzVG9Db2xvcklnbm9yaW5nVmlzaXRlZCh1c2VyQWdl
bnRTdHlsZS5iYWNrZ3JvdW5kQ29sb3IoKSk7CisgICAgICAgIHJldHVybiBzdHlsZUJvcmRlckFu
ZEJhY2tncm91bmREaWZmZXIoc3R5bGUsIHVzZXJBZ2VudFN0eWxlKTsKICAgICBkZWZhdWx0Ogog
ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlclRoZW1lLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
VGhlbWUuaAppbmRleCAwNDQwYjg2MmIyMDdiNzBmOTE4OTU1ZmY2ODZiZDFhNjM5ZDVmOWZmLi5i
NDY4NjMwZDkxYTZjNTVhNzU4YzA2NzE4NWNiYTM1NDIxNTg4NTA0IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyVGhlbWUuaApAQCAtNDU5LDcgKzQ1OSw3IEBAIHByb3RlY3RlZDoKIAog
cHJpdmF0ZToKICAgICBDb250cm9sUGFydCBhdXRvQXBwZWFyYW5jZUZvckVsZW1lbnQoY29uc3Qg
RWxlbWVudCopIGNvbnN0OwotICAgIENvbnRyb2xQYXJ0IGFkanVzdEFwcGVhcmFuY2VGb3JFbGVt
ZW50KFJlbmRlclN0eWxlJiwgY29uc3QgRWxlbWVudCopIGNvbnN0OworICAgIENvbnRyb2xQYXJ0
IGFkanVzdEFwcGVhcmFuY2VGb3JFbGVtZW50KFJlbmRlclN0eWxlJiwgY29uc3QgRWxlbWVudCos
IENvbnRyb2xQYXJ0JikgY29uc3Q7CiAKICAgICB2b2lkIGFkanVzdFNlYXJjaEZpZWxkRGVjb3Jh
dGlvblN0eWxlKFJlbmRlclN0eWxlJiwgY29uc3QgRWxlbWVudCopIGNvbnN0OwogCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg
MGVkZmJiYjYyNzdkYjQ4NDUzM2IxNjdmY2I1MjUzOWMyOGY0OTBkYy4uN2E2MWUwNjE4MGJhMGQz
YTc3ZTgwODljODY2OWQwNjgyZjY5OGRiNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAz
LTE3ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAg
IG5qLmdvdjogQmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycg
c2VjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjM4MDM1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL25vbi1mb3JtLWNv
bnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAg
ICAgICogZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS5o
dG1sOiBBZGRlZC4KKwogMjAyMi0wMy0xMCAgTWF0dGVvIEZsb3JlcyAgPG1hdHRlb19mbG9yZXNA
YXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TIE1hYyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL3BhcnRpdGlvbmVkLXNlcnZp
Y2Utd29ya2VyLW1hdGNoQWxsLnRlbnRhdGl2ZS5odHRwcy5odG1sIGlzIGEgZmxha3kgdGV4dCBm
YWlsdXJlIG9uIGFsbCBxdWV1ZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25v
bi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UtZXhwZWN0ZWQuaHRtbCBiL0xh
eW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFu
Y2UtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45ZTM1MDVjYWI4N2UyNGRmYmU2MTViOThlODBk
OWNlYTk3MTJmMDhlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9u
LWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS1leHBlY3RlZC5odG1sCkBAIC0w
LDAgKzEsMyBAQAorPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogZ3JlZW4iPlBBU1MgaWYg
dGhlIGJhY2tncm91bmQgY29sb3IgaXMgZ3JlZW48L2Rpdj4KKzxkaXYgc3R5bGU9ImJvcmRlcjog
ZG90dGVkIj5QQVNTIGlmIHRoZSBib3JkZXIgaXMgZG90dGVkPC9kaXY+Cis8ZGl2IHN0eWxlPSJi
YWNrZ3JvdW5kLWltYWdlOiB1cmwoJy4uL2JvZHktcHJvcGFnYXRpb24vYmFja2dyb3VuZC1pbWFn
ZS9yZXNvdXJjZXMvbGltZS5wbmcnKSI+UEFTUyBpZiB0aGVyZSBpcyBhIGJhY2tncm91bmQgaW1h
Z2U8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRy
b2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25v
bi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbApuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5h
NjlhYmRjNWMxY2Q2M2E2Y2Y3YWRiMDU5NGMzOTE3OTEzNmJjYjMzCi0tLSAvZGV2L251bGwKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBw
ZWFyYW5jZS5odG1sCkBAIC0wLDAgKzEsMjAgQEAKKzxzdHlsZT4KKy5iYWNrZ3JvdW5kQ29sb3JD
bGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47
Cit9CisKKy5ib3JkZXJDbGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsKKyAgYm9yZGVyLXN0
eWxlOiBkb3R0ZWQ7Cit9CisKKy5iYWNrZ3JvdW5kSW1hZ2VDbGFzcyB7CisgIGFwcGVhcmFuY2U6
IGJ1dHRvbjsKKyAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCcuLi9ib2R5LXByb3BhZ2F0aW9uL2Jh
Y2tncm91bmQtaW1hZ2UvcmVzb3VyY2VzL2xpbWUucG5nJyk7Cit9CisKKzwvc3R5bGU+Cis8ZGl2
IGNsYXNzPSJiYWNrZ3JvdW5kQ29sb3JDbGFzcyI+UEFTUyBpZiB0aGUgYmFja2dyb3VuZCBjb2xv
ciBpcyBncmVlbjwvZGl2PgorPGRpdiBjbGFzcz0iYm9yZGVyQ2xhc3MiPlBBU1MgaWYgdGhlIGJv
cmRlciBpcyBkb3R0ZWQ8L2Rpdj4KKzxkaXYgY2xhc3M9ImJhY2tncm91bmRJbWFnZUNsYXNzIj5Q
QVNTIGlmIHRoZXJlIGlzIGEgYmFja2dyb3VuZCBpbWFnZTwvZGl2Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>455102</attachid>
            <date>2022-03-18 09:50:12 -0700</date>
            <delta_ts>2022-03-18 09:57:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238035-20220318095011.patch</filename>
            <type>text/plain</type>
            <size>8219</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjZjBhYTkwZGVlOGIz
ZDBmYjZlZjRlZWQ1MGIzNzA3NzcwNjFjOS4uZWQ5NTQwNWVlYzk4NWM3ZjExNjQyOGZhYzcyNWQ4
OTMzY2Y1MDc2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAzLTE4ICBLYXRl
IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjog
QmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwKKworICAgICAgICBVcGRhdGUgUmVuZGVyVGhl
bWU6OmFkanVzdFN0eWxlIHRvIGRyb3AgYXBwZWFyYW5jZSBmb3Igbm9uLWZvcm0KKyAgICAgICAg
Y29udHJvbCBlbGVtZW50cyB3aGVuIHRoZXkgYXJlIHN0eWxlZCBieSB0aGUgYXV0aG9yLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudCBjb25zdCk6CisgICAgICAgIChX
ZWJDb3JlOjpSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyVGhlbWU6OmlzQ29udHJvbFN0eWxlZCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlclRoZW1lLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpib3JkZXJBbmRCYWNrZ3JvdW5kRXF1YWwg
Y29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorCiAyMDIy
LTAzLTEwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbSUZDXVtJ
bnRlZ3JhdGlvbl0gRW5hYmxlIFJlbmRlckxpc3RJdGVtIGFuZCBSZW5kZXJMaXN0TWFya2VyIGZv
ciBJRkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCmluZGV4IDk4MDcz
ZmQxZTNhZmUxOTI0ODI3MzIxZDE0ODA2N2UzOTMxODdkY2YuLjU4MmE2NWM5MTM4YWYwYTk3MWU5
ZWI3ODJhMGZkY2YxN2ExZTgzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJUaGVtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo
ZW1lLmNwcApAQCAtODQsMTMgKzg0LDEyIEBAIFJlbmRlclRoZW1lOjpSZW5kZXJUaGVtZSgpCiB7
CiB9CiAKLUNvbnRyb2xQYXJ0IFJlbmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVu
dChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CitDb250
cm9sUGFydCBSZW5kZXJUaGVtZTo6YWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQoUmVuZGVyU3R5
bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBlbGVtZW50LCBDb250cm9sUGFydCBhdXRvQXBwZWFy
YW5jZSkgY29uc3QKIHsKICAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybiBOb0NvbnRy
b2xQYXJ0OwogCiAgICAgQ29udHJvbFBhcnQgcGFydCA9IHN0eWxlLmVmZmVjdGl2ZUFwcGVhcmFu
Y2UoKTsKLSAgICBDb250cm9sUGFydCBhdXRvQXBwZWFyYW5jZSA9IGF1dG9BcHBlYXJhbmNlRm9y
RWxlbWVudChlbGVtZW50KTsKICAgICBpZiAocGFydCA9PSBhdXRvQXBwZWFyYW5jZSkKICAgICAg
ICAgcmV0dXJuIHBhcnQ7CiAKQEAgLTExMyw3ICsxMTIsOCBAQCBDb250cm9sUGFydCBSZW5kZXJU
aGVtZTo6YWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25z
dCBFbAogCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTdHlsZShSZW5kZXJTdHlsZSYgc3R5bGUs
IGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBl
YXJhbmNlU3R5bGUpCiB7Ci0gICAgYXV0byBwYXJ0ID0gYWRqdXN0QXBwZWFyYW5jZUZvckVsZW1l
bnQoc3R5bGUsIGVsZW1lbnQpOworICAgIENvbnRyb2xQYXJ0IGF1dG9BcHBlYXJhbmNlID0gYXV0
b0FwcGVhcmFuY2VGb3JFbGVtZW50KGVsZW1lbnQpOworICAgIGF1dG8gcGFydCA9IGFkanVzdEFw
cGVhcmFuY2VGb3JFbGVtZW50KHN0eWxlLCBlbGVtZW50LCBhdXRvQXBwZWFyYW5jZSk7CiAKICAg
ICBpZiAocGFydCA9PSBOb0NvbnRyb2xQYXJ0KQogICAgICAgICByZXR1cm47CkBAIC0xNDAsNiAr
MTQwLDExIEBAIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKFJlbmRlclN0eWxlJiBzdHls
ZSwgY29uc3QgRWxlbWVudCogZWxlbWVudCwgY29uc3QKICAgICAgICAgc3R5bGUuc2V0RWZmZWN0
aXZlQXBwZWFyYW5jZShwYXJ0KTsKICAgICB9CiAKKyAgICBpZiAoIXVzZXJBZ2VudEFwcGVhcmFu
Y2VTdHlsZQorICAgICAgICAmJiBhdXRvQXBwZWFyYW5jZSA9PSBOb0NvbnRyb2xQYXJ0CisgICAg
ICAgICYmICFzdHlsZS5ib3JkZXJBbmRCYWNrZ3JvdW5kRXF1YWwoUmVuZGVyU3R5bGU6OmRlZmF1
bHRTdHlsZSgpKSkKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlQXBwZWFyYW5jZShOb0NvbnRy
b2xQYXJ0KTsKKwogICAgIGlmICghc3R5bGUuaGFzRWZmZWN0aXZlQXBwZWFyYW5jZSgpKQogICAg
ICAgICByZXR1cm47CiAKQEAgLTkyMyw5ICs5MjgsNyBAQCBib29sIFJlbmRlclRoZW1lOjppc0Nv
bnRyb2xTdHlsZWQoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYg
dQogICAgIGNhc2UgVGV4dEZpZWxkUGFydDoKICAgICBjYXNlIFRleHRBcmVhUGFydDoKICAgICAg
ICAgLy8gVGVzdCB0aGUgc3R5bGUgdG8gc2VlIGlmIHRoZSBVQSBib3JkZXIgYW5kIGJhY2tncm91
bmQgbWF0Y2guCi0gICAgICAgIHJldHVybiBzdHlsZS5ib3JkZXIoKSAhPSB1c2VyQWdlbnRTdHls
ZS5ib3JkZXIoKQotICAgICAgICAgICAgfHwgc3R5bGUuYmFja2dyb3VuZExheWVycygpICE9IHVz
ZXJBZ2VudFN0eWxlLmJhY2tncm91bmRMYXllcnMoKQotICAgICAgICAgICAgfHwgIXN0eWxlLmJh
Y2tncm91bmRDb2xvckVxdWFsc1RvQ29sb3JJZ25vcmluZ1Zpc2l0ZWQodXNlckFnZW50U3R5bGUu
YmFja2dyb3VuZENvbG9yKCkpOworICAgICAgICByZXR1cm4gIXN0eWxlLmJvcmRlckFuZEJhY2tn
cm91bmRFcXVhbCh1c2VyQWdlbnRTdHlsZSk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJu
IGZhbHNlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJUaGVtZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKaW5kZXgg
MDQ0MGI4NjJiMjA3YjcwZjkxODk1NWZmNjg2YmQxYTYzOWQ1ZjlmZi4uYWQ1ZGQ5NDc0ZDI5NTE4
ZGUyOGQxZGQ3MmE4YjY1NDEzODg5NDFkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlclRoZW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
clRoZW1lLmgKQEAgLTQ1OSw3ICs0NTksNyBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAg
Q29udHJvbFBhcnQgYXV0b0FwcGVhcmFuY2VGb3JFbGVtZW50KGNvbnN0IEVsZW1lbnQqKSBjb25z
dDsKLSAgICBDb250cm9sUGFydCBhZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudChSZW5kZXJTdHls
ZSYsIGNvbnN0IEVsZW1lbnQqKSBjb25zdDsKKyAgICBDb250cm9sUGFydCBhZGp1c3RBcHBlYXJh
bmNlRm9yRWxlbWVudChSZW5kZXJTdHlsZSYsIGNvbnN0IEVsZW1lbnQqLCBDb250cm9sUGFydCkg
Y29uc3Q7CiAKICAgICB2b2lkIGFkanVzdFNlYXJjaEZpZWxkRGVjb3JhdGlvblN0eWxlKFJlbmRl
clN0eWxlJiwgY29uc3QgRWxlbWVudCopIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCAzMGZjZGExMjI2OTMxYTU1YWZiYTRl
Y2ZkZjRmMGYxYWVkMTUyMGY1Li5lYjVhYjQyMzk3NDVmODBjNzk3NGU4Mjk4YWUyNmFjN2VmNjc4
NmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5
bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5j
cHAKQEAgLTQ2MCw2ICs0NjAsMTMgQEAgYm9vbCBSZW5kZXJTdHlsZTo6ZGVzY2VuZGFudEFmZmVj
dGluZ05vbkluaGVyaXRlZFByb3BlcnRpZXNFcXVhbChjb25zdCBSZW5kZXJTdHkKICAgICAgICAg
JiYgbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+anVzdGlmeUl0ZW1zID09IG90aGVyLm1fcmFyZU5v
bkluaGVyaXRlZERhdGEtPmp1c3RpZnlJdGVtczsKIH0KIAorYm9vbCBSZW5kZXJTdHlsZTo6Ym9y
ZGVyQW5kQmFja2dyb3VuZEVxdWFsKGNvbnN0IFJlbmRlclN0eWxlJiBvdGhlcikgY29uc3QKK3sK
KyAgICByZXR1cm4gYm9yZGVyKCkgPT0gb3RoZXIuYm9yZGVyKCkKKyAgICAgICAgJiYgYmFja2dy
b3VuZExheWVycygpID09IG90aGVyLmJhY2tncm91bmRMYXllcnMoKQorICAgICAgICAmJiBiYWNr
Z3JvdW5kQ29sb3JFcXVhbHNUb0NvbG9ySWdub3JpbmdWaXNpdGVkKG90aGVyLmJhY2tncm91bmRD
b2xvcigpKTsKK30KKwogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAKIHN0YXRpYyBpbmxp
bmUgdW5zaWduZWQgY29tcHV0ZUZvbnRIYXNoKGNvbnN0IEZvbnRDYXNjYWRlJiBmb250KQpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCBiMjBmZWE0
NGFiMjdmMzEzMWE4NTFlMWY2ZDYwZjExMTRiNGViYzJmLi43NGRmMzVhYzc0NDdhMWVkOGRkYmYz
MTJlZjAwNzlhZWM3OGE0MmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
c3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv
UmVuZGVyU3R5bGUuaApAQCAtMTk0OSw2ICsxOTQ5LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0
T2Zmc2V0Um90YXRlKE9mZnNldFJvdGF0aW9uJiYgcm90YXRpb24pIHsgU0VUX1ZBUihtX3JhcmVO
b25Jbmhlcml0ZWREYXRhLCBvZmZzZXRSb3RhdGUsIFdURk1vdmUocm90YXRpb24pKTsgfQogICAg
IHN0YXRpYyBPZmZzZXRSb3RhdGlvbiBpbml0aWFsT2Zmc2V0Um90YXRlKCkgeyByZXR1cm4gT2Zm
c2V0Um90YXRpb24odHJ1ZSwgMCk7IH0KIAorICAgIGJvb2wgYm9yZGVyQW5kQmFja2dyb3VuZEVx
dWFsKGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3Q7CisKIHByaXZhdGU6CiAgICAgc3RydWN0IE5v
bkluaGVyaXRlZEZsYWdzIHsKICAgICAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IE5vbkluaGVy
aXRlZEZsYWdzJikgY29uc3Q7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMGVkZmJiYjYyNzdkYjQ4NDUzM2IxNjdmY2I1MjUz
OWMyOGY0OTBkYy4uMGRmYmFmZDVlMjM5MDZhYWZkZjE0OTFjMDRkNTNhYWZiMTczNTk3MiAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAzLTE4ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9j
aGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjogQmFja2dyb3VuZCBjb2xvciBpbmNv
cnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIGZhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2Ut
ZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJv
bC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS5odG1sOiBBZGRlZC4KKwogMjAyMi0wMy0xMCAgTWF0
dGVvIEZsb3JlcyAgPG1hdHRlb19mbG9yZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TIE1h
YyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZp
Y2Utd29ya2VyL3BhcnRpdGlvbmVkLXNlcnZpY2Utd29ya2VyLW1hdGNoQWxsLnRlbnRhdGl2ZS5o
dHRwcy5odG1sIGlzIGEgZmxha3kgdGV4dCBmYWlsdXJlIG9uIGFsbCBxdWV1ZXMKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFw
cGVhcmFuY2UtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNv
bnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45
ZTM1MDVjYWI4N2UyNGRmYmU2MTViOThlODBkOWNlYTk3MTJmMDhlCi0tLSAvZGV2L251bGwKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBw
ZWFyYW5jZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMyBAQAorPGRpdiBzdHlsZT0iYmFja2dy
b3VuZC1jb2xvcjogZ3JlZW4iPlBBU1MgaWYgdGhlIGJhY2tncm91bmQgY29sb3IgaXMgZ3JlZW48
L2Rpdj4KKzxkaXYgc3R5bGU9ImJvcmRlcjogZG90dGVkIj5QQVNTIGlmIHRoZSBib3JkZXIgaXMg
ZG90dGVkPC9kaXY+Cis8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy4uL2JvZHkt
cHJvcGFnYXRpb24vYmFja2dyb3VuZC1pbWFnZS9yZXNvdXJjZXMvbGltZS5wbmcnKSI+UEFTUyBp
ZiB0aGVyZSBpcyBhIGJhY2tncm91bmQgaW1hZ2U8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRt
bCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFw
cGVhcmFuY2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hNjlhYmRjNWMxY2Q2M2E2Y2Y3YWRiMDU5NGMzOTE3
OTEzNmJjYjMzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZv
cm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS5odG1sCkBAIC0wLDAgKzEsMjAgQEAK
KzxzdHlsZT4KKy5iYWNrZ3JvdW5kQ29sb3JDbGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsK
KyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9CisKKy5ib3JkZXJDbGFzcyB7CisgIGFwcGVh
cmFuY2U6IGJ1dHRvbjsKKyAgYm9yZGVyLXN0eWxlOiBkb3R0ZWQ7Cit9CisKKy5iYWNrZ3JvdW5k
SW1hZ2VDbGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsKKyAgYmFja2dyb3VuZC1pbWFnZTog
dXJsKCcuLi9ib2R5LXByb3BhZ2F0aW9uL2JhY2tncm91bmQtaW1hZ2UvcmVzb3VyY2VzL2xpbWUu
cG5nJyk7Cit9CisKKzwvc3R5bGU+Cis8ZGl2IGNsYXNzPSJiYWNrZ3JvdW5kQ29sb3JDbGFzcyI+
UEFTUyBpZiB0aGUgYmFja2dyb3VuZCBjb2xvciBpcyBncmVlbjwvZGl2PgorPGRpdiBjbGFzcz0i
Ym9yZGVyQ2xhc3MiPlBBU1MgaWYgdGhlIGJvcmRlciBpcyBkb3R0ZWQ8L2Rpdj4KKzxkaXYgY2xh
c3M9ImJhY2tncm91bmRJbWFnZUNsYXNzIj5QQVNTIGlmIHRoZXJlIGlzIGEgYmFja2dyb3VuZCBp
bWFnZTwvZGl2Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>455103</attachid>
            <date>2022-03-18 09:57:58 -0700</date>
            <delta_ts>2022-03-21 13:01:19 -0700</delta_ts>
            <desc>PFL once EWS is happy</desc>
            <filename>bug-238035-20220318095757.patch</filename>
            <type>text/plain</type>
            <size>8219</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjZjBhYTkwZGVlOGIz
ZDBmYjZlZjRlZWQ1MGIzNzA3NzcwNjFjOS4uMjY0ZTc1ODAxNDc3NmYxNjA3ZjExNGEzZTI3Nzk4
Zjg5NTExNzk5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAzLTE4ICBLYXRl
IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjog
QmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBB
ZGl0eWEgS2VlcnRoaS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwKKworICAgICAgICBVcGRhdGUgUmVuZGVyVGhl
bWU6OmFkanVzdFN0eWxlIHRvIGRyb3AgYXBwZWFyYW5jZSBmb3Igbm9uLWZvcm0KKyAgICAgICAg
Y29udHJvbCBlbGVtZW50cyB3aGVuIHRoZXkgYXJlIHN0eWxlZCBieSB0aGUgYXV0aG9yLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudCBjb25zdCk6CisgICAgICAgIChX
ZWJDb3JlOjpSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyVGhlbWU6OmlzQ29udHJvbFN0eWxlZCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlclRoZW1lLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpib3JkZXJBbmRCYWNrZ3JvdW5kRXF1YWwg
Y29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorCiAyMDIy
LTAzLTEwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbSUZDXVtJ
bnRlZ3JhdGlvbl0gRW5hYmxlIFJlbmRlckxpc3RJdGVtIGFuZCBSZW5kZXJMaXN0TWFya2VyIGZv
ciBJRkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCmluZGV4IDk4MDcz
ZmQxZTNhZmUxOTI0ODI3MzIxZDE0ODA2N2UzOTMxODdkY2YuLjU4MmE2NWM5MTM4YWYwYTk3MWU5
ZWI3ODJhMGZkY2YxN2ExZTgzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJUaGVtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo
ZW1lLmNwcApAQCAtODQsMTMgKzg0LDEyIEBAIFJlbmRlclRoZW1lOjpSZW5kZXJUaGVtZSgpCiB7
CiB9CiAKLUNvbnRyb2xQYXJ0IFJlbmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVu
dChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CitDb250
cm9sUGFydCBSZW5kZXJUaGVtZTo6YWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQoUmVuZGVyU3R5
bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBlbGVtZW50LCBDb250cm9sUGFydCBhdXRvQXBwZWFy
YW5jZSkgY29uc3QKIHsKICAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybiBOb0NvbnRy
b2xQYXJ0OwogCiAgICAgQ29udHJvbFBhcnQgcGFydCA9IHN0eWxlLmVmZmVjdGl2ZUFwcGVhcmFu
Y2UoKTsKLSAgICBDb250cm9sUGFydCBhdXRvQXBwZWFyYW5jZSA9IGF1dG9BcHBlYXJhbmNlRm9y
RWxlbWVudChlbGVtZW50KTsKICAgICBpZiAocGFydCA9PSBhdXRvQXBwZWFyYW5jZSkKICAgICAg
ICAgcmV0dXJuIHBhcnQ7CiAKQEAgLTExMyw3ICsxMTIsOCBAQCBDb250cm9sUGFydCBSZW5kZXJU
aGVtZTo6YWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25z
dCBFbAogCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTdHlsZShSZW5kZXJTdHlsZSYgc3R5bGUs
IGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBl
YXJhbmNlU3R5bGUpCiB7Ci0gICAgYXV0byBwYXJ0ID0gYWRqdXN0QXBwZWFyYW5jZUZvckVsZW1l
bnQoc3R5bGUsIGVsZW1lbnQpOworICAgIENvbnRyb2xQYXJ0IGF1dG9BcHBlYXJhbmNlID0gYXV0
b0FwcGVhcmFuY2VGb3JFbGVtZW50KGVsZW1lbnQpOworICAgIGF1dG8gcGFydCA9IGFkanVzdEFw
cGVhcmFuY2VGb3JFbGVtZW50KHN0eWxlLCBlbGVtZW50LCBhdXRvQXBwZWFyYW5jZSk7CiAKICAg
ICBpZiAocGFydCA9PSBOb0NvbnRyb2xQYXJ0KQogICAgICAgICByZXR1cm47CkBAIC0xNDAsNiAr
MTQwLDExIEBAIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKFJlbmRlclN0eWxlJiBzdHls
ZSwgY29uc3QgRWxlbWVudCogZWxlbWVudCwgY29uc3QKICAgICAgICAgc3R5bGUuc2V0RWZmZWN0
aXZlQXBwZWFyYW5jZShwYXJ0KTsKICAgICB9CiAKKyAgICBpZiAoIXVzZXJBZ2VudEFwcGVhcmFu
Y2VTdHlsZQorICAgICAgICAmJiBhdXRvQXBwZWFyYW5jZSA9PSBOb0NvbnRyb2xQYXJ0CisgICAg
ICAgICYmICFzdHlsZS5ib3JkZXJBbmRCYWNrZ3JvdW5kRXF1YWwoUmVuZGVyU3R5bGU6OmRlZmF1
bHRTdHlsZSgpKSkKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlQXBwZWFyYW5jZShOb0NvbnRy
b2xQYXJ0KTsKKwogICAgIGlmICghc3R5bGUuaGFzRWZmZWN0aXZlQXBwZWFyYW5jZSgpKQogICAg
ICAgICByZXR1cm47CiAKQEAgLTkyMyw5ICs5MjgsNyBAQCBib29sIFJlbmRlclRoZW1lOjppc0Nv
bnRyb2xTdHlsZWQoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYg
dQogICAgIGNhc2UgVGV4dEZpZWxkUGFydDoKICAgICBjYXNlIFRleHRBcmVhUGFydDoKICAgICAg
ICAgLy8gVGVzdCB0aGUgc3R5bGUgdG8gc2VlIGlmIHRoZSBVQSBib3JkZXIgYW5kIGJhY2tncm91
bmQgbWF0Y2guCi0gICAgICAgIHJldHVybiBzdHlsZS5ib3JkZXIoKSAhPSB1c2VyQWdlbnRTdHls
ZS5ib3JkZXIoKQotICAgICAgICAgICAgfHwgc3R5bGUuYmFja2dyb3VuZExheWVycygpICE9IHVz
ZXJBZ2VudFN0eWxlLmJhY2tncm91bmRMYXllcnMoKQotICAgICAgICAgICAgfHwgIXN0eWxlLmJh
Y2tncm91bmRDb2xvckVxdWFsc1RvQ29sb3JJZ25vcmluZ1Zpc2l0ZWQodXNlckFnZW50U3R5bGUu
YmFja2dyb3VuZENvbG9yKCkpOworICAgICAgICByZXR1cm4gIXN0eWxlLmJvcmRlckFuZEJhY2tn
cm91bmRFcXVhbCh1c2VyQWdlbnRTdHlsZSk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJu
IGZhbHNlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJUaGVtZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKaW5kZXgg
MDQ0MGI4NjJiMjA3YjcwZjkxODk1NWZmNjg2YmQxYTYzOWQ1ZjlmZi4uYWQ1ZGQ5NDc0ZDI5NTE4
ZGUyOGQxZGQ3MmE4YjY1NDEzODg5NDFkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlclRoZW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
clRoZW1lLmgKQEAgLTQ1OSw3ICs0NTksNyBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAg
Q29udHJvbFBhcnQgYXV0b0FwcGVhcmFuY2VGb3JFbGVtZW50KGNvbnN0IEVsZW1lbnQqKSBjb25z
dDsKLSAgICBDb250cm9sUGFydCBhZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudChSZW5kZXJTdHls
ZSYsIGNvbnN0IEVsZW1lbnQqKSBjb25zdDsKKyAgICBDb250cm9sUGFydCBhZGp1c3RBcHBlYXJh
bmNlRm9yRWxlbWVudChSZW5kZXJTdHlsZSYsIGNvbnN0IEVsZW1lbnQqLCBDb250cm9sUGFydCkg
Y29uc3Q7CiAKICAgICB2b2lkIGFkanVzdFNlYXJjaEZpZWxkRGVjb3JhdGlvblN0eWxlKFJlbmRl
clN0eWxlJiwgY29uc3QgRWxlbWVudCopIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCAzMGZjZGExMjI2OTMxYTU1YWZiYTRl
Y2ZkZjRmMGYxYWVkMTUyMGY1Li5lYjVhYjQyMzk3NDVmODBjNzk3NGU4Mjk4YWUyNmFjN2VmNjc4
NmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5
bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5j
cHAKQEAgLTQ2MCw2ICs0NjAsMTMgQEAgYm9vbCBSZW5kZXJTdHlsZTo6ZGVzY2VuZGFudEFmZmVj
dGluZ05vbkluaGVyaXRlZFByb3BlcnRpZXNFcXVhbChjb25zdCBSZW5kZXJTdHkKICAgICAgICAg
JiYgbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+anVzdGlmeUl0ZW1zID09IG90aGVyLm1fcmFyZU5v
bkluaGVyaXRlZERhdGEtPmp1c3RpZnlJdGVtczsKIH0KIAorYm9vbCBSZW5kZXJTdHlsZTo6Ym9y
ZGVyQW5kQmFja2dyb3VuZEVxdWFsKGNvbnN0IFJlbmRlclN0eWxlJiBvdGhlcikgY29uc3QKK3sK
KyAgICByZXR1cm4gYm9yZGVyKCkgPT0gb3RoZXIuYm9yZGVyKCkKKyAgICAgICAgJiYgYmFja2dy
b3VuZExheWVycygpID09IG90aGVyLmJhY2tncm91bmRMYXllcnMoKQorICAgICAgICAmJiBiYWNr
Z3JvdW5kQ29sb3JFcXVhbHNUb0NvbG9ySWdub3JpbmdWaXNpdGVkKG90aGVyLmJhY2tncm91bmRD
b2xvcigpKTsKK30KKwogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAKIHN0YXRpYyBpbmxp
bmUgdW5zaWduZWQgY29tcHV0ZUZvbnRIYXNoKGNvbnN0IEZvbnRDYXNjYWRlJiBmb250KQpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCBiMjBmZWE0
NGFiMjdmMzEzMWE4NTFlMWY2ZDYwZjExMTRiNGViYzJmLi43NGRmMzVhYzc0NDdhMWVkOGRkYmYz
MTJlZjAwNzlhZWM3OGE0MmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
c3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv
UmVuZGVyU3R5bGUuaApAQCAtMTk0OSw2ICsxOTQ5LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0
T2Zmc2V0Um90YXRlKE9mZnNldFJvdGF0aW9uJiYgcm90YXRpb24pIHsgU0VUX1ZBUihtX3JhcmVO
b25Jbmhlcml0ZWREYXRhLCBvZmZzZXRSb3RhdGUsIFdURk1vdmUocm90YXRpb24pKTsgfQogICAg
IHN0YXRpYyBPZmZzZXRSb3RhdGlvbiBpbml0aWFsT2Zmc2V0Um90YXRlKCkgeyByZXR1cm4gT2Zm
c2V0Um90YXRpb24odHJ1ZSwgMCk7IH0KIAorICAgIGJvb2wgYm9yZGVyQW5kQmFja2dyb3VuZEVx
dWFsKGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3Q7CisKIHByaXZhdGU6CiAgICAgc3RydWN0IE5v
bkluaGVyaXRlZEZsYWdzIHsKICAgICAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IE5vbkluaGVy
aXRlZEZsYWdzJikgY29uc3Q7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMGVkZmJiYjYyNzdkYjQ4NDUzM2IxNjdmY2I1MjUz
OWMyOGY0OTBkYy4uMjQ4ZDNjOWZkMzVmMWFjZDRjYzBlZmU0NzllZTJiYTE3NjgwMWYzMyAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAzLTE4ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9j
aGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjogQmFja2dyb3VuZCBjb2xvciBpbmNv
cnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGl0eWEgS2VlcnRoaS4KKworICAg
ICAgICAqIGZhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2Ut
ZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJv
bC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS5odG1sOiBBZGRlZC4KKwogMjAyMi0wMy0xMCAgTWF0
dGVvIEZsb3JlcyAgPG1hdHRlb19mbG9yZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TIE1h
YyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZp
Y2Utd29ya2VyL3BhcnRpdGlvbmVkLXNlcnZpY2Utd29ya2VyLW1hdGNoQWxsLnRlbnRhdGl2ZS5o
dHRwcy5odG1sIGlzIGEgZmxha3kgdGV4dCBmYWlsdXJlIG9uIGFsbCBxdWV1ZXMKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFw
cGVhcmFuY2UtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNv
bnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45
ZTM1MDVjYWI4N2UyNGRmYmU2MTViOThlODBkOWNlYTk3MTJmMDhlCi0tLSAvZGV2L251bGwKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZvcm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBw
ZWFyYW5jZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMyBAQAorPGRpdiBzdHlsZT0iYmFja2dy
b3VuZC1jb2xvcjogZ3JlZW4iPlBBU1MgaWYgdGhlIGJhY2tncm91bmQgY29sb3IgaXMgZ3JlZW48
L2Rpdj4KKzxkaXYgc3R5bGU9ImJvcmRlcjogZG90dGVkIj5QQVNTIGlmIHRoZSBib3JkZXIgaXMg
ZG90dGVkPC9kaXY+Cis8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy4uL2JvZHkt
cHJvcGFnYXRpb24vYmFja2dyb3VuZC1pbWFnZS9yZXNvdXJjZXMvbGltZS5wbmcnKSI+UEFTUyBp
ZiB0aGVyZSBpcyBhIGJhY2tncm91bmQgaW1hZ2U8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UuaHRt
bCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFw
cGVhcmFuY2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hNjlhYmRjNWMxY2Q2M2E2Y2Y3YWRiMDU5NGMzOTE3
OTEzNmJjYjMzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvbm9uLWZv
cm0tY29udHJvbC1lbGVtZW50LWRyb3AtYXBwZWFyYW5jZS5odG1sCkBAIC0wLDAgKzEsMjAgQEAK
KzxzdHlsZT4KKy5iYWNrZ3JvdW5kQ29sb3JDbGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsK
KyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9CisKKy5ib3JkZXJDbGFzcyB7CisgIGFwcGVh
cmFuY2U6IGJ1dHRvbjsKKyAgYm9yZGVyLXN0eWxlOiBkb3R0ZWQ7Cit9CisKKy5iYWNrZ3JvdW5k
SW1hZ2VDbGFzcyB7CisgIGFwcGVhcmFuY2U6IGJ1dHRvbjsKKyAgYmFja2dyb3VuZC1pbWFnZTog
dXJsKCcuLi9ib2R5LXByb3BhZ2F0aW9uL2JhY2tncm91bmQtaW1hZ2UvcmVzb3VyY2VzL2xpbWUu
cG5nJyk7Cit9CisKKzwvc3R5bGU+Cis8ZGl2IGNsYXNzPSJiYWNrZ3JvdW5kQ29sb3JDbGFzcyI+
UEFTUyBpZiB0aGUgYmFja2dyb3VuZCBjb2xvciBpcyBncmVlbjwvZGl2PgorPGRpdiBjbGFzcz0i
Ym9yZGVyQ2xhc3MiPlBBU1MgaWYgdGhlIGJvcmRlciBpcyBkb3R0ZWQ8L2Rpdj4KKzxkaXYgY2xh
c3M9ImJhY2tncm91bmRJbWFnZUNsYXNzIj5QQVNTIGlmIHRoZXJlIGlzIGEgYmFja2dyb3VuZCBp
bWFnZTwvZGl2Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>455266</attachid>
            <date>2022-03-21 13:01:23 -0700</date>
            <delta_ts>2022-03-21 16:40:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238035-20220321130122.patch</filename>
            <type>text/plain</type>
            <size>8889</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFlYWU2OTg2YzljOTUx
NTY2OWZlYzQxNjA0YTRiYWM1NGExYTRkMS4uNTdkYjBkOGVmNDM4YTY1NDBkZTRlMGMwNGU1NjMx
NzMzNDAxYjcxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAzLTIxICBLYXRl
IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIG5qLmdvdjog
QmFja2dyb3VuZCBjb2xvciBpbmNvcnJlY3QgZm9yICdTdGF0ZSBWZWhpY2xlcycgc2VjdGlvbgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDM1Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDU0Mzc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBB
ZGl0eWEgS2VlcnRoaS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ub24tZm9ybS1jb250cm9s
LWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwKKworICAgICAgICBVcGRhdGUgUmVuZGVyVGhl
bWU6OmFkanVzdFN0eWxlIHRvIGRyb3AgYXBwZWFyYW5jZSBmb3Igbm9uLWZvcm0KKyAgICAgICAg
Y29udHJvbCBlbGVtZW50cyB3aGVuIHRoZXkgYXJlIHN0eWxlZCBieSB0aGUgYXV0aG9yLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlclRoZW1lOjphZGp1c3RBcHBlYXJhbmNlRm9yRWxlbWVudCBjb25zdCk6CisgICAgICAgIChX
ZWJDb3JlOjpSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyVGhlbWU6OmlzQ29udHJvbFN0eWxlZCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlclRoZW1lLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpib3JkZXJBbmRCYWNrZ3JvdW5kRXF1YWwg
Y29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorCiAyMDIy
LTAyLTIwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2
aWV3ZWQsIG5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzIGFmdGVyIDI0NzUwOEBtYWluCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAppbmRleCA5ODA3M2ZkMWUzYWZlMTkyNDgy
NzMyMWQxNDgwNjdlMzkzMTg3ZGNmLi41ODJhNjVjOTEzOGFmMGE5NzFlOWViNzgyYTBmZGNmMTdh
MWU4M2EzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTg0
LDEzICs4NCwxMiBAQCBSZW5kZXJUaGVtZTo6UmVuZGVyVGhlbWUoKQogewogfQogCi1Db250cm9s
UGFydCBSZW5kZXJUaGVtZTo6YWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQoUmVuZGVyU3R5bGUm
IHN0eWxlLCBjb25zdCBFbGVtZW50KiBlbGVtZW50KSBjb25zdAorQ29udHJvbFBhcnQgUmVuZGVy
VGhlbWU6OmFkanVzdEFwcGVhcmFuY2VGb3JFbGVtZW50KFJlbmRlclN0eWxlJiBzdHlsZSwgY29u
c3QgRWxlbWVudCogZWxlbWVudCwgQ29udHJvbFBhcnQgYXV0b0FwcGVhcmFuY2UpIGNvbnN0CiB7
CiAgICAgaWYgKCFlbGVtZW50KQogICAgICAgICByZXR1cm4gTm9Db250cm9sUGFydDsKIAogICAg
IENvbnRyb2xQYXJ0IHBhcnQgPSBzdHlsZS5lZmZlY3RpdmVBcHBlYXJhbmNlKCk7Ci0gICAgQ29u
dHJvbFBhcnQgYXV0b0FwcGVhcmFuY2UgPSBhdXRvQXBwZWFyYW5jZUZvckVsZW1lbnQoZWxlbWVu
dCk7CiAgICAgaWYgKHBhcnQgPT0gYXV0b0FwcGVhcmFuY2UpCiAgICAgICAgIHJldHVybiBwYXJ0
OwogCkBAIC0xMTMsNyArMTEyLDggQEAgQ29udHJvbFBhcnQgUmVuZGVyVGhlbWU6OmFkanVzdEFw
cGVhcmFuY2VGb3JFbGVtZW50KFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRWwKIAogdm9pZCBS
ZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50
KiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSogdXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKQog
ewotICAgIGF1dG8gcGFydCA9IGFkanVzdEFwcGVhcmFuY2VGb3JFbGVtZW50KHN0eWxlLCBlbGVt
ZW50KTsKKyAgICBDb250cm9sUGFydCBhdXRvQXBwZWFyYW5jZSA9IGF1dG9BcHBlYXJhbmNlRm9y
RWxlbWVudChlbGVtZW50KTsKKyAgICBhdXRvIHBhcnQgPSBhZGp1c3RBcHBlYXJhbmNlRm9yRWxl
bWVudChzdHlsZSwgZWxlbWVudCwgYXV0b0FwcGVhcmFuY2UpOwogCiAgICAgaWYgKHBhcnQgPT0g
Tm9Db250cm9sUGFydCkKICAgICAgICAgcmV0dXJuOwpAQCAtMTQwLDYgKzE0MCwxMSBAQCB2b2lk
IFJlbmRlclRoZW1lOjphZGp1c3RTdHlsZShSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEVsZW1l
bnQqIGVsZW1lbnQsIGNvbnN0CiAgICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZUFwcGVhcmFuY2Uo
cGFydCk7CiAgICAgfQogCisgICAgaWYgKCF1c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUKKyAgICAg
ICAgJiYgYXV0b0FwcGVhcmFuY2UgPT0gTm9Db250cm9sUGFydAorICAgICAgICAmJiAhc3R5bGUu
Ym9yZGVyQW5kQmFja2dyb3VuZEVxdWFsKFJlbmRlclN0eWxlOjpkZWZhdWx0U3R5bGUoKSkpCisg
ICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZUFwcGVhcmFuY2UoTm9Db250cm9sUGFydCk7CisKICAg
ICBpZiAoIXN0eWxlLmhhc0VmZmVjdGl2ZUFwcGVhcmFuY2UoKSkKICAgICAgICAgcmV0dXJuOwog
CkBAIC05MjMsOSArOTI4LDcgQEAgYm9vbCBSZW5kZXJUaGVtZTo6aXNDb250cm9sU3R5bGVkKGNv
bnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIHUKICAgICBjYXNlIFRl
eHRGaWVsZFBhcnQ6CiAgICAgY2FzZSBUZXh0QXJlYVBhcnQ6CiAgICAgICAgIC8vIFRlc3QgdGhl
IHN0eWxlIHRvIHNlZSBpZiB0aGUgVUEgYm9yZGVyIGFuZCBiYWNrZ3JvdW5kIG1hdGNoLgotICAg
ICAgICByZXR1cm4gc3R5bGUuYm9yZGVyKCkgIT0gdXNlckFnZW50U3R5bGUuYm9yZGVyKCkKLSAg
ICAgICAgICAgIHx8IHN0eWxlLmJhY2tncm91bmRMYXllcnMoKSAhPSB1c2VyQWdlbnRTdHlsZS5i
YWNrZ3JvdW5kTGF5ZXJzKCkKLSAgICAgICAgICAgIHx8ICFzdHlsZS5iYWNrZ3JvdW5kQ29sb3JF
cXVhbHNUb0NvbG9ySWdub3JpbmdWaXNpdGVkKHVzZXJBZ2VudFN0eWxlLmJhY2tncm91bmRDb2xv
cigpKTsKKyAgICAgICAgcmV0dXJuICFzdHlsZS5ib3JkZXJBbmRCYWNrZ3JvdW5kRXF1YWwodXNl
ckFnZW50U3R5bGUpOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaCBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCmluZGV4IDA0NDBiODYyYjIwN2I3
MGY5MTg5NTVmZjY4NmJkMWE2MzlkNWY5ZmYuLmFkNWRkOTQ3NGQyOTUxOGRlMjhkMWRkNzJhOGI2
NTQxMzg4OTQxZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU
aGVtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCkBAIC00
NTksNyArNDU5LDcgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIENvbnRyb2xQYXJ0IGF1
dG9BcHBlYXJhbmNlRm9yRWxlbWVudChjb25zdCBFbGVtZW50KikgY29uc3Q7Ci0gICAgQ29udHJv
bFBhcnQgYWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQoUmVuZGVyU3R5bGUmLCBjb25zdCBFbGVt
ZW50KikgY29uc3Q7CisgICAgQ29udHJvbFBhcnQgYWRqdXN0QXBwZWFyYW5jZUZvckVsZW1lbnQo
UmVuZGVyU3R5bGUmLCBjb25zdCBFbGVtZW50KiwgQ29udHJvbFBhcnQpIGNvbnN0OwogCiAgICAg
dm9pZCBhZGp1c3RTZWFyY2hGaWVsZERlY29yYXRpb25TdHlsZShSZW5kZXJTdHlsZSYsIGNvbnN0
IEVsZW1lbnQqKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L3N0eWxlL1JlbmRlclN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S
ZW5kZXJTdHlsZS5jcHAKaW5kZXggZThmNDRmNTIwZDc4NmU4YTZiNGUyOGEyYmVhMTg1OWU2Zjk3
OGY2Ny4uYTIzMDMyYjM0MjgwMmU0N2QyNzA1Y2IzNmI1MDc4NWZhMDNkOWFlNCAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCkBAIC00NDksNiAr
NDQ5LDEzIEBAIGJvb2wgUmVuZGVyU3R5bGU6OmRlc2NlbmRhbnRBZmZlY3RpbmdOb25Jbmhlcml0
ZWRQcm9wZXJ0aWVzRXF1YWwoY29uc3QgUmVuZGVyU3R5CiAgICAgICAgICYmIG1fcmFyZU5vbklu
aGVyaXRlZERhdGEtPmp1c3RpZnlJdGVtcyA9PSBvdGhlci5tX3JhcmVOb25Jbmhlcml0ZWREYXRh
LT5qdXN0aWZ5SXRlbXM7CiB9CiAKK2Jvb2wgUmVuZGVyU3R5bGU6OmJvcmRlckFuZEJhY2tncm91
bmRFcXVhbChjb25zdCBSZW5kZXJTdHlsZSYgb3RoZXIpIGNvbnN0Cit7CisgICAgcmV0dXJuIGJv
cmRlcigpID09IG90aGVyLmJvcmRlcigpCisgICAgICAgICYmIGJhY2tncm91bmRMYXllcnMoKSA9
PSBvdGhlci5iYWNrZ3JvdW5kTGF5ZXJzKCkKKyAgICAgICAgJiYgYmFja2dyb3VuZENvbG9yRXF1
YWxzVG9Db2xvcklnbm9yaW5nVmlzaXRlZChvdGhlci5iYWNrZ3JvdW5kQ29sb3IoKSk7Cit9CisK
ICNpZiBFTkFCTEUoVEVYVF9BVVRPU0laSU5HKQogCiBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGNv
bXB1dGVGb250SGFzaChjb25zdCBGb250Q2FzY2FkZSYgZm9udCkKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggMDE5ZTZlYzcyNGVjYTk5ZDU5Mjg5
MWUzMmYyMDRhOWQzYzAxZTMxYy4uM2IxNWU5NzNiOTAwYzBiNmQxNzRlYTk2Njg5MGE1MjEwYjJj
ZjViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0
eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgK
QEAgLTE5MTYsNiArMTkxNiw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldE9mZnNldFJvdGF0ZShP
ZmZzZXRSb3RhdGlvbiYmIHJvdGF0aW9uKSB7IFNFVF9WQVIobV9yYXJlTm9uSW5oZXJpdGVkRGF0
YSwgb2Zmc2V0Um90YXRlLCBXVEZNb3ZlKHJvdGF0aW9uKSk7IH0KICAgICBzdGF0aWMgT2Zmc2V0
Um90YXRpb24gaW5pdGlhbE9mZnNldFJvdGF0ZSgpIHsgcmV0dXJuIE9mZnNldFJvdGF0aW9uKHRy
dWUsIDApOyB9CiAKKyAgICBib29sIGJvcmRlckFuZEJhY2tncm91bmRFcXVhbChjb25zdCBSZW5k
ZXJTdHlsZSYpIGNvbnN0OworCiBwcml2YXRlOgogICAgIHN0cnVjdCBOb25Jbmhlcml0ZWRGbGFn
cyB7CiAgICAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBOb25Jbmhlcml0ZWRGbGFncyYpIGNv
bnN0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCmluZGV4IGJjZTQ0OTEyY2ViN2ExY2RkMjUzYzJlMzY5NjVkN2Q3MGUyYzRjMWUuLjBj
ZWVhN2IwYmM2MThmMDRmZTk4ZTA0OTE2ZmZkMGI2NzBmZjRhMjAgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
OCBAQAorMjAyMi0wMy0yMSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNv
bT4KKworICAgICAgICBuai5nb3Y6IEJhY2tncm91bmQgY29sb3IgaW5jb3JyZWN0IGZvciAnU3Rh
dGUgVmVoaWNsZXMnIHNlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIzODAzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ1NDM3OTU+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgQWRpdHlhIEtlZXJ0aGkuCisKKyAgICAgICAgKiBmYXN0L2Nz
cy9ub24tZm9ybS1jb250cm9sLWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLWV4cGVjdGVkLmh0bWw6
IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9w
LWFwcGVhcmFuY2UuaHRtbDogQWRkZWQuCisgICAgICAgICogZWRpdGluZy9kZWxldGluZy9pbnNl
cnQtaW4tb3JwaGFuZWQtc2VsZWN0aW9uLWNyYXNoLmh0bWw6IEFkZGVkLgorICAgICAgICBOb3cg
dGhhdCB3ZSBkcm9wIG5hdGl2ZSBzdHlsZSBmb3Igbm9uLWZvcm0gY29udHJvbCBlbGVtZW50cywg
d2UgbmVlZCB0bworICAgICAgICBhZGQgaGVpZ2h0IHRvIHRoZSBzdHlsZSB0byBtYWtlIHN1cmUg
dGhpcyB0YWJsZSBlbGVtZW50IGlzIHNlbGVjdGFibGUgYW5kCisgICAgICAgIHN1Y2Nlc3NmdWxs
eSB0ZXN0cyB3aGF0IGl0IG5lZWRzIHRvIHRlc3QuCisKIDIwMjItMDItMjAgIEpvbiBMZWUgIDxq
b25sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5nIGZvciBHUFUg
UHJvY2VzcyBib3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL2lu
c2VydC1pbi1vcnBoYW5lZC1zZWxlY3Rpb24tY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2VkaXRp
bmcvZGVsZXRpbmcvaW5zZXJ0LWluLW9ycGhhbmVkLXNlbGVjdGlvbi1jcmFzaC5odG1sCmluZGV4
IGE0ODY1ZmJhNjk3MGRlODU5MGI4Y2E1NmVmOTBiMjY1ZGEyMDBmZmQuLjQyMWY0YmE3OWFlZDA0
NjM3NjczYjMwNzNiNTAzNzk1NjQ2OWQ1MmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2VkaXRp
bmcvZGVsZXRpbmcvaW5zZXJ0LWluLW9ycGhhbmVkLXNlbGVjdGlvbi1jcmFzaC5odG1sCisrKyBi
L0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvaW5zZXJ0LWluLW9ycGhhbmVkLXNlbGVjdGlv
bi1jcmFzaC5odG1sCkBAIC0xLDUgKzEsNiBAQAogPHN0eWxlPgogICogeyAtd2Via2l0LWFwcGVh
cmFuY2U6ZGVmYXVsdC1idXR0b247IH0KKyB0ciB7IGhlaWdodDogMTBweDsgfQogPC9zdHlsZT4K
IDxzY3JpcHQ+CiBpZiAod2luZG93LnRlc3RSdW5uZXIpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9mYXN0L2Nzcy9ub24tZm9ybS1jb250cm9sLWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLWV4cGVj
dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9ub24tZm9ybS1jb250cm9sLWVsZW1lbnQt
ZHJvcC1hcHBlYXJhbmNlLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOWUzNTA1Y2FiODdlMjRk
ZmJlNjE1Yjk4ZTgwZDljZWE5NzEyZjA4ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxlbWVudC1kcm9wLWFwcGVhcmFuY2UtZXhwZWN0
ZWQuaHRtbApAQCAtMCwwICsxLDMgQEAKKzxkaXYgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IGdy
ZWVuIj5QQVNTIGlmIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIGlzIGdyZWVuPC9kaXY+Cis8ZGl2IHN0
eWxlPSJib3JkZXI6IGRvdHRlZCI+UEFTUyBpZiB0aGUgYm9yZGVyIGlzIGRvdHRlZDwvZGl2Pgor
PGRpdiBzdHlsZT0iYmFja2dyb3VuZC1pbWFnZTogdXJsKCcuLi9ib2R5LXByb3BhZ2F0aW9uL2Jh
Y2tncm91bmQtaW1hZ2UvcmVzb3VyY2VzL2xpbWUucG5nJykiPlBBU1MgaWYgdGhlcmUgaXMgYSBi
YWNrZ3JvdW5kIGltYWdlPC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9u
b24tZm9ybS1jb250cm9sLWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwgYi9MYXlvdXRUZXN0
cy9mYXN0L2Nzcy9ub24tZm9ybS1jb250cm9sLWVsZW1lbnQtZHJvcC1hcHBlYXJhbmNlLmh0bWwK
bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMC4uYTY5YWJkYzVjMWNkNjNhNmNmN2FkYjA1OTRjMzkxNzkxMzZiY2IzMwotLS0g
L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25vbi1mb3JtLWNvbnRyb2wtZWxl
bWVudC1kcm9wLWFwcGVhcmFuY2UuaHRtbApAQCAtMCwwICsxLDIwIEBACis8c3R5bGU+CisuYmFj
a2dyb3VuZENvbG9yQ2xhc3MgeworICBhcHBlYXJhbmNlOiBidXR0b247CisgIGJhY2tncm91bmQt
Y29sb3I6IGdyZWVuOworfQorCisuYm9yZGVyQ2xhc3MgeworICBhcHBlYXJhbmNlOiBidXR0b247
CisgIGJvcmRlci1zdHlsZTogZG90dGVkOworfQorCisuYmFja2dyb3VuZEltYWdlQ2xhc3Mgewor
ICBhcHBlYXJhbmNlOiBidXR0b247CisgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgnLi4vYm9keS1w
cm9wYWdhdGlvbi9iYWNrZ3JvdW5kLWltYWdlL3Jlc291cmNlcy9saW1lLnBuZycpOworfQorCis8
L3N0eWxlPgorPGRpdiBjbGFzcz0iYmFja2dyb3VuZENvbG9yQ2xhc3MiPlBBU1MgaWYgdGhlIGJh
Y2tncm91bmQgY29sb3IgaXMgZ3JlZW48L2Rpdj4KKzxkaXYgY2xhc3M9ImJvcmRlckNsYXNzIj5Q
QVNTIGlmIHRoZSBib3JkZXIgaXMgZG90dGVkPC9kaXY+Cis8ZGl2IGNsYXNzPSJiYWNrZ3JvdW5k
SW1hZ2VDbGFzcyI+UEFTUyBpZiB0aGVyZSBpcyBhIGJhY2tncm91bmQgaW1hZ2U8L2Rpdj4K
</data>

          </attachment>
      

    </bug>

</bugzilla>