<?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>225154</bug_id>
          
          <creation_ts>2021-04-28 09:57:00 -0700</creation_ts>
          <short_desc>Add SPI to query whether a URL would be upgraded to HTTPS</short_desc>
          <delta_ts>2021-04-28 12:00:41 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Alex Christensen">achristensen</reporter>
          <assigned_to name="Alex Christensen">achristensen</assigned_to>
          <cc>ggaren</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1755052</commentid>
    <comment_count>0</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-04-28 09:57:00 -0700</bug_when>
    <thetext>Add SPI to query whether a URL would be upgraded to HTTPS</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755053</commentid>
    <comment_count>1</comment_count>
      <attachid>427271</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-04-28 09:57:59 -0700</bug_when>
    <thetext>Created attachment 427271
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755054</commentid>
    <comment_count>2</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-04-28 09:58:02 -0700</bug_when>
    <thetext>&lt;rdar://problem/77269904&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755057</commentid>
    <comment_count>3</comment_count>
      <attachid>427271</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-04-28 10:03:28 -0700</bug_when>
    <thetext>Comment on attachment 427271
Patch

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

r=me -- but let&apos;s consider another name

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:249
&gt; ++ (BOOL)_shouldUpgradeToHTTPS:(NSURL *)url WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));

I think I would call this _willUpgradeToHTTPS, since it&apos;s a question about what the WebView will do.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755060</commentid>
    <comment_count>4</comment_count>
      <attachid>427274</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-04-28 10:06:14 -0700</bug_when>
    <thetext>Created attachment 427274
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755109</commentid>
    <comment_count>5</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-04-28 12:00:41 -0700</bug_when>
    <thetext>r276727</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427271</attachid>
            <date>2021-04-28 09:57:59 -0700</date>
            <delta_ts>2021-04-28 10:06:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225154-20210428095759.patch</filename>
            <type>text/plain</type>
            <size>6961</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVmYTdiZDc5NDc0MjBh
