<?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>229202</bug_id>
          
          <creation_ts>2021-08-17 13:59:24 -0700</creation_ts>
          <short_desc>[App Privacy Report] Some HTTP Redirects from non app initiated requests are marked app initiated</short_desc>
          <delta_ts>2021-08-19 07:13:01 -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>bfulgham</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>jer.noble</cc>
    
    <cc>philipj</cc>
    
    <cc>sergio</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1784929</commentid>
    <comment_count>0</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-17 13:59:24 -0700</bug_when>
    <thetext>Seeing this with media loads only.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784930</commentid>
    <comment_count>1</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-17 13:59:45 -0700</bug_when>
    <thetext>&lt;rdar://problem/79467871&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784958</commentid>
    <comment_count>2</comment_count>
      <attachid>435718</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-17 15:41:34 -0700</bug_when>
    <thetext>Created attachment 435718
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785022</commentid>
    <comment_count>3</comment_count>
      <attachid>435735</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-17 19:14:32 -0700</bug_when>
    <thetext>Created attachment 435735
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785111</commentid>
    <comment_count>4</comment_count>
      <attachid>435767</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-18 07:59:21 -0700</bug_when>
    <thetext>Created attachment 435767
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785379</commentid>
    <comment_count>5</comment_count>
      <attachid>435767</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-08-18 21:37:01 -0700</bug_when>
    <thetext>Comment on attachment 435767
Patch

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

R=me

&gt; Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:617
&gt; +                nsRequest = mutableRequest.get();

It would be better if we could initialize attribution when we construct the NSURLRequest from the request above, but this is fine for now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785435</commentid>
    <comment_count>6</comment_count>
      <attachid>435767</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-19 05:49:25 -0700</bug_when>
    <thetext>Comment on attachment 435767
Patch

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

&gt;&gt; Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:617
&gt;&gt; +                nsRequest = mutableRequest.get();
&gt; 
&gt; It would be better if we could initialize attribution when we construct the NSURLRequest from the request above, but this is fine for now.

That&apos;s a good idea. It would require changing the ::nsURLRequest function which is used in a lot of places, so agreed it might be better for a separate fix.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785436</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-19 05:58:06 -0700</bug_when>
    <thetext>Committed r281234 (240671@main): &lt;https://commits.webkit.org/240671@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 435767.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435718</attachid>
            <date>2021-08-17 15:41:34 -0700</date>
            <delta_ts>2021-08-17 19:14:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229202-20210817184133.patch</filename>
            <type>text/plain</type>
            <size>9364</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg4YzJkZWUwMWViMTUzNDhm
