<?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>224030</bug_id>
          
          <creation_ts>2021-03-31 17:36:29 -0700</creation_ts>
          <short_desc>Clear network website data when a user clears history/website data</short_desc>
          <delta_ts>2021-04-02 14:35:46 -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>WebKit Misc.</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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Kate Cheney">katherine_cheney</reporter>
          <assigned_to name="Kate Cheney">katherine_cheney</assigned_to>
          <cc>achristensen</cc>
    
    <cc>benjamin</cc>
    
    <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ddkilzer</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>sam</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1745869</commentid>
    <comment_count>0</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-03-31 17:36:29 -0700</bug_when>
    <thetext>We should clear network website data when a user clears history/website data</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745870</commentid>
    <comment_count>1</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-03-31 17:36:45 -0700</bug_when>
    <thetext>&lt;rdar://problem/75288338&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745883</commentid>
    <comment_count>2</comment_count>
      <attachid>424851</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-03-31 18:01:19 -0700</bug_when>
    <thetext>Created attachment 424851
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1745923</commentid>
    <comment_count>3</comment_count>
      <attachid>424851</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-03-31 19:24:15 -0700</bug_when>
    <thetext>Comment on attachment 424851
Patch

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

r=me, but please double-check with David for the SOFT_LINK stuff.

&gt; Source/WTF/wtf/cocoa/SoftLinking.h:120
&gt; +#define SOFT_LINK_PRIVATE_FRAMEWORK_IN_UMBRELLA(umbrella, framework) \

I&apos;d suggest getting David&apos;s r+ on this. I can never remember when you need the _SOURCE version of these macros. Looks good to me though.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746161</commentid>
    <comment_count>4</comment_count>
      <attachid>424851</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-04-01 12:11:01 -0700</bug_when>
    <thetext>Comment on attachment 424851
Patch

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

r=me

&gt;&gt; Source/WTF/wtf/cocoa/SoftLinking.h:120
&gt;&gt; +#define SOFT_LINK_PRIVATE_FRAMEWORK_IN_UMBRELLA(umbrella, framework) \
&gt; 
&gt; I&apos;d suggest getting David&apos;s r+ on this. I can never remember when you need the _SOURCE version of these macros. Looks good to me though.