MmI5ZTViNjc3MmEyNTIwNGQxYzQ2MDJkYS4uMzllODBjODZkNjk3ZDBlZmI5YmFmYTkxODZiZmYx
NWEwNjA0ZjZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTI4ICBBbGV4
IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFNQ
SSB0byBxdWVyeSB3aGV0aGVyIGEgVVJMIHdvdWxkIGJlIHVwZ3JhZGVkIHRvIEhUVFBTCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxNTQKKyAgICAg
ICAgPHJkYXI6Ly83NzI2OTkwND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBDb3ZlcmVkIGJ5IEFQSSB0ZXN0cy4KKworICAgICAgICAqIGNvbnRlbnRl
eHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3Jl
OjpDb250ZW50RXh0ZW5zaW9uczo6Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpzaG91bGRCZU1h
ZGVTZWN1cmUpOgorICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25z
QmFja2VuZC5oOgorCiAyMDIxLTA0LTI3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv
bT4KIAogICAgICAgICBTV0NvbnRleHRNYW5hZ2VyOjpwb3N0TWVzc2FnZVRvU2VydmljZVdvcmtl
ciBzaG91bGQgY2hlY2sgZm9yIHZhbGlkIHNlcnZpY2Ugd29ya2VyCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDczMzBj
OGQ2MzQzNDY1ZTE3MDlhYjE3NTNmNjE2NTBjNDdjNGYyZWMuLmNjNWUzYjM0ZTE3MzBiZTc5MDUx
NjZlZjU0NjY1NTUzZTQzMmY5YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n
CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDQt
MjggIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAg
ICBBZGQgU1BJIHRvIHF1ZXJ5IHdoZXRoZXIgYSBVUkwgd291bGQgYmUgdXBncmFkZWQgdG8gSFRU
UFMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTE1
NAorICAgICAgICA8cmRhcjovLzc3MjY5OTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06
CisgICAgICAgICgrW1dLV2ViVmlldyBfc2hvdWxkVXBncmFkZVRvSFRUUFM6XSk6CisgICAgICAg
ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmg6CisKIDIwMjEtMDQtMjcg
IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbSVBDIEhhcmRlbmlu
Z10gTWFrZSBzdXJlIElQQzo6RGVjb2RlciBjb25zdHJ1Y3RvcnMgY29uc2lzdGVudGx5IGNhbGwg
bWFya0ludmFsaWQoKSB3aGVuIGRlY29kaW5nIGZhaWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwIGIvU291
cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNw
cAppbmRleCAzNDljNTE2MGZkNWE4NzdmOWVmM2E1Y2Q5YjYwMDY0MjEwNDgwYmJkLi4wYjQwMjcy
NzA1ZjExMmQ1ODVkZDVmODIyMGRmMGI1ZjhiMzEyMjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2Vu
ZC5jcHAKQEAgLTcxLDYgKzcxLDEzIEBAIHN0YXRpYyB2b2lkIG1ha2VTZWN1cmVJZk5lY2Vzc2Fy
eShDb250ZW50UnVsZUxpc3RSZXN1bHRzJiByZXN1bHRzLCBjb25zdCBVUkwmIHVyCiB9CiAjZW5k
aWYKIAorYm9vbCBDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6OnNob3VsZEJlTWFkZVNlY3VyZShj
b25zdCBVUkwmIHVybCkKK3sKKyAgICBDb250ZW50UnVsZUxpc3RSZXN1bHRzIHJlc3VsdHM7Cisg
ICAgbWFrZVNlY3VyZUlmTmVjZXNzYXJ5KHJlc3VsdHMsIHVybCk7CisgICAgcmV0dXJuIHJlc3Vs
dHMuc3VtbWFyeS5tYWRlSFRUUFM7Cit9CisKIHZvaWQgQ29udGVudEV4dGVuc2lvbnNCYWNrZW5k
OjphZGRDb250ZW50RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgUmVmPENvbXBp
bGVkQ29udGVudEV4dGVuc2lvbj4gY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uLCBDb250ZW50RXh0
ZW5zaW9uOjpTaG91bGRDb21waWxlQ1NTIHNob3VsZENvbXBpbGVDU1MpCiB7CiAgICAgQVNTRVJU
KCFpZGVudGlmaWVyLmlzRW1wdHkoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250
ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3Jl
L2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oCmluZGV4IDFmMThh
NWI1YjQ4ZTUzMmM3ODUxYjRkY2FiMDU0ZjBmNDRiNWY0NTYuLjExY2RmY2Q1YTRkOWZjY2EwNTky
NjAwMDMyMmEzOTgzN2QzY2ZiMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRl
eHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oCkBAIC03MCw2ICs3
MCw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZm9yRWFjaChjb25zdCBGdW5jdGlvbjx2b2lkKGNv
bnN0IFN0cmluZyYsIENvbnRlbnRFeHRlbnNpb24mKT4mKTsKIAorICAgIFdFQkNPUkVfRVhQT1JU
IHN0YXRpYyBib29sIHNob3VsZEJlTWFkZVNlY3VyZShjb25zdCBVUkwmKTsKKwogcHJpdmF0ZToK
ICAgICBIYXNoTWFwPFN0cmluZywgUmVmPENvbnRlbnRFeHRlbnNpb24+PiBtX2NvbnRlbnRFeHRl
bnNpb25zOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv
YS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW
aWV3Lm1tCmluZGV4IDBhNWYxYTFmM2M3MTI0YmJhY2QwYzNlYTA2Y2IwOTkwN2JiY2IwOTUuLjYw
YzVkNzUzNWUyMDhlZjUyYWU0ODI3MzNmZWNjMDcxODUzMTY3N2YgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTI0LDYgKzEyNCw3IEBA
CiAjaW1wb3J0IDxXZWJDb3JlL0F0dHJpYnV0ZWRTdHJpbmcuaD4KICNpbXBvcnQgPFdlYkNvcmUv
Q29sb3JDb2NvYS5oPgogI2ltcG9ydCA8V2ViQ29yZS9Db2xvclNlcmlhbGl6YXRpb24uaD4KKyNp
bXBvcnQgPFdlYkNvcmUvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmg+CiAjaW1wb3J0IDxXZWJD
b3JlL0VsZW1lbnRDb250ZXh0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0pTRE9NQmluZGluZy5oPgog
I2ltcG9ydCA8V2ViQ29yZS9KU0RPTUV4Y2VwdGlvbkhhbmRsaW5nLmg+CkBAIC0yNTE3LDYgKzI1
MTgsMTEgQEAgc3RhdGljIHZvaWQgY29udmVydEFuZEFkZEhpZ2hsaWdodChWZWN0b3I8UmVmPFdl
YktpdDo6U2hhcmVkTWVtb3J5Pj4mIGJ1ZmZlcnMsIE4KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAor
KyAoQk9PTClfc2hvdWxkVXBncmFkZVRvSFRUUFM6KE5TVVJMICopdXJsCit7CisgICAgcmV0dXJu
IFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6OnNo
b3VsZEJlTWFkZVNlY3VyZSh1cmwpOworfQorCiAtICh2b2lkKV9zaG93U2FmZUJyb3dzaW5nV2Fy
bmluZ1dpdGhUaXRsZTooTlNTdHJpbmcgKil0aXRsZSB3YXJuaW5nOihOU1N0cmluZyAqKXdhcm5p
bmcgZGV0YWlsczooTlNBdHRyaWJ1dGVkU3RyaW5nICopZGV0YWlscyBjb21wbGV0aW9uSGFuZGxl
cjoodm9pZCheKShCT09MKSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIFtzZWxmIF9zaG93U2Fm
ZUJyb3dzaW5nV2FybmluZ1dpdGhVUkw6bmlsIHRpdGxlOnRpdGxlIHdhcm5pbmc6d2FybmluZyBk
ZXRhaWxzV2l0aExpbmtzOmRldGFpbHMgY29tcGxldGlvbkhhbmRsZXI6XihCT09MIGNvbnRpbnVl
VW5zYWZlTG9hZCwgTlNVUkwgKnVybCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXggNTVkMDE5ZGVhZmIyZDJiYmE0
Mzc0ZDYzNTJmZTY3MzU1YmIxZjU0OC4uODBhOWMwMzc2ZTJlMWJlMjc3YjJjOWZiNjllMjdjZmFk
ZGYyYzMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL
V2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev
V0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC0yNDYsNiArMjQ2LDggQEAgZm9yIHRoaXMgcHJvcGVydHku
CiAKIC0gKHZvaWQpX3NpbXVsYXRlRGV2aWNlT3JpZW50YXRpb25DaGFuZ2VXaXRoQWxwaGE6KGRv
dWJsZSlhbHBoYSBiZXRhOihkb3VibGUpYmV0YSBnYW1tYTooZG91YmxlKWdhbW1hIFdLX0FQSV9B
VkFJTEFCTEUobWFjb3MoMTAuMTQuNCksIGlvcygxMi4yKSk7CiAKKysgKEJPT0wpX3Nob3VsZFVw
Z3JhZGVUb0hUVFBTOihOU1VSTCAqKXVybCBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19U
QkEpLCBpb3MoV0tfSU9TX1RCQSkpOworCiArIChCT09MKV9oYW5kbGVzU2FmZUJyb3dzaW5nIFdL
X0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQuNCksIGlvcygxMi4yKSk7CiArIChOU1VSTCAqKV9j
b25maXJtTWFsd2FyZVNlbnRpbmVsIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQuNCksIGlv
cygxMi4yKSk7CiArIChOU1VSTCAqKV92aXNpdFVuc2FmZVdlYnNpdGVTZW50aW5lbCBXS19BUElf
QVZBSUxBQkxFKG1hY29zKDEwLjE0LjQpLCBpb3MoMTIuMikpOwpkaWZmIC0tZ2l0IGEvVG9vbHMv
Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDc3N2MxYTg3MmU4NDA4MDdjMTAwZWNh
YjA2NzcwYTM0ZDg5NzdlODMuLmNmYzYyYzQ0ZmU4MmMzZDc2M2M4MGQyNWI4MzQwOTg3NGE4ZDEx
NjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNCBAQAorMjAyMS0wNC0yOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl
bkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBTUEkgdG8gcXVlcnkgd2hldGhlciBhIFVSTCB3
b3VsZCBiZSB1cGdyYWRlZCB0byBIVFRQUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MTU0CisgICAgICAgIDxyZGFyOi8vNzcyNjk5MDQ+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0
QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW06CisgICAgICAg
IChURVNUKToKKwogMjAyMS0wNC0yNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3
ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjc1OTEyLgpkaWZm
IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdD
b25maWd1cmF0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X
S1dlYlZpZXdDb25maWd1cmF0aW9uLm1tCmluZGV4IDViZjZkYTkzZGI2OWM1OWI2MDIxZThhYmY5
ZWU0NGIyN2Q1YmFmN2EuLmZkZmVkZTcxNGFiOTY0NTRmYzJhMTM2YTczNTRhODcwOGRlZTQwMmEg
MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJW
aWV3Q29uZmlndXJhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp
dENvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW0KQEAgLTE0Myw0ICsxNDMsOSBAQCBURVNU
KFdlYktpdCwgQ29uZmlndXJhdGlvbkhUVFBTVXBncmFkZSkKICAgICBjaGVja1JlcXVlc3RCeXRl
c1N0YXJ0c1dpdGgoIkNPTk5FQ1Qgd3d3Lm9wZW5nbC5vcmc6NDQzIEhUVFAvMS4xXHJcbiIpOwog
ICAgIHJ1blRlc3QoZmFsc2UpOwogICAgIGNoZWNrUmVxdWVzdEJ5dGVzU3RhcnRzV2l0aCgiR0VU
IGh0dHA6Ly93d3cub3BlbmdsLm9yZy8gSFRUUC8xLjFcclxuIik7CisgICAgCisgICAgRVhQRUNU
X1RSVUUoW1dLV2ViVmlldyBfc2hvdWxkVXBncmFkZVRvSFRUUFM6W05TVVJMIFVSTFdpdGhTdHJp
bmc6QCJodHRwOi8vd3d3Lm9wZW5nbC5vcmcvIl1dKTsKKyAgICBFWFBFQ1RfRkFMU0UoW1dLV2Vi
VmlldyBfc2hvdWxkVXBncmFkZVRvSFRUUFM6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwczov
L3d3dy5vcGVuZ2wub3JnLyJdXSk7CisgICAgRVhQRUNUX0ZBTFNFKFtXS1dlYlZpZXcgX3Nob3Vs
ZFVwZ3JhZGVUb0hUVFBTOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiY3VzdG9tLXNjaGVtZTovL3d3
dy5vcGVuZ2wub3JnLyJdXSk7CisgICAgRVhQRUNUX0ZBTFNFKFtXS1dlYlZpZXcgX3Nob3VsZFVw
Z3JhZGVUb0hUVFBTOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4YW1wbGUuY29tLyJd
XSk7CiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427274</attachid>
            <date>2021-04-28 10:06:14 -0700</date>
            <delta_ts>2021-04-28 10:13:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225154-20210428100613.patch</filename>
            <type>text/plain</type>
            <size>6940</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVmYTdiZDc5NDc0MjBh