ZGNkZjQ3OTE3OTdmY2JiODFmOWQ4MGEuLmM0NmFiNjU0NjQ3NjBiMzY5MzA3YTU4NDY1NzUzNzQ5
Mjg3N2FkN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDgtMTcgIEthdGUgQ2hl
bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgW0FwcCBQcml2YWN5
IFJlcG9ydF0gU29tZSBIVFRQIFJlZGlyZWN0cyBmcm9tIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVl
c3RzIGFyZSBtYXJrZWQgYXBwIGluaXRpYXRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83OTQ2
Nzg3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU
ZXN0czogaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlh
LXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgICAgICAgIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw
b3J0L3VzZXItYXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QuaHRtbAorCisgICAgICAgIFRoZSBy
ZXF1ZXN0IHJldHVybmVkIGluIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIgb2YKKyAgICAgICAgTmV0
d29ya0RhdGFUYXNrQ29jb2E6OndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uIGRvZXMgbm90IGFs
d2F5cyBoYXZlCisgICAgICAgIHRoZSBhdHRyaWJ1dGlvbiBwcm9wZXJ0eSBvZiB0aGUgb3JpZ2lu
YWwgcmVxdWVzdC4gV2Ugc2hvdWxkIHBhc3MgaXQKKyAgICAgICAgYWxvbmcgYW5kIHNldCBpdC4K
KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06
CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6d2ls
bFBlcmZvcm1IVFRQUmVkaXJlY3Rpb246bmV3UmVxdWVzdDpjb21wbGV0aW9uSGFuZGxlcjpdKToK
KwogMjAyMS0wOC0xNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4K
IAogICAgICAgICBbY3VybF0gS2VwdCBhbGl2ZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXJzIHNob3Vs
ZCBiZSBjYW5jZWxsZWQgYnkgTmV0d29ya0xvYWQ6OmRpZENvbXBsZXRlV2l0aEVycm9yIG9uIFBv
bGljeUFjdGlvbjo6SWdub3JlIG9mIGRpZFJlY2VpdmVSZXNwb25zZQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIv
U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1t
CmluZGV4IDA3MDc3NWJiNWQ4M2I2MjlhZDMyNmQ3MWZlOTBkZGFjYTA5MzVlZTguLjMwZGU4MDUz
NDZjMzk5ZGJlNzg5OTBlM2ZlNjk0MjYzMWIwZGFmZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAg
LTU5NywxMyArNTk3LDIzIEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vz
c2lvbiB0YXNrOihOU1VSTFNlc3Npb25UYXNrICopdGFzayB3aWxsUGVyCiAgICAgICAgIFdlYkNv
cmU6OlJlc291cmNlUmVzcG9uc2UgcmVzb3VyY2VSZXNwb25zZShyZXNwb25zZSk7CiAgICAgICAg
IG5ldHdvcmtEYXRhVGFzay0+Y2hlY2tUQU8ocmVzb3VyY2VSZXNwb25zZSk7CiAKLSAgICAgICAg
bmV0d29ya0RhdGFUYXNrLT53aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbihXVEZNb3ZlKHJlc291
cmNlUmVzcG9uc2UpLCByZXF1ZXN0LCBbY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIo
Y29tcGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgc2hvdWxkSWdub3JlSFNUU10oYXV0
byYmIHJlcXVlc3QpIHsKKyAgICAgICAgbmV0d29ya0RhdGFUYXNrLT53aWxsUGVyZm9ybUhUVFBS
ZWRpcmVjdGlvbihXVEZNb3ZlKHJlc291cmNlUmVzcG9uc2UpLCByZXF1ZXN0LCBbc2Vzc2lvbiA9
IG5ldHdvcmtEYXRhVGFzay0+bmV0d29ya1Nlc3Npb24oKSwgY29tcGxldGlvbkhhbmRsZXIgPSBt
YWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgc2hvdWxkSWdu
b3JlSFNUUywgYXR0cmlidXRpb24gPSByZXF1ZXN0LmF0dHJpYnV0aW9uXShhdXRvJiYgcmVxdWVz
dCkgewogI2lmICFMT0dfRElTQUJMRUQKICAgICAgICAgICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwg
IiVsbHUgd2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24gY29tcGxldGlvbkhhbmRsZXIgKCVzKSIs
IHRhc2tJZGVudGlmaWVyLCByZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwog
I2Vsc2UKICAgICAgICAgICAgIFVOVVNFRF9QQVJBTSh0YXNrSWRlbnRpZmllcik7CiAjZW5kaWYK
ICAgICAgICAgICAgIGF1dG8gbnNSZXF1ZXN0ID0gcmV0YWluUHRyKHJlcXVlc3QubnNVUkxSZXF1
ZXN0KFdlYkNvcmU6OkhUVFBCb2R5VXBkYXRlUG9saWN5OjpVcGRhdGVIVFRQQm9keSkpOworCisj
aWYgRU5BQkxFKEFQUF9QUklWQUNZX1JFUE9SVCkKKyAgICAgICAgICAgIGlmIChzZXNzaW9uKSB7
CisgICAgICAgICAgICAgICAgUmV0YWluUHRyPE5TTXV0YWJsZVVSTFJlcXVlc3Q+IG11dGFibGVS
ZXF1ZXN0ID0gYWRvcHROUyhbbnNSZXF1ZXN0IG11dGFibGVDb3B5XSk7CisgICAgICAgICAgICAg
ICAgbXV0YWJsZVJlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24gPSBhdHRyaWJ1dGlvbjsKKyAgICAg
ICAgICAgICAgICBuc1JlcXVlc3QgPSBtdXRhYmxlUmVxdWVzdC5nZXQoKTsKKworICAgICAgICAg
ICAgICAgIHNlc3Npb24tPmFwcFByaXZhY3lSZXBvcnRUZXN0aW5nRGF0YSgpLmRpZExvYWRBcHBJ
bml0aWF0ZWRSZXF1ZXN0KG5zUmVxdWVzdC5nZXQoKS5hdHRyaWJ1dGlvbiA9PSBOU1VSTFJlcXVl
c3RBdHRyaWJ1dGlvbkRldmVsb3Blcik7CisgICAgICAgICAgICB9CisjZW5kaWYKICAgICAgICAg
ICAgIHVwZGF0ZUlnbm9yZVN0cmljdFRyYW5zcG9ydFNlY3VyaXR5U2V0dGluZyhuc1JlcXVlc3Qs
IHNob3VsZElnbm9yZUhTVFMpOwogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobnNSZXF1
ZXN0LmdldCgpKTsKICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTg2Y2NmODRkYWNhYzQzNjcwZmMwNTQ5
NGZiMTNkNDliZGY3ZWQ0ZS4uMTMwNDZiYjJjYTQwMDUzZTdlNTExZTM4ZjM2OWM2YTYzYWIyYjJl
MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No
YW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTE3ICBLYXRlIENoZW5leSAgPGthdGhl
cmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFtBcHAgUHJpdmFjeSBSZXBvcnRdIFNv
bWUgSFRUUCBSZWRpcmVjdHMgZnJvbSBub24gYXBwIGluaXRpYXRlZCByZXF1ZXN0cyBhcmUgbWFy
a2VkIGFwcCBpbml0aWF0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIyOTIwMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzk0Njc4NzE+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTGF5b3V0IHRlc3Qg
Y292ZXJhZ2UuIFRoaXMgYnVnIHdhcyBvbmx5IHJlcHJvZHVjaW5nIHdpdGggbWVkaWEtcmVsYXRl
ZAorICAgICAgICBsb2FkaW5nLCBzbyB0aGVzZSB0ZXN0cyByZWRpcmVjdCB0byBsb2FkIGFuIG1w
NC4KKworICAgICAgICAqIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L2FwcC1hdHRyaWJ1
dGlvbi1tZWRpYS1yZWRpcmVjdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAv
dGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L2FwcC1hdHRyaWJ1dGlvbi1tZWRpYS1yZWRpcmVjdC5o
dG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2Vy
LWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg
ICogaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvdXNlci1hdHRyaWJ1dGlvbi1tZWRpYS1y
ZWRpcmVjdC5odG1sOiBBZGRlZC4KKwogMjAyMS0wOC0xNyAgQXl1bWkgS29qaW1hICA8YXl1bWlf
a29qaW1hQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWJhc2VsaW5pbmcgWyBXaW4gRVdTIF0gaHR0
cC90ZXN0cy9taXNjL3dlYnRpbWluZy1zbG93LWxvYWQucHkuCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC9hcHAtYXR0cmlidXRpb24tbWVkaWEt
cmVkaXJlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFj
eS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi4yNjAxY2U1MTMxYmNlYjAwNDRlNmU2NzgzMjkwYTAxYzdhNzhiMzA0Ci0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBw
LWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBA
CitUZXN0IG1lZGlhIGZpbGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBhcHAgaW5p
dGlhdGVkCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVz
c2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIHN1Y2Nlc3NmdWxs
eSBsb2FkZWQgb25seSBhcHAgaW5pdGlhdGVkIHJlcXVlc3RzCitQQVNTIHN1Y2Nlc3NmdWxseVBh
cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGly
ZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC9hcHAt
YXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl
eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45YzYxNzhmZWZhYzY2
MmM4Y2VjZDk4MTA5NTBjZjJkYmQ2ZTU4YWY1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlhLXJl
ZGlyZWN0Lmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPCFET0NUWVBFIGh0bWw+PCEtLSB3ZWJraXQt
dGVzdC1ydW5uZXIgWyBpc0FwcEluaXRpYXRlZD10cnVlIF0gLS0+Cis8aHRtbD4KKzxoZWFkPgor
ICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2Ny
aXB0PgorPC9oZWFkPgorPGJvZHk+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJUZXN0IG1l
ZGlhIGZpbGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBhcHAgaW5pdGlhdGVkIik7
CisKKyAgICBmdW5jdGlvbiBsb2cobWVzc2FnZSkKKyAgICB7CisgICAgICAgIGRvY3VtZW50Lmdl
dEVsZW1lbnRCeUlkKCdjb25zb2xlJykuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5v
ZGUobWVzc2FnZSArICdcbicpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICB7
CisgICAgICAgIHZhciBkaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlk
TG9hZEFwcEluaXRpYXRlZFJlcXVlc3QoKTsKKyAgICAgICAgdmFyIGRpZExvYWROb25BcHBJbml0
aWF0ZWRSZXF1ZXN0ID0gdGVzdFJ1bm5lci5kaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVzdCgp
OworCisgICAgICAgIGlmIChkaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVzdCkgeworICAgICAg
ICAgICAgbG9nKCJGQUlMIGRpZCBsb2FkIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAg
ICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9
CisKKyAgICAgICAgaWYgKCFkaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCkgeworICAgICAgICAg
ICAgbG9nKCJGQUlMIGRpZCBub3QgbG9hZCBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAg
ICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisK
KyAgICAgICAgbG9nKCJQQVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBhcHAgaW5pdGlhdGVk
IHJlcXVlc3RzIik7CisKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfQorCisgICAgdmFy
IHZpZGVvID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidmlkZW8iKTsKKyAgICB2aWRlby5hZGRF
dmVudExpc3RlbmVyKCJsb2FkZWRkYXRhIiwgdGVzdCk7CisgICAgdmlkZW8uc3JjID0gYC9yZXNv
dXJjZXMvcmVkaXJlY3QucHk/dXJsPWh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9yZXNvdXJjZXMvdGVz
dC5tcDRgOworCisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8
c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+
Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Fw
cC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVk
LnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L3VzZXItYXR0
cmlidXRpb24tbWVkaWEtcmVkaXJlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0
CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ5NDdmOTAw
YjczYzY1MDcxYzg0ODI4NWZiYzRjNTk4ZmVhNzM1MmEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1l
ZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitUZXN0IG1lZGlhIGZp
bGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBub24gYXBwIGluaXRpYXRlZAorCitP
biBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xs
b3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBzdWNjZXNzZnVsbHkgbG9hZGVkIG9u
bHkgbm9uIGFwcCBpbml0aWF0ZWQgcmVxdWVzdHMKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlz
IHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rl
c3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0Lmh0
bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJp
YnV0aW9uLW1lZGlhLXJlZGlyZWN0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmU3YzVkZmVhNDhiYWE1MWQ1
MWZhOGRmYmNkNTA4NzY0NjUwYTUwMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0
dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L3VzZXItYXR0cmlidXRpb24tbWVkaWEtcmVkaXJl
Y3QuaHRtbApAQCAtMCwwICsxLDQ1IEBACis8IURPQ1RZUEUgaHRtbD48IS0tIHdlYmtpdC10ZXN0
LXJ1bm5lciBbIGlzQXBwSW5pdGlhdGVkPWZhbHNlIF0gLS0+Cis8aHRtbD4KKzxoZWFkPgorICAg
IDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0
PgorPC9oZWFkPgorPGJvZHk+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJUZXN0IG1lZGlh
IGZpbGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBub24gYXBwIGluaXRpYXRlZCIp
OworCisgICAgZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCisgICAgeworICAgICAgICBkb2N1bWVudC5n
ZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHRO
b2RlKG1lc3NhZ2UgKyAnXG4nKSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gdGVzdCgpCisgICAg
eworICAgICAgICB2YXIgZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlkTG9h
ZEFwcEluaXRpYXRlZFJlcXVlc3QoKTsKKyAgICAgICAgdmFyIGRpZExvYWROb25BcHBCb3VuZFJl
cXVlc3QgPSB0ZXN0UnVubmVyLmRpZExvYWROb25BcHBJbml0aWF0ZWRSZXF1ZXN0KCk7CisKKyAg
ICAgICAgaWYgKGRpZExvYWRBcHBCb3VuZFJlcXVlc3QpIHsKKyAgICAgICAgICAgIGxvZygiRkFJ
TCBkaWQgbG9hZCBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAgICAgIGZpbmlzaEpT
VGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKCFk
aWRMb2FkTm9uQXBwQm91bmRSZXF1ZXN0KSB7CisgICAgICAgICAgICBsb2coIkZBSUwgZGlkIG5v
dCBsb2FkIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAgICAgIGZpbmlzaEpT
VGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgbG9nKCJQ
QVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBub24gYXBwIGluaXRpYXRlZCByZXF1ZXN0cyIp
OworICAgICAgICAKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfQorCisgICAgdmFyIHZp
ZGVvID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidmlkZW8iKTsKKyAgICB2aWRlby5hZGRFdmVu
dExpc3RlbmVyKCJsb2FkZWRkYXRhIiwgdGVzdCk7CisgICAgdmlkZW8uc3JjID0gYC9yZXNvdXJj
ZXMvcmVkaXJlY3QucHk/dXJsPWh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9yZXNvdXJjZXMvdGVzdC5t
cDRgOworCisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2Ny
aXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8
L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435735</attachid>
            <date>2021-08-17 19:14:32 -0700</date>
            <delta_ts>2021-08-18 07:59:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229202-20210817221432.patch</filename>
            <type>text/plain</type>
            <size>9577</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg4YzJkZWUwMWViMTUzNDhm