This is correct.  The _SOURCE and _HEADER variants are only needed if you&apos;re creating a single source/header for all the soft-linked items (which we aren&apos;t doing here because it&apos;s the first time we&apos;re soft-linking these frameworks).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746327</commentid>
    <comment_count>5</comment_count>
      <attachid>424963</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-04-01 17:04:49 -0700</bug_when>
    <thetext>Created attachment 424963
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746328</commentid>
    <comment_count>6</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-04-01 17:06:09 -0700</bug_when>
    <thetext>(In reply to katherine_cheney from comment #5)
&gt; Created attachment 424963 [details]
&gt; Patch

Updated this based on an offline conversation to handle the soft-link case where the framework isn&apos;t available. Dave, could you take another look?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746330</commentid>
    <comment_count>7</comment_count>
      <attachid>424963</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2021-04-01 17:08:18 -0700</bug_when>
    <thetext>Comment on attachment 424963
Patch

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

&gt; Source/WebKit/NetworkProcess/NetworkProcess.cpp:1617
&gt; +#if PLATFORM(COCOA)
&gt; +    if (auto* networkSession = this-&gt;networkSession(sessionID))
&gt; +        networkSession-&gt;removeNetworkWebsiteData(modifiedSince, [clearTasksHandler] { });
&gt; +#endif

Since networkSession is already specialized for ports, I would suggest removing the #ifdefs here, and just making the default implementation of NetworkSession::removeNetworkWebsiteData() do nothing, allowing ports to implement as they see fit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746331</commentid>
    <comment_count>8</comment_count>
    <who name="Sam Weinig">sam</who>
    <bug_when>2021-04-01 17:10:08 -0700</bug_when>
    <thetext>Please do try not add #if PLATFORM(COCOA) in shared code if you can avoid it at all. 

And if you really do need to add an #ifdef in shared code, please use a more specific HAVE(), USE() or ENABLE() macro to make it clear what you are conditionalizing on.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746332</commentid>
    <comment_count>9</comment_count>
      <attachid>424963</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2021-04-01 17:10:50 -0700</bug_when>
    <thetext>Comment on attachment 424963
Patch

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

&gt; Source/WebKit/ChangeLog:10
&gt; +        Clear network-related website data for domains when clearing history/
&gt; +        website data.

Please add a test for this new functionality or explain why no test is feasible in this case.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746339</commentid>
    <comment_count>10</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-04-01 17:34:37 -0700</bug_when>
    <thetext>(In reply to Sam Weinig from comment #7)
&gt; Comment on attachment 424963 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=424963&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/NetworkProcess/NetworkProcess.cpp:1617
&gt; &gt; +#if PLATFORM(COCOA)
&gt; &gt; +    if (auto* networkSession = this-&gt;networkSession(sessionID))
&gt; &gt; +        networkSession-&gt;removeNetworkWebsiteData(modifiedSince, [clearTasksHandler] { });
&gt; &gt; +#endif
&gt; 
&gt; Since networkSession is already specialized for ports, I would suggest
&gt; removing the #ifdefs here, and just making the default implementation of
&gt; NetworkSession::removeNetworkWebsiteData() do nothing, allowing ports to
&gt; implement as they see fit.

okay.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746340</commentid>
    <comment_count>11</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-04-01 17:34:45 -0700</bug_when>
    <thetext>(In reply to Sam Weinig from comment #9)
&gt; Comment on attachment 424963 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=424963&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/ChangeLog:10
&gt; &gt; +        Clear network-related website data for domains when clearing history/
&gt; &gt; +        website data.
&gt; 
&gt; Please add a test for this new functionality or explain why no test is
&gt; feasible in this case.

Will fix.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746341</commentid>
    <comment_count>12</comment_count>
      <attachid>424968</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-04-01 17:37:07 -0700</bug_when>
    <thetext>Created attachment 424968
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746354</commentid>
    <comment_count>13</comment_count>
      <attachid>424968</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-04-01 18:43:25 -0700</bug_when>
    <thetext>Comment on attachment 424968
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746376</commentid>
    <comment_count>14</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-01 20:19:45 -0700</bug_when>
    <thetext>Committed r275401: &lt;https://commits.webkit.org/r275401&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 424968.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1746676</commentid>
    <comment_count>15</comment_count>
    <who name="Sam Weinig">sam</who>
    <bug_when>2021-04-02 14:35:46 -0700</bug_when>
    <thetext>(In reply to katherine_cheney from comment #11)
&gt; (In reply to Sam Weinig from comment #9)
&gt; &gt; Comment on attachment 424963 [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; View in context:
&gt; &gt; https://bugs.webkit.org/attachment.cgi?id=424963&amp;action=review
&gt; &gt; 
&gt; &gt; &gt; Source/WebKit/ChangeLog:10
&gt; &gt; &gt; +        Clear network-related website data for domains when clearing history/
&gt; &gt; &gt; +        website data.
&gt; &gt; 
&gt; &gt; Please add a test for this new functionality or explain why no test is
&gt; &gt; feasible in this case.
&gt; 
&gt; Will fix.

Thanks.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>424851</attachid>
            <date>2021-03-31 18:01:19 -0700</date>
            <delta_ts>2021-04-01 17:04:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224030-20210331180118.patch</filename>
            <type>text/plain</type>
            <size>6893</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGY0NWRiNmMwNjEzYjg3ZWEyY2FiMjRi
ZDNiNDNkMGZhNTdjZTlmNjQuLjUzNTFlMGY5N2ViY2Q4OWYwYTcyMzk4MTE1MDYxY2RkNjNkNzE0
ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDMtMzEgIEthdGUgQ2hlbmV5ICA8a2F0aGVy
aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgbmV0d29yayB3ZWJzaXRlIGRh
dGEgd2hlbiBhIHVzZXIgY2xlYXJzIGhpc3Rvcnkvd2Vic2l0ZSBkYXRhCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQwMzAKKyAgICAgICAgPHJkYXI6
Ly9wcm9ibGVtLzc1Mjg4MzM4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgICogd3RmL2NvY29hL1NvZnRMaW5raW5nLmg6CisgICAgICAgIEFkZCBhIG5l
dyBzb2Z0IGxpbmsgbWFjcm8gdG8gbGluayB1bWJyZWxsYSBwcml2YXRlIGZyYW1ld29ya3MuIFdl
IG5lZWQKKyAgICAgICAgdGhpcyB0byBzdXBwb3J0IGludGVybmFsIGFkZGl0aW9ucyB3ZSBuZWVk
IHRvIGNsZWFyIG5ldHdvcmsgZG9tYWluIGRhdGEuCisKIDIwMjEtMDMtMjggIENhbWVyb24gTWND
b3JtYWNrICA8aGV5Y2FtQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgQXNwZWN0UmF0aW9P
ZkltZ0Zyb21XaWR0aEFuZEhlaWdodEVuYWJsZWQgZm9yIFdlYktpdExlZ2FjeS4KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5k
ZXggMDBmMWViODZmYjk1MGZmNTZlOGE3MjYwMzhmZTEwMTNkNThiZGRlNi4uNTdlNTdjZGE3M2Ni
NzJkMzU4MWE0OWU0ZmQ0YjkxODlmYzJmZmVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D
aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAor
MjAyMS0wMy0zMSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KKwor
ICAgICAgICBDbGVhciBuZXR3b3JrIHdlYnNpdGUgZGF0YSB3aGVuIGEgdXNlciBjbGVhcnMgaGlz
dG9yeS93ZWJzaXRlIGRhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIyNDAzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzUyODgzMzg+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYXIgbmV0d29y
ay1yZWxhdGVkIHdlYnNpdGUgZGF0YSBmb3IgZG9tYWlucyB3aGVuIGNsZWFyaW5nIGhpc3Rvcnkv
CisgICAgICAgIHdlYnNpdGUgZGF0YS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv
cmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdl
YnNpdGVEYXRhKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgor
ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbjo6cmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRh
KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6
CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToK
KyAgICAgICAgKE5ldHdvcmtTZXNzaW9uQ29jb2E6OnJlbW92ZU5ldHdvcmtXZWJzaXRlRGF0YSk6
CisgICAgICAgICogU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50cy5zaDoKKwogMjAyMS0wMy0y
OCAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFBy
b2Nlc3NdIERvbid0IGV2ZXIgcmVwbGF5IERpc3BsYXlMaXN0IGl0ZW1zIG9mIGEgUmVtb3RlSW1h
Z2VCdWZmZXIgaW4gV2ViUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvY29jb2Ev
U29mdExpbmtpbmcuaCBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL1NvZnRMaW5raW5nLmgKaW5kZXgg
NzRjNzAyNmQyYjNhOWVhNWE4ODFhMDc3NTJkZDVhMzk3YWIyYjBhZC4uOTUxNmQzZThkODdkNmM1
NTM3ZTQ2MDE2YTFmZDRlZDg0ODI5MzlhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvY29j
b2EvU29mdExpbmtpbmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9Tb2Z0TGlua2luZy5o
CkBAIC0xMTcsNiArMTE3LDE3IEBAIHN0YXRpYyB2b2lkKiBsaWIjI0xpYnJhcnkoKSBcCiAgICAg
ICAgIHJldHVybiBmcmFtZXdvcmtMaWJyYXJ5OyBcCiAgICAgfQogCisjZGVmaW5lIFNPRlRfTElO
S19QUklWQVRFX0ZSQU1FV09SS19JTl9VTUJSRUxMQSh1bWJyZWxsYSwgZnJhbWV3b3JrKSBcCisg
ICAgc3RhdGljIHZvaWQqIGZyYW1ld29yayMjTGlicmFyeSgpIFwKKyAgICB7IFwKKyAgICAgICAg
c3RhdGljIHZvaWQqIGZyYW1ld29ya0xpYnJhcnkgPSBeeyBcCisgICAgICAgICAgICB2b2lkKiBy
ZXN1bHQgPSBkbG9wZW4oIi9TeXN0ZW0vTGlicmFyeS9Qcml2YXRlRnJhbWV3b3Jrcy8iICN1bWJy
ZWxsYSAiLmZyYW1ld29yay9GcmFtZXdvcmtzLyIgI2ZyYW1ld29yayAiLmZyYW1ld29yay8iICNm
cmFtZXdvcmssIFJUTERfTk9XKTsgXAorICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9N
RVNTQUdFKHJlc3VsdCwgIiVzIiwgZGxlcnJvcigpKTsgXAorICAgICAgICAgICAgcmV0dXJuIHJl
c3VsdDsgXAorICAgICAgICB9KCk7IFwKKyAgICAgICAgcmV0dXJuIGZyYW1ld29ya0xpYnJhcnk7
IFwKKyAgICB9CisKICNkZWZpbmUgU09GVF9MSU5LKGZyYW1ld29yaywgZnVuY3Rpb25OYW1lLCBy
ZXN1bHRUeXBlLCBwYXJhbWV0ZXJEZWNsYXJhdGlvbnMsIHBhcmFtZXRlck5hbWVzKSBcCiAgICAg
V1RGX0VYVEVSTl9DX0JFR0lOIFwKICAgICByZXN1bHRUeXBlIGZ1bmN0aW9uTmFtZSBwYXJhbWV0
ZXJEZWNsYXJhdGlvbnM7IFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3
b3JrUHJvY2Vzcy5jcHAKaW5kZXggOWVjYWJiMzhiYTIzM2VlZGU3MmMwOGYxZmJhOWY4MzcyMDVk
ZTk5OC4uOTBhYjJhMDcxY2ExMDJlZWY0YTJjMDdlMGQzM2QzMzNlMmE5MWNkOSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIv
U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTE2MTEs
NiArMTYxMSwxMSBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpkZWxldGVXZWJzaXRlRGF0YShQQUw6
OlNlc3Npb25JRCBzZXNzaW9uSUQsIE9wdGlvblNldDxXZWJzaQogICAgIH0KICNlbmRpZgogCisj
aWYgUExBVEZPUk0oQ09DT0EpCisgICAgaWYgKGF1dG8qIG5ldHdvcmtTZXNzaW9uID0gdGhpcy0+
bmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKSkKKyAgICAgICAgbmV0d29ya1Nlc3Npb24tPnJlbW92
ZU5ldHdvcmtXZWJzaXRlRGF0YShtb2RpZmllZFNpbmNlLCBbY2xlYXJUYXNrc0hhbmRsZXJdIHsg
fSk7CisjZW5kaWYKKwogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVE
YXRhVHlwZTo6RGlza0NhY2hlKSAmJiAhc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkpCiAgICAgICAg
IGNsZWFyRGlza0NhY2hlKG1vZGlmaWVkU2luY2UsIFtjbGVhclRhc2tzSGFuZGxlciA9IFdURk1v
dmUoY2xlYXJUYXNrc0hhbmRsZXIpXSB7IH0pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0
L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ
cm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKaW5kZXggZTM5MmU5NjE3YzIxNzhmYTQzZGFiZmJlNzg0
ZmVmNTIzZjY3MGY0MS4uYzY5YWNlNGNlOTk2MTBhY2UyYjNjOWM5MDFlOGM1ZTdkY2ZkZjY1NCAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5o
CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaApAQCAt
MTYyLDYgKzE2MiwxMCBAQCBwdWJsaWM6CiAgICAgQXBwQm91bmROYXZpZ2F0aW9uVGVzdGluZ0Rh
dGEmIGFwcEJvdW5kTmF2aWdhdGlvblRlc3RpbmdEYXRhKCkgeyByZXR1cm4gbV9hcHBCb3VuZE5h
dmlnYXRpb25UZXN0aW5nRGF0YTsgfQogI2VuZGlmCiAgICAgCisjaWYgUExBVEZPUk0oQ09DT0Ep
CisgICAgdmlydHVhbCB2b2lkIHJlbW92ZU5ldHdvcmtXZWJzaXRlRGF0YShXYWxsVGltZSwgQ29t
cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKSB7IGNvbXBsZXRpb25I
YW5kbGVyKCk7IH0KKyNlbmRpZgorCiBwcm90ZWN0ZWQ6CiAgICAgTmV0d29ya1Nlc3Npb24oTmV0
d29ya1Byb2Nlc3MmLCBjb25zdCBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycyYpOwog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtT
ZXNzaW9uQ29jb2EuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y
a1Nlc3Npb25Db2NvYS5oCmluZGV4IDFhY2RkMjcxNGY1YzY3MzEyZTNjYjIxOTc1YTNhYjQ4MDNm
MzBkZDQuLmI0MGRmNjMxZjRiNzcwM2IyNDhmMWU3OTc3YzI5NDNiMGJhYmI0NzQgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2Nv
YS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np
b25Db2NvYS5oCkBAIC0xMDYsNiArMTA2LDggQEAgcHVibGljOgogICAgIAogICAgIF9OU0hTVFNT
dG9yYWdlICpoc3RzU3RvcmFnZSgpIGNvbnN0OwogCisgICAgdm9pZCByZW1vdmVOZXR3b3JrV2Vi
c2l0ZURhdGEoV2FsbFRpbWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJikgb3ZlcnJpZGU7
CisKIHByaXZhdGU6CiAgICAgdm9pZCBpbnZhbGlkYXRlQW5kQ2FuY2VsKCkgb3ZlcnJpZGU7CiAg
ICAgdm9pZCBjbGVhckNyZWRlbnRpYWxzKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5k
ZXggMjRhNDJkZjMxMTkwM2Q4YjY2MWIyODg0ZjBlMDZhNjBjNDExYmY3OC4uOGFiNTUwM2VhYjI1
ZjdiMjQzOTZlZWI2ZGRlNTNjNWVjOWQxOWY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O
ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtNjUs
NiArNjUsNyBAQAogI2Vsc2UKICNkZWZpbmUgTkVUV09SS19TRVNTSU9OX0NPQ09BX0FERElUSU9O
U18xCiAjZGVmaW5lIE5FVFdPUktfU0VTU0lPTl9DT0NPQV9IVFRQX1JFRElSRUNUX0FERElUSU9O
Uwordm9pZCBXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6OnJlbW92ZU5ldHdvcmtXZWJzaXRl
RGF0YShXYWxsVGltZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5k
bGVyKSB7IGNvbXBsZXRpb25IYW5kbGVyKCk7IH0KICNlbmRpZgogCiAjaW1wb3J0ICJEZXZpY2VN
YW5hZ2VtZW50U29mdExpbmsuaCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9w
cm9jZXNzLWVudGl0bGVtZW50cy5zaCBiL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9wcm9jZXNzLWVu
dGl0bGVtZW50cy5zaAppbmRleCA0Mjg2YTE0YWJhNjJhZGQ4ZjZkMTI4YWVmNmRjYjRmYWIyYmJi
ODI1Li41N2Y5NmI5ZGY1YzgzMDdiOTFmMTA2ZTE2Yzc4NjM0YjM2OWIxM2E2IDEwMDc1NQotLS0g
YS9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvcHJvY2Vzcy1lbnRpdGxlbWVudHMuc2gKKysrIGIvU291
cmNlL1dlYktpdC9TY3JpcHRzL3Byb2Nlc3MtZW50aXRsZW1lbnRzLnNoCkBAIC05OCw2ICs5OCw3
IEBAIGZ1bmN0aW9uIG1hY19wcm9jZXNzX25ldHdvcmtfZW50aXRsZW1lbnRzKCkKICAgICAgICAg
cGxpc3RidWRkeSBBZGQgOmNvbS5hcHBsZS5wcml2YXRlLmxhdW5jaHNlcnZpY2VzLmFsbG93ZWR0
b2NoYW5nZXRoZXNla2V5c2lub3RoZXJhcHBsaWNhdGlvbnM6MSBzdHJpbmcgTFNEaXNwbGF5TmFt
ZQogICAgICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxlLnByaXZhdGUud2Via2l0LnVzZS14
cGMtZW5kcG9pbnQgYm9vbCBZRVMKICAgICAgICAgcGxpc3RidWRkeSBBZGQgOmNvbS5hcHBsZS5y
b290bGVzcy5zdG9yYWdlLldlYktpdE5ldHdvcmtpbmdTYW5kYm94IGJvb2wgWUVTCisgICAgICAg
IHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUuc3ltcHRvbV9hbmFseXRpY3MuY29uZmlndXJlIGJv
b2wgWUVTCiAgICAgZmkKIH0KIApAQCAtMzEzLDYgKzMxNCw3IEBAIGZ1bmN0aW9uIGlvc19mYW1p
bHlfcHJvY2Vzc19uZXR3b3JrX2VudGl0bGVtZW50cygpCiAKICAgICBwbGlzdGJ1ZGR5IEFkZCA6
c2VhdGJlbHQtcHJvZmlsZXMgYXJyYXkKICAgICBwbGlzdGJ1ZGR5IEFkZCA6c2VhdGJlbHQtcHJv
ZmlsZXM6MCBzdHJpbmcgY29tLmFwcGxlLldlYktpdC5OZXR3b3JraW5nCisgICAgcGxpc3RidWRk
eSBBZGQgOmNvbS5hcHBsZS5zeW1wdG9tX2FuYWx5dGljcy5jb25maWd1cmUgYm9vbCBZRVMKIH0K
IAogZnVuY3Rpb24gaW9zX2ZhbWlseV9wcm9jZXNzX3BsdWdpbl9lbnRpdGxlbWVudHMoKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>424963</attachid>
            <date>2021-04-01 17:04:49 -0700</date>
            <delta_ts>2021-04-01 17:37:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224030-20210401170448.patch</filename>
            <type>text/plain</type>
            <size>6921</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDdhZTYzNjk4ZDg1YjBlMTIyNjc1Yzgy
ODQ1ODc0NWE1YzVmNTY5Y2QuLmE0NGZlM2VmZDYwZWQxNWJiMDhkMDFjOWM1YTM2ZjA4ZGIxZDI5
Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDMtMzEgIEthdGUgQ2hlbmV5ICA8a2F0aGVy
aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgbmV0d29yayB3ZWJzaXRlIGRh
dGEgd2hlbiBhIHVzZXIgY2xlYXJzIGhpc3Rvcnkvd2Vic2l0ZSBkYXRhCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQwMzAKKyAgICAgICAgPHJkYXI6
Ly9wcm9ibGVtLzc1Mjg4MzM4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgICogd3RmL2NvY29hL1NvZnRMaW5raW5nLmg6CisgICAgICAgIEFkZCBhIG5l
dyBzb2Z0IGxpbmsgbWFjcm8gdG8gbGluayB1bWJyZWxsYSBwcml2YXRlIGZyYW1ld29ya3MuIFdl
IG5lZWQKKyAgICAgICAgdGhpcyB0byBzdXBwb3J0IGludGVybmFsIGFkZGl0aW9ucyB3ZSBuZWVk
IHRvIGNsZWFyIG5ldHdvcmsgZG9tYWluIGRhdGEuCisKIDIwMjEtMDMtMzEgIFNhbSBXZWluaWcg
IDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIEVhc2UgZXhwZXJpbWVudGF0aW9uIGJ5IGVu
YWJsaW5nIDxtb2RlbD4gaWYgU0VQQVJBVEVEX01PREVMIGlzIGJlaW5nIHVzZWQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5k
ZXggYTk3YTYxOGQ5NDk2MDNjODRiN2VjOWRjN2JhYzVhNzAyMzlkYTcyYS4uZmYwNTVhZGRjYjMw
MTFkM2YwYjM4NzkzODM1MmQ2N2QyYjk0MTU2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D
aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAor
MjAyMS0wMy0zMSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KKwor
ICAgICAgICBDbGVhciBuZXR3b3JrIHdlYnNpdGUgZGF0YSB3aGVuIGEgdXNlciBjbGVhcnMgaGlz
dG9yeS93ZWJzaXRlIGRhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIyNDAzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzUyODgzMzg+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYXIgbmV0d29y
ay1yZWxhdGVkIHdlYnNpdGUgZGF0YSBmb3IgZG9tYWlucyB3aGVuIGNsZWFyaW5nIGhpc3Rvcnkv
CisgICAgICAgIHdlYnNpdGUgZGF0YS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv
cmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdl
YnNpdGVEYXRhKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgor
ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbjo6cmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRh
KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6
CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToK
KyAgICAgICAgKE5ldHdvcmtTZXNzaW9uQ29jb2E6OnJlbW92ZU5ldHdvcmtXZWJzaXRlRGF0YSk6
CisgICAgICAgICogU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50cy5zaDoKKwogMjAyMS0wNC0w
MSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5y
ZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzUzNTAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9j
b2NvYS9Tb2Z0TGlua2luZy5oIGIvU291cmNlL1dURi93dGYvY29jb2EvU29mdExpbmtpbmcuaApp
bmRleCA3NGM3MDI2ZDJiM2E5ZWE1YTg4MWEwNzc1MmRkNWEzOTdhYjJiMGFkLi5iYWU4YmNkOTcy
ZTA0M2EwYmY4Y2U3MzAyNGY1NWFlNzFlNThjZDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0
Zi9jb2NvYS9Tb2Z0TGlua2luZy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL1NvZnRMaW5r
aW5nLmgKQEAgLTExNyw2ICsxMTcsMTMgQEAgc3RhdGljIHZvaWQqIGxpYiMjTGlicmFyeSgpIFwK
ICAgICAgICAgcmV0dXJuIGZyYW1ld29ya0xpYnJhcnk7IFwKICAgICB9CiAKKyNkZWZpbmUgU09G
VF9MSU5LX1BSSVZBVEVfRlJBTUVXT1JLX0lOX1VNQlJFTExBX09QVElPTkFMKHVtYnJlbGxhLCBm
cmFtZXdvcmspIFwKKyAgICBzdGF0aWMgdm9pZCogZnJhbWV3b3JrIyNMaWJyYXJ5KCkgXAorICAg
IHsgXAorICAgICAgICBzdGF0aWMgdm9pZCogZnJhbWV3b3JrTGlicmFyeSA9IGRsb3BlbigiL1N5
c3RlbS9MaWJyYXJ5L1ByaXZhdGVGcmFtZXdvcmtzLyIgI3VtYnJlbGxhICIuZnJhbWV3b3JrL0Zy
YW1ld29ya3MvIiAjZnJhbWV3b3JrICIuZnJhbWV3b3JrLyIgI2ZyYW1ld29yaywgUlRMRF9OT1cp
OyBcCisgICAgICAgIHJldHVybiBmcmFtZXdvcmtMaWJyYXJ5OyBcCisgICAgfQorCiAjZGVmaW5l
IFNPRlRfTElOSyhmcmFtZXdvcmssIGZ1bmN0aW9uTmFtZSwgcmVzdWx0VHlwZSwgcGFyYW1ldGVy
RGVjbGFyYXRpb25zLCBwYXJhbWV0ZXJOYW1lcykgXAogICAgIFdURl9FWFRFUk5fQ19CRUdJTiBc
CiAgICAgcmVzdWx0VHlwZSBmdW5jdGlvbk5hbWUgcGFyYW1ldGVyRGVjbGFyYXRpb25zOyBcCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNw
cCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4
IGEwYWEwMGE2MWMxMWE2MDAzNGQyMDA4MjNmMTFiMmRhNWQxODhhMzIuLmJjM2Q2NTE0OTI2YTZj
YjY2ZmNjZWI4NWY2M2U5ODM5NWEyNjY2YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0
d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y
a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0xNjExLDYgKzE2MTEsMTEgQEAgdm9pZCBO
ZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklE
LCBPcHRpb25TZXQ8V2Vic2kKICAgICB9CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKENPQ09BKQor
ICAgIGlmIChhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IHRoaXMtPm5ldHdvcmtTZXNzaW9uKHNlc3Np
b25JRCkpCisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5yZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEo
bW9kaWZpZWRTaW5jZSwgW2NsZWFyVGFza3NIYW5kbGVyXSB7IH0pOworI2VuZGlmCisKICAgICBp
ZiAod2Vic2l0ZURhdGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6OkRpc2tDYWNoZSkg
JiYgIXNlc3Npb25JRC5pc0VwaGVtZXJhbCgpKQogICAgICAgICBjbGVhckRpc2tDYWNoZShtb2Rp
ZmllZFNpbmNlLCBbY2xlYXJUYXNrc0hhbmRsZXIgPSBXVEZNb3ZlKGNsZWFyVGFza3NIYW5kbGVy
KV0geyB9KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3
b3JrU2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lv
bi5oCmluZGV4IDllYTY5YmUxODM4Yzg2NmZhZGYzMWJiY2U3NzQ1OGYxYTIyODA4OTYuLjMxMGZm
ZGVmZjE2OWQ0MmM3ZTE5MzkxMjI2MzljNzFkMWNjZGUyOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0
L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKQEAgLTE2Niw2ICsxNjYsMTAgQEAgcHVi
bGljOgogICAgIHZvaWQgYWRkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyKHN0
ZDo6dW5pcXVlX3B0cjxQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdvcmtMb2FkZXI+JiYgbG9h
ZGVyKSB7IG1fcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVycy5hZGQoV1RGTW92
ZShsb2FkZXIpKTsgfQogICAgIHZvaWQgcmVtb3ZlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3
b3JrTG9hZGVyKFByaXZhdGVDbGlja01lYXN1cmVtZW50TmV0d29ya0xvYWRlciogbG9hZGVyKSB7
IG1fcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVycy5yZW1vdmUobG9hZGVyKTsg
fQogICAgIAorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIHZpcnR1YWwgdm9pZCByZW1vdmVOZXR3
b3JrV2Vic2l0ZURhdGEoV2FsbFRpbWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21w
bGV0aW9uSGFuZGxlcikgeyBjb21wbGV0aW9uSGFuZGxlcigpOyB9CisjZW5kaWYKKwogcHJvdGVj
dGVkOgogICAgIE5ldHdvcmtTZXNzaW9uKE5ldHdvcmtQcm9jZXNzJiwgY29uc3QgTmV0d29ya1Nl
c3Npb25DcmVhdGlvblBhcmFtZXRlcnMmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O
ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmggYi9Tb3VyY2UvV2ViS2l0
L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaAppbmRleCAxYWNkZDI3
MTRmNWM2NzMxMmUzY2IyMTk3NWEzYWI0ODAzZjMwZGQ0Li5iNDBkZjYzMWY0Yjc3MDNiMjQ4ZjFl
Nzk3N2MyOTQzYjBiYWJiNDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j
ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdv
cmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaApAQCAtMTA2LDYgKzEwNiw4IEBA
IHB1YmxpYzoKICAgICAKICAgICBfTlNIU1RTU3RvcmFnZSAqaHN0c1N0b3JhZ2UoKSBjb25zdDsK
IAorICAgIHZvaWQgcmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRhKFdhbGxUaW1lLCBDb21wbGV0aW9u
SGFuZGxlcjx2b2lkKCk+JiYpIG92ZXJyaWRlOworCiBwcml2YXRlOgogICAgIHZvaWQgaW52YWxp
ZGF0ZUFuZENhbmNlbCgpIG92ZXJyaWRlOwogICAgIHZvaWQgY2xlYXJDcmVkZW50aWFscygpIG92
ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O
ZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2Nv
YS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmluZGV4IDg5OGE3ZDNjZDY1YTE1ZGU0YjYzMGQ3OGJl
NDUxZTNmZmIxNDQwYTIuLjJkZTI5ZDViMTBlOWFmN2IzNTAwOWI5N2M5Y2U3ZGM0ZDMyOTU1ZWQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nl
c3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05l
dHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTY1LDYgKzY1LDcgQEAKICNlbHNlCiAjZGVmaW5lIE5F
VFdPUktfU0VTU0lPTl9DT0NPQV9BRERJVElPTlNfMQogI2RlZmluZSBORVRXT1JLX1NFU1NJT05f
Q09DT0FfSFRUUF9SRURJUkVDVF9BRERJVElPTlMKK3ZvaWQgV2ViS2l0OjpOZXR3b3JrU2Vzc2lv
bkNvY29hOjpyZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEoV2FsbFRpbWUsIENvbXBsZXRpb25IYW5k
bGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgeyBjb21wbGV0aW9uSGFuZGxlcigpOyB9
CiAjZW5kaWYKIAogI2ltcG9ydCAiRGV2aWNlTWFuYWdlbWVudFNvZnRMaW5rLmgiCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvcHJvY2Vzcy1lbnRpdGxlbWVudHMuc2ggYi9Tb3Vy
Y2UvV2ViS2l0L1NjcmlwdHMvcHJvY2Vzcy1lbnRpdGxlbWVudHMuc2gKaW5kZXggNDI4NmExNGFi
YTYyYWRkOGY2ZDEyOGFlZjZkY2I0ZmFiMmJiYjgyNS4uNTdmOTZiOWRmNWM4MzA3YjkxZjEwNmUx
NmM3ODYzNGIzNjliMTNhNiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9TY3JpcHRzL3Byb2Nl
c3MtZW50aXRsZW1lbnRzLnNoCisrKyBiL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9wcm9jZXNzLWVu
dGl0bGVtZW50cy5zaApAQCAtOTgsNiArOTgsNyBAQCBmdW5jdGlvbiBtYWNfcHJvY2Vzc19uZXR3
b3JrX2VudGl0bGVtZW50cygpCiAgICAgICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUucHJp
dmF0ZS5sYXVuY2hzZXJ2aWNlcy5hbGxvd2VkdG9jaGFuZ2V0aGVzZWtleXNpbm90aGVyYXBwbGlj
YXRpb25zOjEgc3RyaW5nIExTRGlzcGxheU5hbWUKICAgICAgICAgcGxpc3RidWRkeSBBZGQgOmNv
bS5hcHBsZS5wcml2YXRlLndlYmtpdC51c2UteHBjLWVuZHBvaW50IGJvb2wgWUVTCiAgICAgICAg
IHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUucm9vdGxlc3Muc3RvcmFnZS5XZWJLaXROZXR3b3Jr
aW5nU2FuZGJveCBib29sIFlFUworICAgICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxlLnN5
bXB0b21fYW5hbHl0aWNzLmNvbmZpZ3VyZSBib29sIFlFUwogICAgIGZpCiB9CiAKQEAgLTMxMyw2
ICszMTQsNyBAQCBmdW5jdGlvbiBpb3NfZmFtaWx5X3Byb2Nlc3NfbmV0d29ya19lbnRpdGxlbWVu
dHMoKQogCiAgICAgcGxpc3RidWRkeSBBZGQgOnNlYXRiZWx0LXByb2ZpbGVzIGFycmF5CiAgICAg
cGxpc3RidWRkeSBBZGQgOnNlYXRiZWx0LXByb2ZpbGVzOjAgc3RyaW5nIGNvbS5hcHBsZS5XZWJL
aXQuTmV0d29ya2luZworICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUuc3ltcHRvbV9hbmFs
eXRpY3MuY29uZmlndXJlIGJvb2wgWUVTCiB9CiAKIGZ1bmN0aW9uIGlvc19mYW1pbHlfcHJvY2Vz
c19wbHVnaW5fZW50aXRsZW1lbnRzKCkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>424968</attachid>
            <date>2021-04-01 17:37:07 -0700</date>
            <delta_ts>2021-04-01 20:19:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224030-20210401173706.patch</filename>
            <type>text/plain</type>
            <size>7078</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDdhZTYzNjk4ZDg1YjBlMTIyNjc1Yzgy
ODQ1ODc0NWE1YzVmNTY5Y2QuLmE0NGZlM2VmZDYwZWQxNWJiMDhkMDFjOWM1YTM2ZjA4ZGIxZDI5
Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDMtMzEgIEthdGUgQ2hlbmV5ICA8a2F0aGVy
aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYXIgbmV0d29yayB3ZWJzaXRlIGRh
dGEgd2hlbiBhIHVzZXIgY2xlYXJzIGhpc3Rvcnkvd2Vic2l0ZSBkYXRhCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQwMzAKKyAgICAgICAgPHJkYXI6
Ly9wcm9ibGVtLzc1Mjg4MzM4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgICogd3RmL2NvY29hL1NvZnRMaW5raW5nLmg6CisgICAgICAgIEFkZCBhIG5l
dyBzb2Z0IGxpbmsgbWFjcm8gdG8gbGluayB1bWJyZWxsYSBwcml2YXRlIGZyYW1ld29ya3MuIFdl
IG5lZWQKKyAgICAgICAgdGhpcyB0byBzdXBwb3J0IGludGVybmFsIGFkZGl0aW9ucyB3ZSBuZWVk
IHRvIGNsZWFyIG5ldHdvcmsgZG9tYWluIGRhdGEuCisKIDIwMjEtMDMtMzEgIFNhbSBXZWluaWcg
IDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIEVhc2UgZXhwZXJpbWVudGF0aW9uIGJ5IGVu
YWJsaW5nIDxtb2RlbD4gaWYgU0VQQVJBVEVEX01PREVMIGlzIGJlaW5nIHVzZWQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5k
ZXggYTk3YTYxOGQ5NDk2MDNjODRiN2VjOWRjN2JhYzVhNzAyMzlkYTcyYS4uZjI3ZDMxMWM0OTRm
ZWJjODkyODcyY2I4YjZhNzZhNDRjYWYxYTFhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D
aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor
MjAyMS0wMy0zMSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KKwor
ICAgICAgICBDbGVhciBuZXR3b3JrIHdlYnNpdGUgZGF0YSB3aGVuIGEgdXNlciBjbGVhcnMgaGlz
dG9yeS93ZWJzaXRlIGRhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIyNDAzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzUyODgzMzg+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xlYXIgbmV0d29y
ay1yZWxhdGVkIHdlYnNpdGUgZGF0YSBmb3IgZG9tYWlucyB3aGVuIGNsZWFyaW5nIGhpc3Rvcnkv
CisgICAgICAgIHdlYnNpdGUgZGF0YS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFVuYWJsZSB0
byB0ZXN0IGR1ZSB0byByZWNlbnQgY2hhbmdlcyBpbiBhIGRlcGVuZGVudAorICAgICAgICBmcmFt
ZXdvcmsncyBpbmZyYXN0cnVjdHVyZSBmb3Igc2V0dGluZyBuZXR3b3JrIHdlYnNpdGUgZGF0YSBm
b3IKKyAgICAgICAgdGVzdGluZy4gV2lsbCBwb3N0IGEgZm9sbG93dXAgdGVzdCBvbmNlIHRoYXQg
aXMgcmVzb2x2ZWQuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5j
cHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpkZWxldGVXZWJzaXRlRGF0YSk6
CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaDoKKyAgICAgICAgKFdl
YktpdDo6TmV0d29ya1Nlc3Npb246OnJlbW92ZU5ldHdvcmtXZWJzaXRlRGF0YSk6CisgICAgICAg
ICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oOgorICAgICAgICAq
IE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChO
ZXR3b3JrU2Vzc2lvbkNvY29hOjpyZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEpOgorICAgICAgICAq
IFNjcmlwdHMvcHJvY2Vzcy1lbnRpdGxlbWVudHMuc2g6CisKIDIwMjEtMDQtMDEgIENvbW1pdCBR
dWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJl
dmVydGluZyByMjc1MzUwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvY29jb2EvU29mdExp
bmtpbmcuaCBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL1NvZnRMaW5raW5nLmgKaW5kZXggNzRjNzAy
NmQyYjNhOWVhNWE4ODFhMDc3NTJkZDVhMzk3YWIyYjBhZC4uYmFlOGJjZDk3MmUwNDNhMGJmOGNl
NzMwMjRmNTVhZTcxZTU4Y2Q5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvY29jb2EvU29m
dExpbmtpbmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9Tb2Z0TGlua2luZy5oCkBAIC0x
MTcsNiArMTE3LDEzIEBAIHN0YXRpYyB2b2lkKiBsaWIjI0xpYnJhcnkoKSBcCiAgICAgICAgIHJl
dHVybiBmcmFtZXdvcmtMaWJyYXJ5OyBcCiAgICAgfQogCisjZGVmaW5lIFNPRlRfTElOS19QUklW
QVRFX0ZSQU1FV09SS19JTl9VTUJSRUxMQV9PUFRJT05BTCh1bWJyZWxsYSwgZnJhbWV3b3JrKSBc
CisgICAgc3RhdGljIHZvaWQqIGZyYW1ld29yayMjTGlicmFyeSgpIFwKKyAgICB7IFwKKyAgICAg
ICAgc3RhdGljIHZvaWQqIGZyYW1ld29ya0xpYnJhcnkgPSBkbG9wZW4oIi9TeXN0ZW0vTGlicmFy
eS9Qcml2YXRlRnJhbWV3b3Jrcy8iICN1bWJyZWxsYSAiLmZyYW1ld29yay9GcmFtZXdvcmtzLyIg
I2ZyYW1ld29yayAiLmZyYW1ld29yay8iICNmcmFtZXdvcmssIFJUTERfTk9XKTsgXAorICAgICAg
ICByZXR1cm4gZnJhbWV3b3JrTGlicmFyeTsgXAorICAgIH0KKwogI2RlZmluZSBTT0ZUX0xJTkso
ZnJhbWV3b3JrLCBmdW5jdGlvbk5hbWUsIHJlc3VsdFR5cGUsIHBhcmFtZXRlckRlY2xhcmF0aW9u
cywgcGFyYW1ldGVyTmFtZXMpIFwKICAgICBXVEZfRVhURVJOX0NfQkVHSU4gXAogICAgIHJlc3Vs
dFR5cGUgZnVuY3Rpb25OYW1lIHBhcmFtZXRlckRlY2xhcmF0aW9uczsgXApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCBhMGFhMDBhNjFj
MTFhNjAwMzRkMjAwODIzZjExYjJkYTVkMTg4YTMyLi5kOGY3ZmM5MGVhOWRjMzdmMGJjOTVhMzdk
NjM4YTE3NGFmOWMxNDMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz
L05ldHdvcmtQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l
dHdvcmtQcm9jZXNzLmNwcApAQCAtMTYxMSw2ICsxNjExLDkgQEAgdm9pZCBOZXR3b3JrUHJvY2Vz
czo6ZGVsZXRlV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpb25TZXQ8
V2Vic2kKICAgICB9CiAjZW5kaWYKIAorICAgIGlmIChhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IHRo
aXMtPm5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkpCisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5y
ZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEobW9kaWZpZWRTaW5jZSwgW2NsZWFyVGFza3NIYW5kbGVy
XSB7IH0pOworCiAgICAgaWYgKHdlYnNpdGVEYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFU
eXBlOjpEaXNrQ2FjaGUpICYmICFzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSkKICAgICAgICAgY2xl
YXJEaXNrQ2FjaGUobW9kaWZpZWRTaW5jZSwgW2NsZWFyVGFza3NIYW5kbGVyID0gV1RGTW92ZShj
bGVhclRhc2tzSGFuZGxlcildIHsgfSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0
d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Nlc3Npb24uaAppbmRleCA5ZWE2OWJlMTgzOGM4NjZmYWRmMzFiYmNlNzc0NThm
MWEyMjgwODk2Li43ZGQ4M2NmN2NmMTE5ZTE4NmVhYmExYzAxYmJlNDBiMzJhODVhNTFmIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKKysr
IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCkBAIC0xNjYs
NiArMTY2LDggQEAgcHVibGljOgogICAgIHZvaWQgYWRkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRO
ZXR3b3JrTG9hZGVyKHN0ZDo6dW5pcXVlX3B0cjxQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdv
cmtMb2FkZXI+JiYgbG9hZGVyKSB7IG1fcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9h
ZGVycy5hZGQoV1RGTW92ZShsb2FkZXIpKTsgfQogICAgIHZvaWQgcmVtb3ZlUHJpdmF0ZUNsaWNr
TWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyKFByaXZhdGVDbGlja01lYXN1cmVtZW50TmV0d29ya0xv
YWRlciogbG9hZGVyKSB7IG1fcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVycy5y
ZW1vdmUobG9hZGVyKTsgfQogICAgIAorICAgIHZpcnR1YWwgdm9pZCByZW1vdmVOZXR3b3JrV2Vi
c2l0ZURhdGEoV2FsbFRpbWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9u
SGFuZGxlcikgeyBjb21wbGV0aW9uSGFuZGxlcigpOyB9CisKIHByb3RlY3RlZDoKICAgICBOZXR3
b3JrU2Vzc2lvbihOZXR3b3JrUHJvY2VzcyYsIGNvbnN0IE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25Q
YXJhbWV0ZXJzJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv
Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKaW5kZXggMWFjZGQyNzE0ZjVjNjczMTJlM2Ni
MjE5NzVhM2FiNDgwM2YzMGRkNC4uYjQwZGY2MzFmNGI3NzAzYjI0OGYxZTc5NzdjMjk0M2IwYmFi
YjQ3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3
b3JrU2Vzc2lvbkNvY29hLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2Nv
YS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKQEAgLTEwNiw2ICsxMDYsOCBAQCBwdWJsaWM6CiAgICAg
CiAgICAgX05TSFNUU1N0b3JhZ2UgKmhzdHNTdG9yYWdlKCkgY29uc3Q7CiAKKyAgICB2b2lkIHJl
bW92ZU5ldHdvcmtXZWJzaXRlRGF0YShXYWxsVGltZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp
PiYmKSBvdmVycmlkZTsKKwogcHJpdmF0ZToKICAgICB2b2lkIGludmFsaWRhdGVBbmRDYW5jZWwo
KSBvdmVycmlkZTsKICAgICB2b2lkIGNsZWFyQ3JlZGVudGlhbHMoKSBvdmVycmlkZTsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D
b2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np
b25Db2NvYS5tbQppbmRleCA4OThhN2QzY2Q2NWExNWRlNGI2MzBkNzhiZTQ1MWUzZmZiMTQ0MGEy
Li4yZGUyOWQ1YjEwZTlhZjdiMzUwMDliOTdjOWNlN2RjNGQzMjk1NWVkIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0K
KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNv
Y29hLm1tCkBAIC02NSw2ICs2NSw3IEBACiAjZWxzZQogI2RlZmluZSBORVRXT1JLX1NFU1NJT05f
Q09DT0FfQURESVRJT05TXzEKICNkZWZpbmUgTkVUV09SS19TRVNTSU9OX0NPQ09BX0hUVFBfUkVE
SVJFQ1RfQURESVRJT05TCit2b2lkIFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6cmVtb3Zl
TmV0d29ya1dlYnNpdGVEYXRhKFdhbGxUaW1lLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYg
Y29tcGxldGlvbkhhbmRsZXIpIHsgY29tcGxldGlvbkhhbmRsZXIoKTsgfQogI2VuZGlmCiAKICNp
bXBvcnQgIkRldmljZU1hbmFnZW1lbnRTb2Z0TGluay5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9TY3JpcHRzL3Byb2Nlc3MtZW50aXRsZW1lbnRzLnNoIGIvU291cmNlL1dlYktpdC9TY3Jp
cHRzL3Byb2Nlc3MtZW50aXRsZW1lbnRzLnNoCmluZGV4IDQyODZhMTRhYmE2MmFkZDhmNmQxMjhh
ZWY2ZGNiNGZhYjJiYmI4MjUuLjU3Zjk2YjlkZjVjODMwN2I5MWYxMDZlMTZjNzg2MzRiMzY5YjEz
YTYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50
cy5zaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvcHJvY2Vzcy1lbnRpdGxlbWVudHMuc2gK
QEAgLTk4LDYgKzk4LDcgQEAgZnVuY3Rpb24gbWFjX3Byb2Nlc3NfbmV0d29ya19lbnRpdGxlbWVu
dHMoKQogICAgICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxlLnByaXZhdGUubGF1bmNoc2Vy
dmljZXMuYWxsb3dlZHRvY2hhbmdldGhlc2VrZXlzaW5vdGhlcmFwcGxpY2F0aW9uczoxIHN0cmlu
ZyBMU0Rpc3BsYXlOYW1lCiAgICAgICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUucHJpdmF0
ZS53ZWJraXQudXNlLXhwYy1lbmRwb2ludCBib29sIFlFUwogICAgICAgICBwbGlzdGJ1ZGR5IEFk
ZCA6Y29tLmFwcGxlLnJvb3RsZXNzLnN0b3JhZ2UuV2ViS2l0TmV0d29ya2luZ1NhbmRib3ggYm9v
bCBZRVMKKyAgICAgICAgcGxpc3RidWRkeSBBZGQgOmNvbS5hcHBsZS5zeW1wdG9tX2FuYWx5dGlj
cy5jb25maWd1cmUgYm9vbCBZRVMKICAgICBmaQogfQogCkBAIC0zMTMsNiArMzE0LDcgQEAgZnVu
Y3Rpb24gaW9zX2ZhbWlseV9wcm9jZXNzX25ldHdvcmtfZW50aXRsZW1lbnRzKCkKIAogICAgIHBs
aXN0YnVkZHkgQWRkIDpzZWF0YmVsdC1wcm9maWxlcyBhcnJheQogICAgIHBsaXN0YnVkZHkgQWRk
IDpzZWF0YmVsdC1wcm9maWxlczowIHN0cmluZyBjb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcK
KyAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxlLnN5bXB0b21fYW5hbHl0aWNzLmNvbmZpZ3Vy
ZSBib29sIFlFUwogfQogCiBmdW5jdGlvbiBpb3NfZmFtaWx5X3Byb2Nlc3NfcGx1Z2luX2VudGl0
bGVtZW50cygpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>