MmI5ZTViNjc3MmEyNTIwNGQxYzQ2MDJkYS4uYmY0MjI4YWNiMTk3MzRmMGQxOWQyN2MyMjc2ZWY0
NTU3MjE1OGYyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTI4ICBBbGV4
IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFNQ
SSB0byBxdWVyeSB3aGV0aGVyIGEgVVJMIHdvdWxkIGJlIHVwZ3JhZGVkIHRvIEhUVFBTCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxNTQKKyAgICAg
ICAgPHJkYXI6Ly83NzI2OTkwND4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4K
KworICAgICAgICBDb3ZlcmVkIGJ5IEFQSSB0ZXN0cy4KKworICAgICAgICAqIGNvbnRlbnRleHRl
bnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD
b250ZW50RXh0ZW5zaW9uczo6Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpzaG91bGRCZU1hZGVT
ZWN1cmUpOgorICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFj
a2VuZC5oOgorCiAyMDIxLTA0LTI3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K
IAogICAgICAgICBTV0NvbnRleHRNYW5hZ2VyOjpwb3N0TWVzc2FnZVRvU2VydmljZVdvcmtlciBz
aG91bGQgY2hlY2sgZm9yIHZhbGlkIHNlcnZpY2Ugd29ya2VyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDczMzBjOGQ2
MzQzNDY1ZTE3MDlhYjE3NTNmNjE2NTBjNDdjNGYyZWMuLjA1NWUzMzViN2U2MWJkOWQ1M2VhOTdh
ZjI3YWIzYjJmMGE1NjhhMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisr
KyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDQtMjgg
IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBB
ZGQgU1BJIHRvIHF1ZXJ5IHdoZXRoZXIgYSBVUkwgd291bGQgYmUgdXBncmFkZWQgdG8gSFRUUFMK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTE1NAor
ICAgICAgICA8cmRhcjovLzc3MjY5OTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdh
cmVuLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAg
ICAgICgrW1dLV2ViVmlldyBfc2hvdWxkVXBncmFkZVRvSFRUUFM6XSk6CisgICAgICAgICogVUlQ
cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmg6CisKIDIwMjEtMDQtMjcgIENocmlz
IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbSVBDIEhhcmRlbmluZ10gTWFr
ZSBzdXJlIElQQzo6RGVjb2RlciBjb25zdHJ1Y3RvcnMgY29uc2lzdGVudGx5IGNhbGwgbWFya0lu
dmFsaWQoKSB3aGVuIGRlY29kaW5nIGZhaWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j
b250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwIGIvU291cmNlL1dl
YkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcAppbmRl
eCAzNDljNTE2MGZkNWE4NzdmOWVmM2E1Y2Q5YjYwMDY0MjEwNDgwYmJkLi4wYjQwMjcyNzA1ZjEx
MmQ1ODVkZDVmODIyMGRmMGI1ZjhiMzEyMjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j
b250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHAK
QEAgLTcxLDYgKzcxLDEzIEBAIHN0YXRpYyB2b2lkIG1ha2VTZWN1cmVJZk5lY2Vzc2FyeShDb250
ZW50UnVsZUxpc3RSZXN1bHRzJiByZXN1bHRzLCBjb25zdCBVUkwmIHVyCiB9CiAjZW5kaWYKIAor
Ym9vbCBDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6OnNob3VsZEJlTWFkZVNlY3VyZShjb25zdCBV
UkwmIHVybCkKK3sKKyAgICBDb250ZW50UnVsZUxpc3RSZXN1bHRzIHJlc3VsdHM7CisgICAgbWFr
ZVNlY3VyZUlmTmVjZXNzYXJ5KHJlc3VsdHMsIHVybCk7CisgICAgcmV0dXJuIHJlc3VsdHMuc3Vt
bWFyeS5tYWRlSFRUUFM7Cit9CisKIHZvaWQgQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjphZGRD
b250ZW50RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgUmVmPENvbXBpbGVkQ29u
dGVudEV4dGVuc2lvbj4gY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uLCBDb250ZW50RXh0ZW5zaW9u
OjpTaG91bGRDb21waWxlQ1NTIHNob3VsZENvbXBpbGVDU1MpCiB7CiAgICAgQVNTRVJUKCFpZGVu
dGlmaWVyLmlzRW1wdHkoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0
ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL2NvbnRl
bnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oCmluZGV4IDFmMThhNWI1YjQ4
ZTUzMmM3ODUxYjRkY2FiMDU0ZjBmNDRiNWY0NTYuLjExY2RmY2Q1YTRkOWZjY2EwNTkyNjAwMDMy
MmEzOTgzN2QzY2ZiMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNp
b25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRl
bnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5oCkBAIC03MCw2ICs3MCw4IEBA
IHB1YmxpYzoKIAogICAgIHZvaWQgZm9yRWFjaChjb25zdCBGdW5jdGlvbjx2b2lkKGNvbnN0IFN0
cmluZyYsIENvbnRlbnRFeHRlbnNpb24mKT4mKTsKIAorICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp
YyBib29sIHNob3VsZEJlTWFkZVNlY3VyZShjb25zdCBVUkwmKTsKKwogcHJpdmF0ZToKICAgICBI
YXNoTWFwPFN0cmluZywgUmVmPENvbnRlbnRFeHRlbnNpb24+PiBtX2NvbnRlbnRFeHRlbnNpb25z
OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl
YlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t
CmluZGV4IDBhNWYxYTFmM2M3MTI0YmJhY2QwYzNlYTA2Y2IwOTkwN2JiY2IwOTUuLjdmM2FiOGY0
MWUyNmRlYzc4NDgwMjVhZTIzY2RmOWU0YzY5Nzk1MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTI0LDYgKzEyNCw3IEBACiAjaW1w
b3J0IDxXZWJDb3JlL0F0dHJpYnV0ZWRTdHJpbmcuaD4KICNpbXBvcnQgPFdlYkNvcmUvQ29sb3JD
b2NvYS5oPgogI2ltcG9ydCA8V2ViQ29yZS9Db2xvclNlcmlhbGl6YXRpb24uaD4KKyNpbXBvcnQg
PFdlYkNvcmUvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0Vs
ZW1lbnRDb250ZXh0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0pTRE9NQmluZGluZy5oPgogI2ltcG9y
dCA8V2ViQ29yZS9KU0RPTUV4Y2VwdGlvbkhhbmRsaW5nLmg+CkBAIC0yNTE3LDYgKzI1MTgsMTEg
QEAgc3RhdGljIHZvaWQgY29udmVydEFuZEFkZEhpZ2hsaWdodChWZWN0b3I8UmVmPFdlYktpdDo6
U2hhcmVkTWVtb3J5Pj4mIGJ1ZmZlcnMsIE4KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorKyAoQk9P
TClfd2lsbFVwZ3JhZGVUb0hUVFBTOihOU1VSTCAqKXVybAoreworICAgIHJldHVybiBXZWJDb3Jl
OjpDb250ZW50RXh0ZW5zaW9uczo6Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpzaG91bGRCZU1h
ZGVTZWN1cmUodXJsKTsKK30KKwogLSAodm9pZClfc2hvd1NhZmVCcm93c2luZ1dhcm5pbmdXaXRo
VGl0bGU6KE5TU3RyaW5nICopdGl0bGUgd2FybmluZzooTlNTdHJpbmcgKil3YXJuaW5nIGRldGFp
bHM6KE5TQXR0cmlidXRlZFN0cmluZyAqKWRldGFpbHMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQo
XikoQk9PTCkpY29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBbc2VsZiBfc2hvd1NhZmVCcm93c2lu
Z1dhcm5pbmdXaXRoVVJMOm5pbCB0aXRsZTp0aXRsZSB3YXJuaW5nOndhcm5pbmcgZGV0YWlsc1dp
dGhMaW5rczpkZXRhaWxzIGNvbXBsZXRpb25IYW5kbGVyOl4oQk9PTCBjb250aW51ZVVuc2FmZUxv
YWQsIE5TVVJMICp1cmwpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ
SS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv
Q29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4IDU1ZDAxOWRlYWZiMmQyYmJhNDM3NGQ2MzUy
ZmU2NzM1NWJiMWY1NDguLjE4MzY0MTc4OGM0NGYyMTE1YjIwMjg3ZjhkNWY1MjAwM2Y5OWQwZmUg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQ
cml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll
d1ByaXZhdGUuaApAQCAtMjQ2LDYgKzI0Niw4IEBAIGZvciB0aGlzIHByb3BlcnR5LgogCiAtICh2
b2lkKV9zaW11bGF0ZURldmljZU9yaWVudGF0aW9uQ2hhbmdlV2l0aEFscGhhOihkb3VibGUpYWxw
aGEgYmV0YTooZG91YmxlKWJldGEgZ2FtbWE6KGRvdWJsZSlnYW1tYSBXS19BUElfQVZBSUxBQkxF
KG1hY29zKDEwLjE0LjQpLCBpb3MoMTIuMikpOwogCisrIChCT09MKV93aWxsVXBncmFkZVRvSFRU
UFM6KE5TVVJMICopdXJsIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhX
S19JT1NfVEJBKSk7CisKICsgKEJPT0wpX2hhbmRsZXNTYWZlQnJvd3NpbmcgV0tfQVBJX0FWQUlM
QUJMRShtYWNvcygxMC4xNC40KSwgaW9zKDEyLjIpKTsKICsgKE5TVVJMICopX2NvbmZpcm1NYWx3
YXJlU2VudGluZWwgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xNC40KSwgaW9zKDEyLjIpKTsK
ICsgKE5TVVJMICopX3Zpc2l0VW5zYWZlV2Vic2l0ZVNlbnRpbmVsIFdLX0FQSV9BVkFJTEFCTEUo
bWFjb3MoMTAuMTQuNCksIGlvcygxMi4yKSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzc3YzFhODcyZTg0MDgwN2MxMDBlY2FiMDY3NzBhMzRk
ODk3N2U4My4uNjI3MGRkZjQyYTlhOTQzYjk3YWFlNWUxZDQxNTliYzJiMjA3MjFhZCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0
IEBACisyMDIxLTA0LTI4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v
cmc+CisKKyAgICAgICAgQWRkIFNQSSB0byBxdWVyeSB3aGV0aGVyIGEgVVJMIHdvdWxkIGJlIHVw
Z3JhZGVkIHRvIEhUVFBTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjUxNTQKKyAgICAgICAgPHJkYXI6Ly83NzI2OTkwND4KKworICAgICAgICBSZXZp
ZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi
S2l0Q29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbToKKyAgICAgICAgKFRFU1QpOgorCiAy
MDIxLTA0LTI3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK
ICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzU5MTIuCmRpZmYgLS1naXQgYS9Ub29s
cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24u
bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld0NvbmZp
Z3VyYXRpb24ubW0KaW5kZXggNWJmNmRhOTNkYjY5YzU5YjYwMjFlOGFiZjllZTQ0YjI3ZDViYWY3
YS4uNzFlNDdiZjM0NmUyNzA5MzQzYTMwM2M4ZGFjMTQ0NWEyYjYwYTg2ZCAxMDA2NDQKLS0tIGEv
VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdDb25maWd1cmF0
aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJW
aWV3Q29uZmlndXJhdGlvbi5tbQpAQCAtMTQzLDQgKzE0Myw5IEBAIFRFU1QoV2ViS2l0LCBDb25m
aWd1cmF0aW9uSFRUUFNVcGdyYWRlKQogICAgIGNoZWNrUmVxdWVzdEJ5dGVzU3RhcnRzV2l0aCgi
Q09OTkVDVCB3d3cub3BlbmdsLm9yZzo0NDMgSFRUUC8xLjFcclxuIik7CiAgICAgcnVuVGVzdChm
YWxzZSk7CiAgICAgY2hlY2tSZXF1ZXN0Qnl0ZXNTdGFydHNXaXRoKCJHRVQgaHR0cDovL3d3dy5v
cGVuZ2wub3JnLyBIVFRQLzEuMVxyXG4iKTsKKyAgICAKKyAgICBFWFBFQ1RfVFJVRShbV0tXZWJW
aWV3IF93aWxsVXBncmFkZVRvSFRUUFM6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwOi8vd3d3
Lm9wZW5nbC5vcmcvIl1dKTsKKyAgICBFWFBFQ1RfRkFMU0UoW1dLV2ViVmlldyBfd2lsbFVwZ3Jh
ZGVUb0hUVFBTOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cHM6Ly93d3cub3BlbmdsLm9yZy8i
XV0pOworICAgIEVYUEVDVF9GQUxTRShbV0tXZWJWaWV3IF93aWxsVXBncmFkZVRvSFRUUFM6W05T
VVJMIFVSTFdpdGhTdHJpbmc6QCJjdXN0b20tc2NoZW1lOi8vd3d3Lm9wZW5nbC5vcmcvIl1dKTsK
KyAgICBFWFBFQ1RfRkFMU0UoW1dLV2ViVmlldyBfd2lsbFVwZ3JhZGVUb0hUVFBTOltOU1VSTCBV
UkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4YW1wbGUuY29tLyJdXSk7CiB9Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>