<?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>225071</bug_id>
          
          <creation_ts>2021-04-26 13:21:48 -0700</creation_ts>
          <short_desc>[ Win ] 4 http/tests/security/contentSecurityPolicy/ tests are failing</short_desc>
          <delta_ts>2021-04-28 13:03:45 -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>Page Loading</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="Truitt Savell">tsavell</reporter>
          <assigned_to name="Chris Gambrell">cgambrell</assigned_to>
          <cc>ap</cc>
    
    <cc>beidson</cc>
    
    <cc>cdumez</cc>
    
    <cc>cgambrell</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>jbedard</cc>
    
    <cc>mkwst</cc>
    
    <cc>webkit-bot-watchers-bugzilla</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1754331</commentid>
    <comment_count>0</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2021-04-26 13:21:48 -0700</bug_when>
    <thetext>http/tests/security/contentSecurityPolicy/audio-redirect-allowed.html [ Failure ]
  http/tests/security/contentSecurityPolicy/audio-redirect-allowed2.html [ Failure ]
  http/tests/security/contentSecurityPolicy/video-redirect-allowed.html [ Failure ]
  http/tests/security/contentSecurityPolicy/video-redirect-allowed2.html [ Failure ]

These 4 tests are failing on windows, they all have the same diff which isn&apos;t very descriptive about that is really failing. 

history:
https://results.webkit.org/?suite=layout-tests&amp;suite=layout-tests&amp;suite=layout-tests&amp;suite=layout-tests&amp;test=http%2Ftests%2Fsecurity%2FcontentSecurityPolicy%2Faudio-redirect-allowed.html&amp;test=http%2Ftests%2Fsecurity%2FcontentSecurityPolicy%2Faudio-redirect-allowed2.html&amp;test=http%2Ftests%2Fsecurity%2FcontentSecurityPolicy%2Fvideo-redirect-allowed.html&amp;test=http%2Ftests%2Fsecurity%2FcontentSecurityPolicy%2Fvideo-redirect-allowed2.html&amp;platform=win

Diff:
--- /home/buildbot/worker/win10-release-tests/build/layout-test-results/http/tests/security/contentSecurityPolicy/audio-redirect-allowed-expected.txt
+++ /home/buildbot/worker/win10-release-tests/build/layout-test-results/http/tests/security/contentSecurityPolicy/audio-redirect-allowed-actual.txt
@@ -1,2 +1,2 @@
-ALERT: PASS
+ALERT: FAIL</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754333</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-26 13:22:35 -0700</bug_when>
    <thetext>&lt;rdar://problem/77172923&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754336</commentid>
    <comment_count>2</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2021-04-26 13:24:51 -0700</bug_when>
    <thetext>This could be related to the move from Python2 to Python3. these tests were last updated in https://trac.webkit.org/changeset/272981/webkit</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754414</commentid>
    <comment_count>3</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-04-26 15:52:40 -0700</bug_when>
    <thetext>Definitely fallout from the PHP to Python migration</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754690</commentid>
    <comment_count>4</comment_count>
      <attachid>427167</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-04-27 10:52:46 -0700</bug_when>
    <thetext>Created attachment 427167
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754691</commentid>
    <comment_count>5</comment_count>
      <attachid>427167</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-04-27 10:54:38 -0700</bug_when>
    <thetext>Comment on attachment 427167
Patch

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

&gt; LayoutTests/http/tests/resources/redirect.py:-16
&gt; -query = {}

Changed the getting the query to the same way the other converted files are using.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754798</commentid>
    <comment_count>6</comment_count>
      <attachid>427199</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-04-27 14:59:44 -0700</bug_when>
    <thetext>Created attachment 427199
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755059</commentid>
    <comment_count>7</comment_count>
      <attachid>427199</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-04-28 10:05:19 -0700</bug_when>
    <thetext>Comment on attachment 427199
Patch

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