ZGNkZjQ3OTE3OTdmY2JiODFmOWQ4MGEuLmM0NmFiNjU0NjQ3NjBiMzY5MzA3YTU4NDY1NzUzNzQ5
Mjg3N2FkN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDgtMTcgIEthdGUgQ2hl
bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgW0FwcCBQcml2YWN5
IFJlcG9ydF0gU29tZSBIVFRQIFJlZGlyZWN0cyBmcm9tIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVl
c3RzIGFyZSBtYXJrZWQgYXBwIGluaXRpYXRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83OTQ2
Nzg3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU
ZXN0czogaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlh
LXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgICAgICAgIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw
b3J0L3VzZXItYXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QuaHRtbAorCisgICAgICAgIFRoZSBy
ZXF1ZXN0IHJldHVybmVkIGluIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIgb2YKKyAgICAgICAgTmV0
d29ya0RhdGFUYXNrQ29jb2E6OndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uIGRvZXMgbm90IGFs
d2F5cyBoYXZlCisgICAgICAgIHRoZSBhdHRyaWJ1dGlvbiBwcm9wZXJ0eSBvZiB0aGUgb3JpZ2lu
YWwgcmVxdWVzdC4gV2Ugc2hvdWxkIHBhc3MgaXQKKyAgICAgICAgYWxvbmcgYW5kIHNldCBpdC4K
KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06
CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6d2ls
bFBlcmZvcm1IVFRQUmVkaXJlY3Rpb246bmV3UmVxdWVzdDpjb21wbGV0aW9uSGFuZGxlcjpdKToK
KwogMjAyMS0wOC0xNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4K
IAogICAgICAgICBbY3VybF0gS2VwdCBhbGl2ZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXJzIHNob3Vs
ZCBiZSBjYW5jZWxsZWQgYnkgTmV0d29ya0xvYWQ6OmRpZENvbXBsZXRlV2l0aEVycm9yIG9uIFBv
bGljeUFjdGlvbjo6SWdub3JlIG9mIGRpZFJlY2VpdmVSZXNwb25zZQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIv
U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1t
CmluZGV4IDA3MDc3NWJiNWQ4M2I2MjlhZDMyNmQ3MWZlOTBkZGFjYTA5MzVlZTguLjJiYjk1NGM4
YWRlM2JmOTA2Mzc3ZmE3M2VlYTAyMjc3ODc0YWEyNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAg
LTU5NywxMyArNTk3LDI5IEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vz
c2lvbiB0YXNrOihOU1VSTFNlc3Npb25UYXNrICopdGFzayB3aWxsUGVyCiAgICAgICAgIFdlYkNv
cmU6OlJlc291cmNlUmVzcG9uc2UgcmVzb3VyY2VSZXNwb25zZShyZXNwb25zZSk7CiAgICAgICAg
IG5ldHdvcmtEYXRhVGFzay0+Y2hlY2tUQU8ocmVzb3VyY2VSZXNwb25zZSk7CiAKLSAgICAgICAg
bmV0d29ya0RhdGFUYXNrLT53aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbihXVEZNb3ZlKHJlc291
cmNlUmVzcG9uc2UpLCByZXF1ZXN0LCBbY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIo
Y29tcGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgc2hvdWxkSWdub3JlSFNUU10oYXV0
byYmIHJlcXVlc3QpIHsKKyAgICAgICAgYm9vbCBpc0FwcEluaXRpYXRlZCA9IHRydWU7CisKKyNp
ZiBFTkFCTEUoQVBQX1BSSVZBQ1lfUkVQT1JUKQorICAgICAgICBpc0FwcEluaXRpYXRlZCA9IHJl
cXVlc3QuYXR0cmlidXRpb24gPT0gTlNVUkxSZXF1ZXN0QXR0cmlidXRpb25EZXZlbG9wZXI7Cisj
ZW5kaWYKKworICAgICAgICBuZXR3b3JrRGF0YVRhc2stPndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0
aW9uKFdURk1vdmUocmVzb3VyY2VSZXNwb25zZSksIHJlcXVlc3QsIFtzZXNzaW9uID0gbmV0d29y
a0RhdGFUYXNrLT5uZXR3b3JrU2Vzc2lvbigpLCBjb21wbGV0aW9uSGFuZGxlciA9IG1ha2VCbG9j
a1B0cihjb21wbGV0aW9uSGFuZGxlciksIHRhc2tJZGVudGlmaWVyLCBzaG91bGRJZ25vcmVIU1RT
LCBpc0FwcEluaXRpYXRlZF0oYXV0byYmIHJlcXVlc3QpIHsKICNpZiAhTE9HX0RJU0FCTEVECiAg
ICAgICAgICAgICBMT0coTmV0d29ya1Nlc3Npb24sICIlbGx1IHdpbGxQZXJmb3JtSFRUUFJlZGly
ZWN0aW9uIGNvbXBsZXRpb25IYW5kbGVyICglcykiLCB0YXNrSWRlbnRpZmllciwgcmVxdWVzdC51
cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICNlbHNlCiAgICAgICAgICAgICBVTlVTRURf
UEFSQU0odGFza0lkZW50aWZpZXIpOwogI2VuZGlmCiAgICAgICAgICAgICBhdXRvIG5zUmVxdWVz
dCA9IHJldGFpblB0cihyZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpIVFRQQm9keVVwZGF0
ZVBvbGljeTo6VXBkYXRlSFRUUEJvZHkpKTsKKworI2lmIEVOQUJMRShBUFBfUFJJVkFDWV9SRVBP
UlQpCisgICAgICAgICAgICBpZiAoc2Vzc2lvbikgeworICAgICAgICAgICAgICAgIFJldGFpblB0
cjxOU011dGFibGVVUkxSZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVxdWVz
dCBtdXRhYmxlQ29weV0pOworICAgICAgICAgICAgICAgIG11dGFibGVSZXF1ZXN0LmdldCgpLmF0
dHJpYnV0aW9uID0gaXNBcHBJbml0aWF0ZWQgPyBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVs
b3BlciA6IE5TVVJMUmVxdWVzdEF0dHJpYnV0aW9uVXNlcjsKKyAgICAgICAgICAgICAgICBuc1Jl
cXVlc3QgPSBtdXRhYmxlUmVxdWVzdC5nZXQoKTsKKworICAgICAgICAgICAgICAgIHNlc3Npb24t
PmFwcFByaXZhY3lSZXBvcnRUZXN0aW5nRGF0YSgpLmRpZExvYWRBcHBJbml0aWF0ZWRSZXF1ZXN0
KG5zUmVxdWVzdC5nZXQoKS5hdHRyaWJ1dGlvbiA9PSBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRl
dmVsb3Blcik7CisgICAgICAgICAgICB9CisjZW5kaWYKICAgICAgICAgICAgIHVwZGF0ZUlnbm9y
ZVN0cmljdFRyYW5zcG9ydFNlY3VyaXR5U2V0dGluZyhuc1JlcXVlc3QsIHNob3VsZElnbm9yZUhT
VFMpOwogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobnNSZXF1ZXN0LmdldCgpKTsKICAg
ICAgICAgfSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKaW5kZXggOTg2Y2NmODRkYWNhYzQzNjcwZmMwNTQ5NGZiMTNkNDliZGY3ZWQ0
ZS4uMTMwNDZiYjJjYTQwMDUzZTdlNTExZTM4ZjM2OWM2YTYzYWIyYjJlMSAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDE5IEBACisyMDIxLTA4LTE3ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw
bGUuY29tPgorCisgICAgICAgIFtBcHAgUHJpdmFjeSBSZXBvcnRdIFNvbWUgSFRUUCBSZWRpcmVj
dHMgZnJvbSBub24gYXBwIGluaXRpYXRlZCByZXF1ZXN0cyBhcmUgbWFya2VkIGFwcCBpbml0aWF0
ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTIw
MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzk0Njc4NzE+CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTGF5b3V0IHRlc3QgY292ZXJhZ2UuIFRoaXMg
YnVnIHdhcyBvbmx5IHJlcHJvZHVjaW5nIHdpdGggbWVkaWEtcmVsYXRlZAorICAgICAgICBsb2Fk
aW5nLCBzbyB0aGVzZSB0ZXN0cyByZWRpcmVjdCB0byBsb2FkIGFuIG1wNC4KKworICAgICAgICAq
IGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L2FwcC1hdHRyaWJ1dGlvbi1tZWRpYS1yZWRp
cmVjdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvYXBwLXByaXZh
Y3ktcmVwb3J0L2FwcC1hdHRyaWJ1dGlvbi1tZWRpYS1yZWRpcmVjdC5odG1sOiBBZGRlZC4KKyAg
ICAgICAgKiBodHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1l
ZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9h
cHAtcHJpdmFjeS1yZXBvcnQvdXNlci1hdHRyaWJ1dGlvbi1tZWRpYS1yZWRpcmVjdC5odG1sOiBB
ZGRlZC4KKwogMjAyMS0wOC0xNyAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNv
bT4KIAogICAgICAgICBSZWJhc2VsaW5pbmcgWyBXaW4gRVdTIF0gaHR0cC90ZXN0cy9taXNjL3dl
YnRpbWluZy1zbG93LWxvYWQucHkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz
L2FwcC1wcml2YWN5LXJlcG9ydC9hcHAtYXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QtZXhwZWN0
ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0
dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0
NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yNjAxY2U1
MTMxYmNlYjAwNDRlNmU2NzgzMjkwYTAxYzdhNzhiMzA0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5
b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1l
ZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitUZXN0IG1lZGlhIGZp
bGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBhcHAgaW5pdGlhdGVkCisKK09uIHN1
Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2Vk
IGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBh
cHAgaW5pdGlhdGVkIHJlcXVlc3RzCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisK
K1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAt
cHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0Lmh0bWwgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC9hcHAtYXR0cmlidXRpb24tbWVk
aWEtcmVkaXJlY3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45YzYxNzhmZWZhYzY2MmM4Y2VjZDk4MTA5NTBj
ZjJkYmQ2ZTU4YWY1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9h
cHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0Lmh0bWwKQEAg
LTAsMCArMSw0NSBAQAorPCFET0NUWVBFIGh0bWw+PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBp
c0FwcEluaXRpYXRlZD10cnVlIF0gLS0+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQgc3Jj
PSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor
PGJvZHk+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJUZXN0IG1lZGlhIGZpbGVzIGxvYWRl
ZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBhcHAgaW5pdGlhdGVkIik7CisKKyAgICBmdW5jdGlv
biBsb2cobWVzc2FnZSkKKyAgICB7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdj
b25zb2xlJykuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobWVzc2FnZSArICdc
bicpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICB7CisgICAgICAgIHZhciBk
aWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlkTG9hZEFwcEluaXRpYXRl
ZFJlcXVlc3QoKTsKKyAgICAgICAgdmFyIGRpZExvYWROb25BcHBJbml0aWF0ZWRSZXF1ZXN0ID0g
dGVzdFJ1bm5lci5kaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVzdCgpOworCisgICAgICAgIGlm
IChkaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVzdCkgeworICAgICAgICAgICAgbG9nKCJGQUlM
IGRpZCBsb2FkIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAgICAgIGZpbmlz
aEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYg
KCFkaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCkgeworICAgICAgICAgICAgbG9nKCJGQUlMIGRp
ZCBub3QgbG9hZCBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAgICAgIGZpbmlzaEpT
VGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgbG9nKCJQ
QVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBhcHAgaW5pdGlhdGVkIHJlcXVlc3RzIik7CisK
KyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfQorCisgICAgdmFyIHZpZGVvID0gZG9jdW1l
bnQuY3JlYXRlRWxlbWVudCgidmlkZW8iKTsKKyAgICB2aWRlby5hZGRFdmVudExpc3RlbmVyKCJs
b2FkZWRkYXRhIiwgdGVzdCk7CisgICAgdmlkZW8uc3JjID0gYC9yZXNvdXJjZXMvcmVkaXJlY3Qu
cHk/dXJsPWh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9yZXNvdXJjZXMvdGVzdC5tcDRgOworCisgICAg
d2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4v
Li4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0
bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9y
dC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRl
c3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L3VzZXItYXR0cmlidXRpb24tbWVkaWEt
cmVkaXJlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ5NDdmOTAwYjczYzY1MDcxYzg0ODI4
NWZiYzRjNTk4ZmVhNzM1MmEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl
c3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4
cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitUZXN0IG1lZGlhIGZpbGVzIGxvYWRlZCB2aWEg
cmVkaXJlY3QgYXJlIG1hcmtlZCBub24gYXBwIGluaXRpYXRlZAorCitPbiBzdWNjZXNzLCB5b3Ug
d2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBD
T01QTEVURSIuCisKKworUEFTUyBzdWNjZXNzZnVsbHkgbG9hZGVkIG9ubHkgbm9uIGFwcCBpbml0
aWF0ZWQgcmVxdWVzdHMKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBD
T01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5
LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0Lmh0bWwgYi9MYXlvdXRUZXN0
cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJl
ZGlyZWN0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmU3YzVkZmVhNDhiYWE1MWQ1MWZhOGRmYmNkNTA4NzY0
NjUwYTUwMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXBy
aXZhY3ktcmVwb3J0L3VzZXItYXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QuaHRtbApAQCAtMCww
ICsxLDQ1IEBACis8IURPQ1RZUEUgaHRtbD48IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGlzQXBw
SW5pdGlhdGVkPWZhbHNlIF0gLS0+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQgc3JjPSIu
Li8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJv
ZHk+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJUZXN0IG1lZGlhIGZpbGVzIGxvYWRlZCB2
aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBub24gYXBwIGluaXRpYXRlZCIpOworCisgICAgZnVuY3Rp
b24gbG9nKG1lc3NhZ2UpCisgICAgeworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn
Y29uc29sZScpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UgKyAn
XG4nKSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgeworICAgICAgICB2YXIg
ZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlkTG9hZEFwcEluaXRpYXRlZFJl
cXVlc3QoKTsKKyAgICAgICAgdmFyIGRpZExvYWROb25BcHBCb3VuZFJlcXVlc3QgPSB0ZXN0UnVu
bmVyLmRpZExvYWROb25BcHBJbml0aWF0ZWRSZXF1ZXN0KCk7CisKKyAgICAgICAgaWYgKGRpZExv
YWRBcHBCb3VuZFJlcXVlc3QpIHsKKyAgICAgICAgICAgIGxvZygiRkFJTCBkaWQgbG9hZCBhcHAg
aW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAg
ICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKCFkaWRMb2FkTm9uQXBwQm91
bmRSZXF1ZXN0KSB7CisgICAgICAgICAgICBsb2coIkZBSUwgZGlkIG5vdCBsb2FkIG5vbiBhcHAg
aW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAg
ICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgbG9nKCJQQVNTIHN1Y2Nlc3NmdWxs
eSBsb2FkZWQgb25seSBub24gYXBwIGluaXRpYXRlZCByZXF1ZXN0cyIpOworICAgICAgICAKKyAg
ICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfQorCisgICAgdmFyIHZpZGVvID0gZG9jdW1lbnQu
Y3JlYXRlRWxlbWVudCgidmlkZW8iKTsKKyAgICB2aWRlby5hZGRFdmVudExpc3RlbmVyKCJsb2Fk
ZWRkYXRhIiwgdGVzdCk7CisgICAgdmlkZW8uc3JjID0gYC9yZXNvdXJjZXMvcmVkaXJlY3QucHk/
dXJsPWh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9yZXNvdXJjZXMvdGVzdC5tcDRgOworCisgICAgd2lu
ZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4v
Li4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435767</attachid>
            <date>2021-08-18 07:59:21 -0700</date>
            <delta_ts>2021-08-19 07:13:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229202-20210818105920.patch</filename>
            <type>text/plain</type>
            <size>9661</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg4YzJkZWUwMWViMTUzNDhm
ZGNkZjQ3OTE3OTdmY2JiODFmOWQ4MGEuLmM0NmFiNjU0NjQ3NjBiMzY5MzA3YTU4NDY1NzUzNzQ5
Mjg3N2FkN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDgtMTcgIEthdGUgQ2hl
bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgW0FwcCBQcml2YWN5
IFJlcG9ydF0gU29tZSBIVFRQIFJlZGlyZWN0cyBmcm9tIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVl
c3RzIGFyZSBtYXJrZWQgYXBwIGluaXRpYXRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83OTQ2
Nzg3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU
ZXN0czogaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlh
LXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgICAgICAgIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw
b3J0L3VzZXItYXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QuaHRtbAorCisgICAgICAgIFRoZSBy
ZXF1ZXN0IHJldHVybmVkIGluIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIgb2YKKyAgICAgICAgTmV0
d29ya0RhdGFUYXNrQ29jb2E6OndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uIGRvZXMgbm90IGFs
d2F5cyBoYXZlCisgICAgICAgIHRoZSBhdHRyaWJ1dGlvbiBwcm9wZXJ0eSBvZiB0aGUgb3JpZ2lu
YWwgcmVxdWVzdC4gV2Ugc2hvdWxkIHBhc3MgaXQKKyAgICAgICAgYWxvbmcgYW5kIHNldCBpdC4K
KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06
CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6d2ls
bFBlcmZvcm1IVFRQUmVkaXJlY3Rpb246bmV3UmVxdWVzdDpjb21wbGV0aW9uSGFuZGxlcjpdKToK
KwogMjAyMS0wOC0xNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4K
IAogICAgICAgICBbY3VybF0gS2VwdCBhbGl2ZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXJzIHNob3Vs
ZCBiZSBjYW5jZWxsZWQgYnkgTmV0d29ya0xvYWQ6OmRpZENvbXBsZXRlV2l0aEVycm9yIG9uIFBv
bGljeUFjdGlvbjo6SWdub3JlIG9mIGRpZFJlY2VpdmVSZXNwb25zZQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIv
U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1t
CmluZGV4IDA3MDc3NWJiNWQ4M2I2MjlhZDMyNmQ3MWZlOTBkZGFjYTA5MzVlZTguLjEzOGM0ZTky
OTFkNTMzZTg3ZWJmNDJiY2Q1YjM2ZWYwNTg2ZDIyOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAg
LTU5NywxMyArNTk3LDMxIEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vz
c2lvbiB0YXNrOihOU1VSTFNlc3Npb25UYXNrICopdGFzayB3aWxsUGVyCiAgICAgICAgIFdlYkNv
cmU6OlJlc291cmNlUmVzcG9uc2UgcmVzb3VyY2VSZXNwb25zZShyZXNwb25zZSk7CiAgICAgICAg
IG5ldHdvcmtEYXRhVGFzay0+Y2hlY2tUQU8ocmVzb3VyY2VSZXNwb25zZSk7CiAKLSAgICAgICAg
bmV0d29ya0RhdGFUYXNrLT53aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbihXVEZNb3ZlKHJlc291
cmNlUmVzcG9uc2UpLCByZXF1ZXN0LCBbY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIo
Y29tcGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgc2hvdWxkSWdub3JlSFNUU10oYXV0
byYmIHJlcXVlc3QpIHsKKyAgICAgICAgYm9vbCBpc0FwcEluaXRpYXRlZCA9IHRydWU7CisjaWYg
RU5BQkxFKEFQUF9QUklWQUNZX1JFUE9SVCkKKyAgICAgICAgaXNBcHBJbml0aWF0ZWQgPSByZXF1
ZXN0LmF0dHJpYnV0aW9uID09IE5TVVJMUmVxdWVzdEF0dHJpYnV0aW9uRGV2ZWxvcGVyOworI2Vu
ZGlmCisKKyAgICAgICAgbmV0d29ya0RhdGFUYXNrLT53aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlv
bihXVEZNb3ZlKHJlc291cmNlUmVzcG9uc2UpLCByZXF1ZXN0LCBbc2Vzc2lvbiA9IG5ldHdvcmtE
YXRhVGFzay0+bmV0d29ya1Nlc3Npb24oKSwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQ
dHIoY29tcGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgc2hvdWxkSWdub3JlSFNUUywg
aXNBcHBJbml0aWF0ZWRdKGF1dG8mJiByZXF1ZXN0KSB7CiAjaWYgIUxPR19ESVNBQkxFRAogICAg
ICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxsdSB3aWxsUGVyZm9ybUhUVFBSZWRpcmVj
dGlvbiBjb21wbGV0aW9uSGFuZGxlciAoJXMpIiwgdGFza0lkZW50aWZpZXIsIHJlcXVlc3QudXJs
KCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAjZWxzZQogICAgICAgICAgICAgVU5VU0VEX1BB
UkFNKHRhc2tJZGVudGlmaWVyKTsKICNlbmRpZgogICAgICAgICAgICAgYXV0byBuc1JlcXVlc3Qg
PSByZXRhaW5QdHIocmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6SFRUUEJvZHlVcGRhdGVQ
b2xpY3k6OlVwZGF0ZUhUVFBCb2R5KSk7CisKKyNpZiBFTkFCTEUoQVBQX1BSSVZBQ1lfUkVQT1JU
KQorICAgICAgICAgICAgaWYgKHNlc3Npb24pIHsKKyAgICAgICAgICAgICAgICBSZXRhaW5QdHI8
TlNNdXRhYmxlVVJMUmVxdWVzdD4gbXV0YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtuc1JlcXVlc3Qg
bXV0YWJsZUNvcHldKTsKKyAgICAgICAgICAgICAgICBtdXRhYmxlUmVxdWVzdC5nZXQoKS5hdHRy
aWJ1dGlvbiA9IGlzQXBwSW5pdGlhdGVkID8gTlNVUkxSZXF1ZXN0QXR0cmlidXRpb25EZXZlbG9w
ZXIgOiBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvblVzZXI7CisgICAgICAgICAgICAgICAgbnNSZXF1
ZXN0ID0gbXV0YWJsZVJlcXVlc3QuZ2V0KCk7CisKKyAgICAgICAgICAgICAgICBzZXNzaW9uLT5h
cHBQcml2YWN5UmVwb3J0VGVzdGluZ0RhdGEoKS5kaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdChu
c1JlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24gPT0gTlNVUkxSZXF1ZXN0QXR0cmlidXRpb25EZXZl
bG9wZXIpOworICAgICAgICAgICAgfQorI2Vsc2UKKyAgICAgICAgICAgIFVOVVNFRF9QQVJBTShp
c0FwcEluaXRpYXRlZCk7CisgICAgICAgICAgICBVTlVTRURfUEFSQU0oc2Vzc2lvbik7CisjZW5k
aWYKICAgICAgICAgICAgIHVwZGF0ZUlnbm9yZVN0cmljdFRyYW5zcG9ydFNlY3VyaXR5U2V0dGlu
Zyhuc1JlcXVlc3QsIHNob3VsZElnbm9yZUhTVFMpOwogICAgICAgICAgICAgY29tcGxldGlvbkhh
bmRsZXIobnNSZXF1ZXN0LmdldCgpKTsKICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTg2Y2NmODRkYWNh
YzQzNjcwZmMwNTQ5NGZiMTNkNDliZGY3ZWQ0ZS4uMTMwNDZiYjJjYTQwMDUzZTdlNTExZTM4ZjM2
OWM2YTYzYWIyYjJlMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTE3ICBLYXRlIENo
ZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFtBcHAgUHJpdmFj
eSBSZXBvcnRdIFNvbWUgSFRUUCBSZWRpcmVjdHMgZnJvbSBub24gYXBwIGluaXRpYXRlZCByZXF1
ZXN0cyBhcmUgbWFya2VkIGFwcCBpbml0aWF0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTIwMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzk0
Njc4NzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
TGF5b3V0IHRlc3QgY292ZXJhZ2UuIFRoaXMgYnVnIHdhcyBvbmx5IHJlcHJvZHVjaW5nIHdpdGgg
bWVkaWEtcmVsYXRlZAorICAgICAgICBsb2FkaW5nLCBzbyB0aGVzZSB0ZXN0cyByZWRpcmVjdCB0
byBsb2FkIGFuIG1wNC4KKworICAgICAgICAqIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0
L2FwcC1hdHRyaWJ1dGlvbi1tZWRpYS1yZWRpcmVjdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg
ICAgICAqIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L2FwcC1hdHRyaWJ1dGlvbi1tZWRp
YS1yZWRpcmVjdC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2FwcC1wcml2YWN5
LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dDogQWRk
ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvdXNlci1hdHRyaWJ1
dGlvbi1tZWRpYS1yZWRpcmVjdC5odG1sOiBBZGRlZC4KKwogMjAyMS0wOC0xNyAgQXl1bWkgS29q
aW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWJhc2VsaW5pbmcgWyBX
aW4gRVdTIF0gaHR0cC90ZXN0cy9taXNjL3dlYnRpbWluZy1zbG93LWxvYWQucHkuCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC9hcHAtYXR0cmli
dXRpb24tbWVkaWEtcmVkaXJlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVj
dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi4yNjAxY2U1MTMxYmNlYjAwNDRlNmU2NzgzMjkwYTAxYzdhNzhi
MzA0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFj
eS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApAQCAt
MCwwICsxLDEwIEBACitUZXN0IG1lZGlhIGZpbGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1h
cmtlZCBhcHAgaW5pdGlhdGVkCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBv
ZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNT
IHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBhcHAgaW5pdGlhdGVkIHJlcXVlc3RzCitQQVNTIHN1
Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9u
LW1lZGlhLXJlZGlyZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5
LXJlcG9ydC9hcHAtYXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QuaHRtbApuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45
YzYxNzhmZWZhYzY2MmM4Y2VjZDk4MTA5NTBjZjJkYmQ2ZTU4YWY1Ci0tLSAvZGV2L251bGwKKysr
IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0
aW9uLW1lZGlhLXJlZGlyZWN0Lmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPCFET0NUWVBFIGh0bWw+
PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpc0FwcEluaXRpYXRlZD10cnVlIF0gLS0+Cis8aHRt
bD4KKzxoZWFkPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1w
cmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0
aW9uKCJUZXN0IG1lZGlhIGZpbGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBhcHAg
aW5pdGlhdGVkIik7CisKKyAgICBmdW5jdGlvbiBsb2cobWVzc2FnZSkKKyAgICB7CisgICAgICAg
IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJykuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu
Y3JlYXRlVGV4dE5vZGUobWVzc2FnZSArICdcbicpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0
ZXN0KCkKKyAgICB7CisgICAgICAgIHZhciBkaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCA9IHRl
c3RSdW5uZXIuZGlkTG9hZEFwcEluaXRpYXRlZFJlcXVlc3QoKTsKKyAgICAgICAgdmFyIGRpZExv
YWROb25BcHBJbml0aWF0ZWRSZXF1ZXN0ID0gdGVzdFJ1bm5lci5kaWRMb2FkTm9uQXBwSW5pdGlh
dGVkUmVxdWVzdCgpOworCisgICAgICAgIGlmIChkaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVz
dCkgeworICAgICAgICAgICAgbG9nKCJGQUlMIGRpZCBsb2FkIG5vbiBhcHAgaW5pdGlhdGVkIHJl
cXVlc3QiKTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJu
OworICAgICAgICB9CisKKyAgICAgICAgaWYgKCFkaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCkg
eworICAgICAgICAgICAgbG9nKCJGQUlMIGRpZCBub3QgbG9hZCBhcHAgaW5pdGlhdGVkIHJlcXVl
c3QiKTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOwor
ICAgICAgICB9CisKKyAgICAgICAgbG9nKCJQQVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBh
cHAgaW5pdGlhdGVkIHJlcXVlc3RzIik7CisKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAg
fQorCisgICAgdmFyIHZpZGVvID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidmlkZW8iKTsKKyAg
ICB2aWRlby5hZGRFdmVudExpc3RlbmVyKCJsb2FkZWRkYXRhIiwgdGVzdCk7CisgICAgdmlkZW8u
c3JjID0gYC9yZXNvdXJjZXMvcmVkaXJlY3QucHk/dXJsPWh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9y
ZXNvdXJjZXMvdGVzdC5tcDRgOworCisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOwor
PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5q
cyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGly
ZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw
b3J0L3VzZXItYXR0cmlidXRpb24tbWVkaWEtcmVkaXJlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLmQ5NDdmOTAwYjczYzY1MDcxYzg0ODI4NWZiYzRjNTk4ZmVhNzM1MmEKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0
dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitU
ZXN0IG1lZGlhIGZpbGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBub24gYXBwIGlu
aXRpYXRlZAorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1l
c3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBzdWNjZXNzZnVs
bHkgbG9hZGVkIG9ubHkgbm9uIGFwcCBpbml0aWF0ZWQgcmVxdWVzdHMKK1BBU1Mgc3VjY2Vzc2Z1
bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLW1lZGlh
LXJlZGlyZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9y
dC91c2VyLWF0dHJpYnV0aW9uLW1lZGlhLXJlZGlyZWN0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2
NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmU3YzVk
ZmVhNDhiYWE1MWQ1MWZhOGRmYmNkNTA4NzY0NjUwYTUwMgotLS0gL2Rldi9udWxsCisrKyBiL0xh
eW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L3VzZXItYXR0cmlidXRpb24t
bWVkaWEtcmVkaXJlY3QuaHRtbApAQCAtMCwwICsxLDQ1IEBACis8IURPQ1RZUEUgaHRtbD48IS0t
IHdlYmtpdC10ZXN0LXJ1bm5lciBbIGlzQXBwSW5pdGlhdGVkPWZhbHNlIF0gLS0+Cis8aHRtbD4K
KzxoZWFkPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUu
anMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9u
KCJUZXN0IG1lZGlhIGZpbGVzIGxvYWRlZCB2aWEgcmVkaXJlY3QgYXJlIG1hcmtlZCBub24gYXBw
IGluaXRpYXRlZCIpOworCisgICAgZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCisgICAgeworICAgICAg
ICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmFwcGVuZENoaWxkKGRvY3VtZW50
LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UgKyAnXG4nKSk7CisgICAgfQorCisgICAgZnVuY3Rpb24g
dGVzdCgpCisgICAgeworICAgICAgICB2YXIgZGlkTG9hZEFwcEJvdW5kUmVxdWVzdCA9IHRlc3RS
dW5uZXIuZGlkTG9hZEFwcEluaXRpYXRlZFJlcXVlc3QoKTsKKyAgICAgICAgdmFyIGRpZExvYWRO
b25BcHBCb3VuZFJlcXVlc3QgPSB0ZXN0UnVubmVyLmRpZExvYWROb25BcHBJbml0aWF0ZWRSZXF1
ZXN0KCk7CisKKyAgICAgICAgaWYgKGRpZExvYWRBcHBCb3VuZFJlcXVlc3QpIHsKKyAgICAgICAg
ICAgIGxvZygiRkFJTCBkaWQgbG9hZCBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAg
ICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAg
ICAgICAgaWYgKCFkaWRMb2FkTm9uQXBwQm91bmRSZXF1ZXN0KSB7CisgICAgICAgICAgICBsb2co
IkZBSUwgZGlkIG5vdCBsb2FkIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAgICAg
ICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAg
ICAgICAgbG9nKCJQQVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBub24gYXBwIGluaXRpYXRl
ZCByZXF1ZXN0cyIpOworICAgICAgICAKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfQor
CisgICAgdmFyIHZpZGVvID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidmlkZW8iKTsKKyAgICB2
aWRlby5hZGRFdmVudExpc3RlbmVyKCJsb2FkZWRkYXRhIiwgdGVzdCk7CisgICAgdmlkZW8uc3Jj
ID0gYC9yZXNvdXJjZXMvcmVkaXJlY3QucHk/dXJsPWh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9yZXNv
dXJjZXMvdGVzdC5tcDRgOworCisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9z
Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+
PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>
<flag name="commit-queue"
          id="458756"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>