&gt; LayoutTests/http/tests/security/canvas-remote-read-data-url-image-redirect.html:68
&gt; +image.src = &quot;http://localhost:8000/resources/redirect.py?url=data:image/png%3bbase64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC&quot;;

Is this bit actually needed with your redirect changes?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755070</commentid>
    <comment_count>8</comment_count>
      <attachid>427277</attachid>
    <who name="Chris Gambrell">cgambrell</who>
    <bug_when>2021-04-28 10:20:51 -0700</bug_when>
    <thetext>Created attachment 427277
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755133</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-28 13:03:43 -0700</bug_when>
    <thetext>Committed r276731 (237132@main): &lt;https://commits.webkit.org/237132@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427277.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427167</attachid>
            <date>2021-04-27 10:52:46 -0700</date>
            <delta_ts>2021-04-27 14:59:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225071-20210427135245.patch</filename>
            <type>text/plain</type>
            <size>3015</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3NjY0NikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI3ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgWyBXaW4gXSA0IGh0dHAvdGVzdHMvc2Vj
dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LyB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MDcxCisgICAgICAgIDxy
ZGFyOi8vcHJvYmxlbS83NzE3MjkyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvcmVzb3VyY2VzL3JlZGlyZWN0LnB5OgorICAg
ICAgICAoYWRkX2NhY2hlX2NvbnRyb2wpOgorICAgICAgICAoYWRkQ2FjaGVDb250cm9sKTogRGVs
ZXRlZC4KKwogMjAyMS0wNC0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg
ICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gQVNTRVJUSU9OIEZBSUxFRDogYW5jZXN0b3ItPnN0
eWxlKCkuY29sdW1uU3BhbigpICE9IENvbHVtblNwYW46OkFsbCB8fCAhaXNWYWxpZENvbHVtblNw
YW5uZXIoZnJhZ21lbnRlZEZsb3csICphbmNlc3RvcikgaW4gV2ViQ29yZTo6aXNWYWxpZENvbHVt
blNwYW5uZXIKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvcmVzb3VyY2VzL3JlZGlyZWN0
LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvcmVzb3VyY2VzL3JlZGly
ZWN0LnB5CShyZXZpc2lvbiAyNzY2MzkpCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Jlc291
cmNlcy9yZWRpcmVjdC5weQkod29ya2luZyBjb3B5KQpAQCAtMSw0MCArMSwzOSBAQAogIyEvdXNy
L2Jpbi9lbnYgcHl0aG9uMworCiBpbXBvcnQgb3MKIGltcG9ydCBzeXMKLQotZnJvbSB1cmxsaWIu
cGFyc2UgaW1wb3J0IHVucXVvdGUKK2Zyb20gdXJsbGliLnBhcnNlIGltcG9ydCBwYXJzZV9xcwog
CiAKLWRlZiBhZGRDYWNoZUNvbnRyb2woYWxsb3dDYWNoZT1UcnVlKToKLSAgICBpZiBhbGxvd0Nh
Y2hlOgotICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCdDYWNoZS1Db250cm9sOiBwdWJsaWMsIG1h
eC1hZ2U9ODY0MDBcclxuJykKK2RlZiBhZGRfY2FjaGVfY29udHJvbChhbGxvd19jYWNoZSk6Cisg
ICAgaWYgYWxsb3dfY2FjaGUgaXMgbm90IE5vbmU6CisgICAgICAgIHN5cy5zdGRvdXQud3JpdGUo
J0NhY2hlLUNvbnRyb2w6IHB1YmxpYywgbWF4LWFnZT04NjQwMFxyXG5cclxuJykKICAgICBlbHNl
OgotICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCdDYWNoZS1Db250cm9sOiBuby1zdG9yZVxyXG4n
KQorICAgICAgICAjIFdvcmthcm91bmQgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD03NzUzOAorICAgICAgICAjIENhY2hpbmcgcmVkaXJlY3RzIHJlc3VsdHMgaW4g
Zmxha2luZXNzIGluIHRlc3RzIHRoYXQgZHVtcCBsb2FkZXIgZGVsZWdhdGVzLgorICAgICAgICBz
eXMuc3Rkb3V0LndyaXRlKCdDYWNoZS1Db250cm9sOiBuby1zdG9yZVxyXG5cclxuJykKIAotc3lz
LnN0ZG91dC53cml0ZSgnQ29udGVudC1UeXBlOiB0ZXh0L2h0bWxcclxuJykKIAotcXVlcnkgPSB7
fQotZm9yIHBhcnQgaW4gb3MuZW52aXJvbi5nZXQoJ1FVRVJZX1NUUklORycsICcnKS5zcGxpdCgn
JicpOgotICAgIGlmIG5vdCBwYXJ0OgotICAgICAgICBjb250aW51ZQotICAgIHF1ZXJ5W3BhcnQu
c3BsaXQoJz0nKVswXV0gPSAnPScuam9pbihwYXJ0LnNwbGl0KCc9JylbMTpdKQotCi11cmwgPSB1
bnF1b3RlKHF1ZXJ5LmdldCgndXJsJywgTm9uZSkpCi1hbGxvd0NhY2hlID0gVHJ1ZSBpZiBxdWVy
eS5nZXQoJ2FsbG93Q2FjaGUnLCBOb25lKSBpcyBub3QgTm9uZSBlbHNlIEZhbHNlCi1yZWZyZXNo
ID0gcXVlcnkuZ2V0KCdyZWZyZXNoJywgTm9uZSkKLWNvZGUgPSBxdWVyeS5nZXQoJ2NvZGUnLCAn
MzAyJykKK3F1ZXJ5ID0gcGFyc2VfcXMob3MuZW52aXJvbi5nZXQoJ1FVRVJZX1NUUklORycsICcn
KSwga2VlcF9ibGFua192YWx1ZXM9VHJ1ZSkKK2FsbG93X2NhY2hlID0gcXVlcnkuZ2V0KCdhbGxv
d0NhY2hlJywgW05vbmVdKVswXQorY29kZSA9IGludChxdWVyeS5nZXQoJ2NvZGUnLCBbMzAyXSlb
MF0pCityZWZyZXNoID0gcXVlcnkuZ2V0KCdyZWZyZXNoJywgW05vbmVdKVswXQordXJsID0gcXVl
cnkuZ2V0KCd1cmwnLCBbJyddKVswXQogCi1pZiByZWZyZXNoOgorc3lzLnN0ZG91dC53cml0ZSgn
Q29udGVudC1UeXBlOiB0ZXh0L2h0bWxcclxuJykKKworaWYgcmVmcmVzaCBpcyBub3QgTm9uZToK
ICAgICBzeXMuc3Rkb3V0LndyaXRlKAogICAgICAgICAnc3RhdHVzOiAyMDBcclxuJwogICAgICAg
ICAnUmVmcmVzaDoge307IHVybD17fVxyXG4nLmZvcm1hdChyZWZyZXNoLCB1cmwpCiAgICAgKQot
ICAgIGFkZENhY2hlQ29udHJvbChhbGxvd0NhY2hlKQotICAgIHN5cy5zdGRvdXQud3JpdGUoJ1xy
XG4nKQorCisgICAgYWRkX2NhY2hlX2NvbnRyb2woYWxsb3dfY2FjaGUpCiAgICAgc3lzLmV4aXQo
MCkKIAotc3lzLnN0ZG91dC53cml0ZSgnc3RhdHVzOiB7fVxyXG4nLmZvcm1hdChjb2RlKSkKLXN5
cy5zdGRvdXQud3JpdGUoJ0xvY2F0aW9uOiB7fVxyXG4nLmZvcm1hdCh1cmwpKQotYWRkQ2FjaGVD
b250cm9sKGFsbG93Q2FjaGUpCi1zeXMuc3Rkb3V0LndyaXRlKCdcclxuJykKK3N5cy5zdGRvdXQu
d3JpdGUoCisgICAgJ3N0YXR1czoge31cclxuJworICAgICdMb2NhdGlvbjoge31cclxuJy5mb3Jt
YXQoY29kZSwgdXJsKQorKQogCithZGRfY2FjaGVfY29udHJvbChhbGxvd19jYWNoZSkK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427199</attachid>
            <date>2021-04-27 14:59:44 -0700</date>
            <delta_ts>2021-04-28 10:20:44 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225071-20210427175942.patch</filename>
            <type>text/plain</type>
            <size>4067</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3NjY2OCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTI3ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgWyBXaW4gXSA0IGh0dHAvdGVzdHMvc2Vj
dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LyB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MDcxCisgICAgICAgIDxy
ZGFyOi8vcHJvYmxlbS83NzE3MjkyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvcmVzb3VyY2VzL3JlZGlyZWN0LnB5OgorICAg
ICAgICAoYWRkX2NhY2hlX2NvbnRyb2wpOgorICAgICAgICAoYWRkQ2FjaGVDb250cm9sKTogRGVs
ZXRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NhbnZhcy1yZW1vdGUtcmVhZC1k
YXRhLXVybC1pbWFnZS1yZWRpcmVjdC5odG1sOgorCiAyMDIxLTA0LTI3ICBBbGV4ZXkgU2h2YXlr
YSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBbSlNDXSBSZW1vdmUgZGVmYXVs
dFZhbHVlKCkgZnJvbSB0aGUgbWV0aG9kIHRhYmxlCkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rl
c3RzL3Jlc291cmNlcy9yZWRpcmVjdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL3Jlc291cmNlcy9yZWRpcmVjdC5weQkocmV2aXNpb24gMjc2NjQ2KQorKysgTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9yZXNvdXJjZXMvcmVkaXJlY3QucHkJKHdvcmtpbmcgY29weSkKQEAg
LTEsNDAgKzEsNTAgQEAKICMhL3Vzci9iaW4vZW52IHB5dGhvbjMKKwogaW1wb3J0IG9zCiBpbXBv
cnQgc3lzCi0KIGZyb20gdXJsbGliLnBhcnNlIGltcG9ydCB1bnF1b3RlCiAKIAotZGVmIGFkZENh
Y2hlQ29udHJvbChhbGxvd0NhY2hlPVRydWUpOgotICAgIGlmIGFsbG93Q2FjaGU6Ci0gICAgICAg
IHN5cy5zdGRvdXQud3JpdGUoJ0NhY2hlLUNvbnRyb2w6IHB1YmxpYywgbWF4LWFnZT04NjQwMFxy
XG4nKQorZGVmIGFkZF9jYWNoZV9jb250cm9sKGFsbG93X2NhY2hlKToKKyAgICBpZiBhbGxvd19j
YWNoZSBpcyBub3QgTm9uZToKKyAgICAgICAgc3lzLnN0ZG91dC53cml0ZSgnQ2FjaGUtQ29udHJv
bDogcHVibGljLCBtYXgtYWdlPTg2NDAwXHJcblxyXG4nKQogICAgIGVsc2U6Ci0gICAgICAgIHN5
cy5zdGRvdXQud3JpdGUoJ0NhY2hlLUNvbnRyb2w6IG5vLXN0b3JlXHJcbicpCisgICAgICAgICMg
V29ya2Fyb3VuZCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3
NTM4CisgICAgICAgICMgQ2FjaGluZyByZWRpcmVjdHMgcmVzdWx0cyBpbiBmbGFraW5lc3MgaW4g
dGVzdHMgdGhhdCBkdW1wIGxvYWRlciBkZWxlZ2F0ZXMuCisgICAgICAgIHN5cy5zdGRvdXQud3Jp
dGUoJ0NhY2hlLUNvbnRyb2w6IG5vLXN0b3JlXHJcblxyXG4nKQogCi1zeXMuc3Rkb3V0LndyaXRl
KCdDb250ZW50LVR5cGU6IHRleHQvaHRtbFxyXG4nKQogCiBxdWVyeSA9IHt9Ci1mb3IgcGFydCBp
biBvcy5lbnZpcm9uLmdldCgnUVVFUllfU1RSSU5HJywgJycpLnNwbGl0KCcmJyk6Ci0gICAgaWYg
bm90IHBhcnQ6Ci0gICAgICAgIGNvbnRpbnVlCi0gICAgcXVlcnlbcGFydC5zcGxpdCgnPScpWzBd
XSA9ICc9Jy5qb2luKHBhcnQuc3BsaXQoJz0nKVsxOl0pCi0KLXVybCA9IHVucXVvdGUocXVlcnku
Z2V0KCd1cmwnLCBOb25lKSkKLWFsbG93Q2FjaGUgPSBUcnVlIGlmIHF1ZXJ5LmdldCgnYWxsb3dD
YWNoZScsIE5vbmUpIGlzIG5vdCBOb25lIGVsc2UgRmFsc2UKLXJlZnJlc2ggPSBxdWVyeS5nZXQo
J3JlZnJlc2gnLCBOb25lKQotY29kZSA9IHF1ZXJ5LmdldCgnY29kZScsICczMDInKQorZm9yIGtl
eV92YWx1ZSBpbiBvcy5lbnZpcm9uLmdldCgnUVVFUllfU1RSSU5HJywgJycpLnNwbGl0KCcmJyk6
CisgICAgYXJyID0ga2V5X3ZhbHVlLnNwbGl0KCc9JykKKyAgICBpZiBsZW4oYXJyKSA+IDE6Cisg
ICAgICAgIGlmIHF1ZXJ5LmdldChhcnJbMF0sIE5vbmUpIGlzIG5vdCBOb25lIGFuZCBhcnJbMV0g
bm90IGluIHF1ZXJ5W2FyclswXV06CisgICAgICAgICAgICBxdWVyeVthcnJbMF1dLmFwcGVuZCh1
bnF1b3RlKCc9Jy5qb2luKGFyclsxOl0pKSkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHF1
ZXJ5W2FyclswXV0gPSBbdW5xdW90ZSgnPScuam9pbihhcnJbMTpdKSldCisgICAgZWxzZToKKyAg
ICAgICAgcXVlcnlbYXJyWzBdXSA9IFsnJ10KKwogCi1pZiByZWZyZXNoOgorYWxsb3dfY2FjaGUg
PSBxdWVyeS5nZXQoJ2FsbG93Q2FjaGUnLCBbTm9uZV0pWzBdCitjb2RlID0gaW50KHF1ZXJ5Lmdl
dCgnY29kZScsIFszMDJdKVswXSkKK3JlZnJlc2ggPSBxdWVyeS5nZXQoJ3JlZnJlc2gnLCBbTm9u
ZV0pWzBdCit1cmwgPSBxdWVyeS5nZXQoJ3VybCcsIFsnJ10pWzBdCisKK3N5cy5zdGRvdXQud3Jp
dGUoJ0NvbnRlbnQtVHlwZTogdGV4dC9odG1sXHJcbicpCisKK2lmIHJlZnJlc2ggaXMgbm90IE5v
bmU6CiAgICAgc3lzLnN0ZG91dC53cml0ZSgKICAgICAgICAgJ3N0YXR1czogMjAwXHJcbicKICAg
ICAgICAgJ1JlZnJlc2g6IHt9OyB1cmw9e31cclxuJy5mb3JtYXQocmVmcmVzaCwgdXJsKQogICAg
ICkKLSAgICBhZGRDYWNoZUNvbnRyb2woYWxsb3dDYWNoZSkKLSAgICBzeXMuc3Rkb3V0LndyaXRl
KCdcclxuJykKKworICAgIGFkZF9jYWNoZV9jb250cm9sKGFsbG93X2NhY2hlKQogICAgIHN5cy5l
eGl0KDApCiAKLXN5cy5zdGRvdXQud3JpdGUoJ3N0YXR1czoge31cclxuJy5mb3JtYXQoY29kZSkp
Ci1zeXMuc3Rkb3V0LndyaXRlKCdMb2NhdGlvbjoge31cclxuJy5mb3JtYXQodXJsKSkKLWFkZENh
Y2hlQ29udHJvbChhbGxvd0NhY2hlKQotc3lzLnN0ZG91dC53cml0ZSgnXHJcbicpCitzeXMuc3Rk
b3V0LndyaXRlKAorICAgICdzdGF0dXM6IHt9XHJcbicKKyAgICAnTG9jYXRpb246IHt9XHJcbicu
Zm9ybWF0KGNvZGUsIHVybCkKKykKIAorYWRkX2NhY2hlX2NvbnRyb2woYWxsb3dfY2FjaGUpCklu
ZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NhbnZhcy1yZW1vdGUtcmVhZC1k
YXRhLXVybC1pbWFnZS1yZWRpcmVjdC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0
dHAvdGVzdHMvc2VjdXJpdHkvY2FudmFzLXJlbW90ZS1yZWFkLWRhdGEtdXJsLWltYWdlLXJlZGly
ZWN0Lmh0bWwJKHJldmlzaW9uIDI3NjY0NikKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj
dXJpdHkvY2FudmFzLXJlbW90ZS1yZWFkLWRhdGEtdXJsLWltYWdlLXJlZGlyZWN0Lmh0bWwJKHdv
cmtpbmcgY29weSkKQEAgLTY1LDUgKzY1LDUgQEAgaW1hZ2Uub25sb2FkID0gZnVuY3Rpb24oKSB7
CiAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwogfQogCi1pbWFnZS5zcmMgPSAiaHR0
cDovL2xvY2FsaG9zdDo4MDAwL3Jlc291cmNlcy9yZWRpcmVjdC5weT91cmw9ZGF0YTppbWFnZS9w
bmc7YmFzZTY0LGlWQk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFBRUFBQUFCQ0FJQUFBQ1FkMVBlQUFB
QURFbEVRVlI0Mm1QNCUyRjU4QkFBVCUyRkFmOWpnTkVyQUFBQUFFbEZUa1N1UW1DQyI7CitpbWFn
ZS5zcmMgPSAiaHR0cDovL2xvY2FsaG9zdDo4MDAwL3Jlc291cmNlcy9yZWRpcmVjdC5weT91cmw9
ZGF0YTppbWFnZS9wbmclM2JiYXNlNjQsaVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQUFFQUFBQUJD
QUlBQUFDUWQxUGVBQUFBREVsRVFWUjQybVA0JTJGNThCQUFUJTJGQWY5amdORXJBQUFBQUVsRlRr
U3VRbUNDIjsKIDwvc2NyaXB0Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427277</attachid>
            <date>2021-04-28 10:20:51 -0700</date>
            <delta_ts>2021-04-28 13:03:44 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225071-20210428132049.patch</filename>
            <type>text/plain</type>
            <size>3143</size>
            <attacher name="Chris Gambrell">cgambrell</attacher>
            
              <data encoding="base64">SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDI3NjcxOSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y
a2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI4ICBDaHJpcyBHYW1icmVsbCAg
PGNnYW1icmVsbEBhcHBsZS5jb20+CisKKyAgICAgICAgWyBXaW4gXSA0IGh0dHAvdGVzdHMvc2Vj
dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5LyB0ZXN0cyBhcmUgZmFpbGluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MDcxCisgICAgICAgIDxy
ZGFyOi8vcHJvYmxlbS83NzE3MjkyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvcmVzb3VyY2VzL3JlZGlyZWN0LnB5OgorICAg
ICAgICAoYWRkX2NhY2hlX2NvbnRyb2wpOgorICAgICAgICAoYWRkQ2FjaGVDb250cm9sKTogRGVs
ZXRlZC4KKwogMjAyMS0wNC0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK
ICAgICAgICAgU2V0IGF1ZGlvIHRyYW5zY2VpdmVyIG5NYXggdG8gMQpJbmRleDogTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9yZXNvdXJjZXMvcmVkaXJlY3QucHkKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9yZXNvdXJjZXMvcmVkaXJlY3QucHkJKHJldmlzaW9uIDI3NjcxOCkK
KysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvcmVzb3VyY2VzL3JlZGlyZWN0LnB5CSh3b3JraW5n
IGNvcHkpCkBAIC0xLDQwICsxLDUwIEBACiAjIS91c3IvYmluL2VudiBweXRob24zCisKIGltcG9y
dCBvcwogaW1wb3J0IHN5cwotCiBmcm9tIHVybGxpYi5wYXJzZSBpbXBvcnQgdW5xdW90ZQogCiAK
LWRlZiBhZGRDYWNoZUNvbnRyb2woYWxsb3dDYWNoZT1UcnVlKToKLSAgICBpZiBhbGxvd0NhY2hl
OgotICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCdDYWNoZS1Db250cm9sOiBwdWJsaWMsIG1heC1h
Z2U9ODY0MDBcclxuJykKK2RlZiBhZGRfY2FjaGVfY29udHJvbChhbGxvd19jYWNoZSk6CisgICAg
aWYgYWxsb3dfY2FjaGUgaXMgbm90IE5vbmU6CisgICAgICAgIHN5cy5zdGRvdXQud3JpdGUoJ0Nh
Y2hlLUNvbnRyb2w6IHB1YmxpYywgbWF4LWFnZT04NjQwMFxyXG5cclxuJykKICAgICBlbHNlOgot
ICAgICAgICBzeXMuc3Rkb3V0LndyaXRlKCdDYWNoZS1Db250cm9sOiBuby1zdG9yZVxyXG4nKQor
ICAgICAgICAjIFdvcmthcm91bmQgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD03NzUzOAorICAgICAgICAjIENhY2hpbmcgcmVkaXJlY3RzIHJlc3VsdHMgaW4gZmxh
a2luZXNzIGluIHRlc3RzIHRoYXQgZHVtcCBsb2FkZXIgZGVsZWdhdGVzLgorICAgICAgICBzeXMu
c3Rkb3V0LndyaXRlKCdDYWNoZS1Db250cm9sOiBuby1zdG9yZVxyXG5cclxuJykKIAotc3lzLnN0
ZG91dC53cml0ZSgnQ29udGVudC1UeXBlOiB0ZXh0L2h0bWxcclxuJykKIAogcXVlcnkgPSB7fQot
Zm9yIHBhcnQgaW4gb3MuZW52aXJvbi5nZXQoJ1FVRVJZX1NUUklORycsICcnKS5zcGxpdCgnJicp
OgotICAgIGlmIG5vdCBwYXJ0OgotICAgICAgICBjb250aW51ZQotICAgIHF1ZXJ5W3BhcnQuc3Bs
aXQoJz0nKVswXV0gPSAnPScuam9pbihwYXJ0LnNwbGl0KCc9JylbMTpdKQotCi11cmwgPSB1bnF1
b3RlKHF1ZXJ5LmdldCgndXJsJywgTm9uZSkpCi1hbGxvd0NhY2hlID0gVHJ1ZSBpZiBxdWVyeS5n
ZXQoJ2FsbG93Q2FjaGUnLCBOb25lKSBpcyBub3QgTm9uZSBlbHNlIEZhbHNlCi1yZWZyZXNoID0g
cXVlcnkuZ2V0KCdyZWZyZXNoJywgTm9uZSkKLWNvZGUgPSBxdWVyeS5nZXQoJ2NvZGUnLCAnMzAy
JykKK2ZvciBrZXlfdmFsdWUgaW4gb3MuZW52aXJvbi5nZXQoJ1FVRVJZX1NUUklORycsICcnKS5z
cGxpdCgnJicpOgorICAgIGFyciA9IGtleV92YWx1ZS5zcGxpdCgnPScpCisgICAgaWYgbGVuKGFy
cikgPiAxOgorICAgICAgICBpZiBxdWVyeS5nZXQoYXJyWzBdLCBOb25lKSBpcyBub3QgTm9uZSBh
bmQgYXJyWzFdIG5vdCBpbiBxdWVyeVthcnJbMF1dOgorICAgICAgICAgICAgcXVlcnlbYXJyWzBd
XS5hcHBlbmQodW5xdW90ZSgnPScuam9pbihhcnJbMTpdKSkpCisgICAgICAgIGVsc2U6CisgICAg
ICAgICAgICBxdWVyeVthcnJbMF1dID0gW3VucXVvdGUoJz0nLmpvaW4oYXJyWzE6XSkpXQorICAg
IGVsc2U6CisgICAgICAgIHF1ZXJ5W2FyclswXV0gPSBbJyddCisKIAotaWYgcmVmcmVzaDoKK2Fs
bG93X2NhY2hlID0gcXVlcnkuZ2V0KCdhbGxvd0NhY2hlJywgW05vbmVdKVswXQorY29kZSA9IGlu
dChxdWVyeS5nZXQoJ2NvZGUnLCBbMzAyXSlbMF0pCityZWZyZXNoID0gcXVlcnkuZ2V0KCdyZWZy
ZXNoJywgW05vbmVdKVswXQordXJsID0gcXVlcnkuZ2V0KCd1cmwnLCBbJyddKVswXQorCitzeXMu
c3Rkb3V0LndyaXRlKCdDb250ZW50LVR5cGU6IHRleHQvaHRtbFxyXG4nKQorCitpZiByZWZyZXNo
IGlzIG5vdCBOb25lOgogICAgIHN5cy5zdGRvdXQud3JpdGUoCiAgICAgICAgICdzdGF0dXM6IDIw
MFxyXG4nCiAgICAgICAgICdSZWZyZXNoOiB7fTsgdXJsPXt9XHJcbicuZm9ybWF0KHJlZnJlc2gs
IHVybCkKICAgICApCi0gICAgYWRkQ2FjaGVDb250cm9sKGFsbG93Q2FjaGUpCi0gICAgc3lzLnN0
ZG91dC53cml0ZSgnXHJcbicpCisKKyAgICBhZGRfY2FjaGVfY29udHJvbChhbGxvd19jYWNoZSkK
ICAgICBzeXMuZXhpdCgwKQogCi1zeXMuc3Rkb3V0LndyaXRlKCdzdGF0dXM6IHt9XHJcbicuZm9y
bWF0KGNvZGUpKQotc3lzLnN0ZG91dC53cml0ZSgnTG9jYXRpb246IHt9XHJcbicuZm9ybWF0KHVy
bCkpCi1hZGRDYWNoZUNvbnRyb2woYWxsb3dDYWNoZSkKLXN5cy5zdGRvdXQud3JpdGUoJ1xyXG4n
KQorc3lzLnN0ZG91dC53cml0ZSgKKyAgICAnc3RhdHVzOiB7fVxyXG4nCisgICAgJ0xvY2F0aW9u
OiB7fVxyXG4nLmZvcm1hdChjb2RlLCB1cmwpCispCiAKK2FkZF9jYWNoZV9jb250cm9sKGFsbG93
X2NhY2hlKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>