<?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>164292</bug_id>
          
          <creation_ts>2016-11-01 14:05:47 -0700</creation_ts>
          <short_desc>Sticky position should not use transformed position to compute sticky offset.</short_desc>
          <delta_ts>2022-02-04 14:42:49 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Layout and Rendering</component>
          <version>Safari 10</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>FromImplementor, InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>228989</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Robert Flack">flackr</reporter>
          <assigned_to name="Martin Robinson">mrobinson</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>changseok</cc>
    
    <cc>dbates</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>mrobinson</cc>
    
    <cc>pdr</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>skyzyx.junk</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1247034</commentid>
    <comment_count>0</comment_count>
      <attachid>293590</attachid>
    <who name="Robert Flack">flackr</who>
    <bug_when>2016-11-01 14:05:47 -0700</bug_when>
    <thetext>Created attachment 293590
Demo of sticky position in a transformed container.

A sticky position element in a transformed container should use its untransformed position for the sticky position offset constraint. In the attached test case it should appear to stick 100px down as the transform should effectively be applied on its sticky position (See test case in Firefox or Chrome with --enable-experimental-web-platform-features).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1247042</commentid>
    <comment_count>1</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2016-11-01 14:21:17 -0700</bug_when>
    <thetext>Thanks for the report.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1247113</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2016-11-01 16:21:15 -0700</bug_when>
    <thetext>&lt;rdar://problem/29054773&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785408</commentid>
    <comment_count>3</comment_count>
      <attachid>435854</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2021-08-19 01:39:14 -0700</bug_when>
    <thetext>Created attachment 435854
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785433</commentid>
    <comment_count>4</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2021-08-19 05:25:28 -0700</bug_when>
    <thetext>*** Bug 94992 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785754</commentid>
    <comment_count>5</comment_count>
      <attachid>435958</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2021-08-20 02:32:13 -0700</bug_when>
    <thetext>Created attachment 435958
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785940</commentid>
    <comment_count>6</comment_count>
      <attachid>435958</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-08-20 12:15:42 -0700</bug_when>
    <thetext>Comment on attachment 435958
Patch

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

&gt; Source/WebCore/rendering/RenderBoxModelObject.cpp:493
&gt; +    FloatRect containerRectRelativeToScrollingAncestor = containingBlock-&gt;localToContainerQuad(FloatRect(containerContentRect), &amp;enclosingClippingBox, { } /* mode */).boundingBox();

Maybe instead of /* mode */ say /* ignore transforms */

&gt; Source/WebCore/rendering/RenderBoxModelObject.cpp:521
&gt; +    auto stickyBoxRelativeToScrollingAncestor = parent()-&gt;localToContainerQuad(FloatRect(stickyBoxRect), &amp;enclosingClippingBox, { } /* mode */).boundingBox();

Ditto.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786355</commentid>
    <comment_count>7</comment_count>
      <attachid>436166</attachid>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2021-08-23 01:58:20 -0700</bug_when>
    <thetext>Created attachment 436166
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786359</commentid>
    <comment_count>8</comment_count>
    <who name="Martin Robinson">mrobinson</who>
    <bug_when>2021-08-23 02:08:26 -0700</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #6)
&gt; Comment on attachment 435958 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=435958&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/rendering/RenderBoxModelObject.cpp:493
&gt; &gt; +    FloatRect containerRectRelativeToScrollingAncestor = containingBlock-&gt;localToContainerQuad(FloatRect(containerContentRect), &amp;enclosingClippingBox, { } /* mode */).boundingBox();
&gt; 
&gt; Maybe instead of /* mode */ say /* ignore transforms */
&gt; 
&gt; &gt; Source/WebCore/rendering/RenderBoxModelObject.cpp:521
&gt; &gt; +    auto stickyBoxRelativeToScrollingAncestor = parent()-&gt;localToContainerQuad(FloatRect(stickyBoxRect), &amp;enclosingClippingBox, { } /* mode */).boundingBox();
&gt; 
&gt; Ditto.

Thanks for the review! I&apos;ve made these changes.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786426</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-23 08:11:44 -0700</bug_when>
    <thetext>Committed r281446 (240829@main): &lt;https://commits.webkit.org/240829@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436166.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1837597</commentid>
    <comment_count>10</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2022-02-04 14:42:49 -0800</bug_when>
    <thetext>This change should be present in STP 139, iOS 15.4 Beta, and macOS 12.3 Beta.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>293590</attachid>
            <date>2016-11-01 14:05:47 -0700</date>
            <delta_ts>2016-11-01 14:05:47 -0700</delta_ts>
            <desc>Demo of sticky position in a transformed container.</desc>
            <filename>sticky-transform.html</filename>
            <type>text/html</type>
            <size>624</size>
            <attacher name="Robert Flack">flackr</attacher>
            
              <data encoding="base64">PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KYm9keSB7CiAgaGVpZ2h0OiAzMDAwcHg7Cn0KCi5jb250
YWluZXIgewogIHdpZHRoOiAzMDBweDsKICBoZWlnaHQ6IDMwMHB4OwogIGJvcmRlcjogMXB4IHNv
bGlkIGJsYWNrOwogIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICB0b3A6IDEwMHB4OwogIHRyYW5zZm9y
bTogdHJhbnNsYXRlWSgxMDBweCk7Cn0KCi5zdGlja3kgewogIHBvc2l0aW9uOiAtd2Via2l0LXN0
aWNreTsKICBwb3NpdGlvbjogc3RpY2t5OwogIHRvcDogMHB4OwogIGhlaWdodDogNTBweDsKICB3
aWR0aDogNTBweDsKICBiYWNrZ3JvdW5kOiBncmVlbjsKfQo8L3N0eWxlPgo8cD5UaGUgc3RpY2t5
IGVsZW1lbnQgc2hvdWxkIHN0aWNrIGJhc2VkIG9uIGl0cyB1bnRyYW5zZm9ybWVkIHBvc2l0aW9u
IChpLmUuIGl0IHNob3VsZCBsb29rIGxpa2UgaXQgc3RpY2tzIDEwMHB4IGJlbG93IHRoZSB0b3Ag
b2YgdGhlIHZpZXdwb3J0IGdpdmVuIHRoZSB0cmFuc2Zvcm0pIGhvd2V2ZXIgaXQgaXMgYWN0dWFs
bHkgc3RpY2tpbmcgYmFzZWQgb24gaXRzIHRyYW5zZm9ybWVkIHBvc2l0aW9uLjwvcD4KPGRpdiBj
bGFzcz0iY29udGFpbmVyIj4KICA8ZGl2IGNsYXNzPSJzdGlja3kiPjwvZGl2Pgo8L2Rpdj4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435854</attachid>
            <date>2021-08-19 01:39:14 -0700</date>
            <delta_ts>2021-08-20 02:30:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-164292-20210819103913.patch</filename>
            <type>text/plain</type>
            <size>6298</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY1NjUyOTU2ZWVlOTAy
OWU4ZTg4MjU4MmJjMjA2ZjExYzQyYTRkNC4uMWE4MGI1NGIzNTNhZTdmOWU1NjRkYTM4Y2U2NDNj
MWU2ZjUzMDVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTE5ICBNYXJ0
aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KKworICAgICAgICBTdGlja3kgcG9z
aXRpb24gc2hvdWxkIG5vdCB1c2UgdHJhbnNmb3JtZWQgcG9zaXRpb24gdG8gY29tcHV0ZSBzdGlj
a3kgb2Zmc2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MTY0MjkyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTA1NDc3Mz4KKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMg
Y2hhbmdlIGlzIHRlc3RlZCBieSB0aGUgZm9sbG93aW5nIFdQVCB0ZXN0OgorICAgICAgICAgIHdl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3N0aWNreS9wb3NpdGlvbi1zdGlja3kt
dHJhbnNmb3Jtcy10cmFuc2xhdGUuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJv
eE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0
Ojpjb21wdXRlU3RpY2t5UG9zaXRpb25Db25zdHJhaW50cyBjb25zdCk6IFdoZW4gY2FsbGluZyBs
b2NhbFRvQ29udGFpbmVyUXVhZCwKKyAgICAgICAgcGFzcyAwIGZvciB0aGUgbW9kZSB3aGljaCBt
ZWFucyB0aGF0IHRoZSB0cmFuc2Zvcm1hdGlvbiBiZXR3ZWVuIGNvb3JkaW5hdGUgc3lzdGVtcyBk
b2VzIG5vdCBpbmNsdWRlCisgICAgICAgIHRyYW5zZm9ybXMuCisKIDIwMjEtMDgtMTggIENocmlz
IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCB1bmRlciBKU0ludGVy
c2VjdGlvbk9ic2VydmVyQ2FsbGJhY2s6OmhhbmRsZUV2ZW50KCkKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCmluZGV4IGRhZjUwOTRhZDky
NDM1YzBkOWY2MjNlYzc3NTczOTUzZTE3MmRiNmMuLmVkNTE0NjYxMTc0MDQ5ZjA3ODhmNWY4YTg5
Mjg2OGM1NDU0ZGQ4YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveE1vZGVsT2JqZWN0LmNwcApAQCAtNDg4LDggKzQ4OCw5IEBAIHZvaWQgUmVuZGVyQm94TW9k
ZWxPYmplY3Q6OmNvbXB1dGVTdGlja3lQb3NpdGlvbkNvbnN0cmFpbnRzKFN0aWNreVBvc2l0aW9u
Vmlld3BvCiAgICAgLy8gQ29tcHV0ZSB0aGUgY29udGFpbmVyLXJlbGF0aXZlIGFyZWEgd2l0aGlu
IHdoaWNoIHRoZSBzdGlja3kgZWxlbWVudCBpcyBhbGxvd2VkIHRvIG1vdmUuCiAgICAgY29udGFp
bmVyQ29udGVudFJlY3QuY29udHJhY3QobWluTWFyZ2luKTsKIAotICAgIC8vIEZpbmFsbHkgY29t
cHV0ZSBjb250YWluZXIgcmVjdCByZWxhdGl2ZSB0byB0aGUgc2Nyb2xsaW5nIGFuY2VzdG9yLgot
ICAgIEZsb2F0UmVjdCBjb250YWluZXJSZWN0UmVsYXRpdmVUb1Njcm9sbGluZ0FuY2VzdG9yID0g
Y29udGFpbmluZ0Jsb2NrLT5sb2NhbFRvQ29udGFpbmVyUXVhZChGbG9hdFJlY3QoY29udGFpbmVy
Q29udGVudFJlY3QpLCAmZW5jbG9zaW5nQ2xpcHBpbmdCb3gpLmJvdW5kaW5nQm94KCk7CisgICAg
Ly8gRmluYWxseSBjb21wdXRlIGNvbnRhaW5lciByZWN0IHJlbGF0aXZlIHRvIHRoZSBzY3JvbGxp
bmcgYW5jZXN0b3IuIFdlIHBhc3MgMCBoZXJlIGZvcgorICAgIC8vIG1vZGUsIGJlY2F1c2Ugc3Rp
Y2t5IHBvc2l0aW9uaW5nIGlnbm9yZXMgYW55IHRyYW5zZm9ybXMuCisgICAgRmxvYXRSZWN0IGNv
bnRhaW5lclJlY3RSZWxhdGl2ZVRvU2Nyb2xsaW5nQW5jZXN0b3IgPSBjb250YWluaW5nQmxvY2st
PmxvY2FsVG9Db250YWluZXJRdWFkKEZsb2F0UmVjdChjb250YWluZXJDb250ZW50UmVjdCksICZl
bmNsb3NpbmdDbGlwcGluZ0JveCwgMCAvKiBtb2RlICovKS5ib3VuZGluZ0JveCgpOwogICAgIGlm
IChlbmNsb3NpbmdDbGlwcGluZ0xheWVyKSB7CiAgICAgICAgIEZsb2F0UG9pbnQgY29udGFpbmVy
TG9jYXRpb25SZWxhdGl2ZVRvU2Nyb2xsaW5nQW5jZXN0b3IgPSBjb250YWluZXJSZWN0UmVsYXRp
dmVUb1Njcm9sbGluZ0FuY2VzdG9yLmxvY2F0aW9uKCkgLQogICAgICAgICAgICAgRmxvYXRTaXpl
KGVuY2xvc2luZ0NsaXBwaW5nQm94LmJvcmRlckxlZnQoKSArIGVuY2xvc2luZ0NsaXBwaW5nQm94
LnBhZGRpbmdMZWZ0KCksCkBAIC01MDgsMTUgKzUwOSwxNiBAQCB2b2lkIFJlbmRlckJveE1vZGVs
T2JqZWN0Ojpjb21wdXRlU3RpY2t5UG9zaXRpb25Db25zdHJhaW50cyhTdGlja3lQb3NpdGlvblZp
ZXdwbwogICAgIC8vIElkZWFsbHksIGl0IHdvdWxkIGJlIHBvc3NpYmxlIHRvIGNhbGwgdGhpcy0+
bG9jYWxUb0NvbnRhaW5lclF1YWQgdG8gZGV0ZXJtaW5lIHRoZSBmcmFtZQogICAgIC8vIHJlY3Rh
bmdsZSBpbiB0aGUgY29vcmRpbmF0ZSBzeXN0ZW0gb2YgdGhlIHNjcm9sbGluZyBhbmNlc3Rvciwg
YnV0IGxvY2FsVG9Db250YWluZXJRdWFkCiAgICAgLy8gaXRzZWxmIGRlcGVuZHMgb24gc3RpY2t5
IHBvc2l0aW9uaW5nISBJbnN0ZWFkLCBzdGFydCBmcm9tIHRoZSBwYXJlbnQgYnV0IGZpcnN0IGFk
anVzdGluZwotICAgIC8vIHRoZSByZWN0YW5nbGUgZm9yIHRoZSB3cml0aW5nIG1vZGUgb2YgdGhp
cyBzdGlja2lseS1wb3NpdGlvbmVkIGVsZW1lbnQuCisgICAgLy8gdGhlIHJlY3RhbmdsZSBmb3Ig
dGhlIHdyaXRpbmcgbW9kZSBvZiB0aGlzIHN0aWNraWx5LXBvc2l0aW9uZWQgZWxlbWVudC4gV2Ug
YWxzbyBwYXNzIDAKKyAgICAvLyBoZXJlIGZvciB0aGUgbW9kZSBiZWNhdXNlIHN0aWNreSBwb3Np
dGlvbmluZyBzaG91bGQgaWdub3JlIHRyYW5zZm9ybXMuCiAgICAgLy8KLSAgICAvLyBGSVhNRTog
Rm9yIG5vdywgYXNzdW1lIHRoYXQgfHRoaXN8IGlzIG5vdCB0cmFuc2Zvcm1lZC4gSXQgd291bGQg
YWxzbyBiZSBuaWNlIHRvIG5vdCBoYXZlIHRvCi0gICAgLy8gY2FsbCBsb2NhbFRvQ29udGFpbmVy
UXVhZCBhZ2FpbiBzaW5jZSB3ZSBoYXZlIGFscmVhZHkgZG9uZSBhIHNpbWlsYXIgY2FsbCB0byBt
b3ZlIGZyb20KLSAgICAvLyB0aGUgY29udGFpbmluZyBibG9jayB0byB0aGUgc2Nyb2xsaW5nIGFu
Y2VzdG9yIGFib3ZlLCBidXQgbG9jYWxUb0NvbnRhaW5lclF1YWQgdGFrZXMgY2FyZQotICAgIC8v
IG9mIGEgbG90IG9mIGNvbXBsZXggc2l0dWF0aW9ucyBpbnZvbHZpbmcgaW5saW5lcywgdGFibGVz
LCBhbmQgdHJhbnNmb3JtYXRpb25zLgorICAgIC8vIEZJWE1FOiBJdCB3b3VsZCBhbHNvIGJlIG5p
Y2UgdG8gbm90IGhhdmUgdG8gY2FsbCBsb2NhbFRvQ29udGFpbmVyUXVhZCBhZ2FpbiBzaW5jZSB3
ZQorICAgIC8vIGhhdmUgYWxyZWFkeSBkb25lIGEgc2ltaWxhciBjYWxsIHRvIG1vdmUgZnJvbSB0
aGUgY29udGFpbmluZyBibG9jayB0byB0aGUgc2Nyb2xsaW5nCisgICAgLy8gYW5jZXN0b3IgYWJv
dmUsIGJ1dCBsb2NhbFRvQ29udGFpbmVyUXVhZCB0YWtlcyBjYXJlIG9mIGEgbG90IG9mIGNvbXBs
ZXggc2l0dWF0aW9ucworICAgIC8vIGludm9sdmluZyBpbmxpbmVzLCB0YWJsZXMsIGFuZCB0cmFu
c2Zvcm1hdGlvbnMuCiAgICAgaWYgKHBhcmVudCgpLT5pc0JveCgpKQogICAgICAgICBkb3duY2Fz
dDxSZW5kZXJCb3g+KHBhcmVudCgpKS0+ZmxpcEZvcldyaXRpbmdNb2RlKHN0aWNreUJveFJlY3Qp
OwotICAgIGF1dG8gc3RpY2t5Qm94UmVsYXRpdmVUb1Njcm9sbGluZ0FuY2VzdG9yID0gcGFyZW50
KCktPmxvY2FsVG9Db250YWluZXJRdWFkKEZsb2F0UmVjdChzdGlja3lCb3hSZWN0KSwgJmVuY2xv
c2luZ0NsaXBwaW5nQm94KS5ib3VuZGluZ0JveCgpOworICAgIGF1dG8gc3RpY2t5Qm94UmVsYXRp
dmVUb1Njcm9sbGluZ0FuY2VzdG9yID0gcGFyZW50KCktPmxvY2FsVG9Db250YWluZXJRdWFkKEZs
b2F0UmVjdChzdGlja3lCb3hSZWN0KSwgJmVuY2xvc2luZ0NsaXBwaW5nQm94LCAwIC8qIG1vZGUg
Ki8pLmJvdW5kaW5nQm94KCk7CiAKICAgICBpZiAoZW5jbG9zaW5nQ2xpcHBpbmdMYXllcikgewog
ICAgICAgICBzdGlja3lCb3hSZWxhdGl2ZVRvU2Nyb2xsaW5nQW5jZXN0b3IubW92ZSgtRmxvYXRT
aXplKGVuY2xvc2luZ0NsaXBwaW5nQm94LmJvcmRlckxlZnQoKSArIGVuY2xvc2luZ0NsaXBwaW5n
Qm94LnBhZGRpbmdMZWZ0KCksCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA0OTZk
ZDM4MDgyMjRhZjFiMzgwMzI2YmVlM2Y3ODRjMTEyOTQ1MDZmLi5kZmMxYjlkMWEzMDJhODkzYzUy
OTEzNWZhZDQyOGQ2ZmRjNzRlMTgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNCBAQAorMjAyMS0wOC0xOSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQHdl
YmtpdC5vcmc+CisKKyAgICAgICAgU3RpY2t5IHBvc2l0aW9uIHNob3VsZCBub3QgdXNlIHRyYW5z
Zm9ybWVkIHBvc2l0aW9uIHRvIGNvbXB1dGUgc3RpY2t5IG9mZnNldC4KKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDI5MgorICAgICAgICA8cmRhcjov
L3Byb2JsZW0vMjkwNTQ3NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1wb3NpdGlvbi9zdGlja3kv
cG9zaXRpb24tc3RpY2t5LXRyYW5zZm9ybXMtdHJhbnNsYXRlLWV4cGVjdGVkLnR4dDogVXBkYXRl
IHJlc3VsdHMKKyAgICAgICAgb2YgdGVzdCB0byBzaG93IHBhc3MuCisKIDIwMjEtMDgtMTcgIEFs
ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBEb2N1
bWVudCBsb2FkIGV2ZW50cyBzaG91bGQgdXBkYXRlIHRpbWluZyBpbiBQZXJmb3JtYW5jZU5hdmln
YXRpb25UaW1pbmcgZXZlbiBhZnRlciBpdHMgaW5zdGFudGlhdGlvbgpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9u
L3N0aWNreS9wb3NpdGlvbi1zdGlja3ktdHJhbnNmb3Jtcy10cmFuc2xhdGUtZXhwZWN0ZWQudHh0
IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBv
c2l0aW9uL3N0aWNreS9wb3NpdGlvbi1zdGlja3ktdHJhbnNmb3Jtcy10cmFuc2xhdGUtZXhwZWN0
ZWQudHh0CmluZGV4IGY2MWJkOTc1YTJmZTgyYjAyN2U3ZTc0YjczNTZmOTE1YWRkN2MyZjUuLmUw
YjA2MTliZDdiYmVjZDE2YjI0MWNlOGZlNTgzOTZkYWE5N2FjNWEgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1wb3NpdGlvbi9z
dGlja3kvcG9zaXRpb24tc3RpY2t5LXRyYW5zZm9ybXMtdHJhbnNsYXRlLWV4cGVjdGVkLnR4dAor
KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
cG9zaXRpb24vc3RpY2t5L3Bvc2l0aW9uLXN0aWNreS10cmFuc2Zvcm1zLXRyYW5zbGF0ZS1leHBl
Y3RlZC50eHQKQEAgLTEsNSArMSw1IEBACiAKIFBBU1MgVHJhbnNsYXRpb24gdHJhbnNmb3JtIGNh
biBtb3ZlIHN0aWNreSBlbGVtZW50IHBhc3Qgc3RpY2tpbmcgcG9pbnQKIFBBU1MgU3R1Y2sgZWxl
bWVudHMgY2FuIHN0aWxsIGJlIG1vdmVkIHZpYSB0cmFuc2xhdGlvbnMKLUZBSUwgVGhlIHN0aWNr
eSBlbGVtZW50IHNob3VsZCBzdGljayBiZWZvcmUgdGhlIGNvbnRhaW5lciBpcyBvZmZzZXQgYnkg
YSB0cmFuc2xhdGlvbiBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAxNTAgYnV0IGdvdCAxMDAKK1BB
U1MgVGhlIHN0aWNreSBlbGVtZW50IHNob3VsZCBzdGljayBiZWZvcmUgdGhlIGNvbnRhaW5lciBp
cyBvZmZzZXQgYnkgYSB0cmFuc2xhdGlvbgogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435958</attachid>
            <date>2021-08-20 02:32:13 -0700</date>
            <delta_ts>2021-08-23 01:58:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-164292-20210820113211.patch</filename>
            <type>text/plain</type>
            <size>6262</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U0NDQyOGNlNTdkMjQ2
MjVhYmE3OTJmZmNhY2VlYTNkNWM1YWE0Yy4uZWU2YmE5ZTJmNmU1YWI0ZDE4M2I3MDU4ZWUyZjdl
ZTFhNTljZGQ4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTE5ICBNYXJ0
aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KKworICAgICAgICBTdGlja3kgcG9z
aXRpb24gc2hvdWxkIG5vdCB1c2UgdHJhbnNmb3JtZWQgcG9zaXRpb24gdG8gY29tcHV0ZSBzdGlj
a3kgb2Zmc2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MTY0MjkyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTA1NDc3Mz4KKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMg
Y2hhbmdlIGlzIHRlc3RlZCBieSB0aGUgZm9sbG93aW5nIFdQVCB0ZXN0OgorICAgICAgICAgIHdl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3N0aWNreS9wb3NpdGlvbi1zdGlja3kt
dHJhbnNmb3Jtcy10cmFuc2xhdGUuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJv
eE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0
Ojpjb21wdXRlU3RpY2t5UG9zaXRpb25Db25zdHJhaW50cyBjb25zdCk6IFdoZW4gY2FsbGluZyBs
b2NhbFRvQ29udGFpbmVyUXVhZCwKKyAgICAgICAgcGFzcyAwIGZvciB0aGUgbW9kZSB3aGljaCBt
ZWFucyB0aGF0IHRoZSB0cmFuc2Zvcm1hdGlvbiBiZXR3ZWVuIGNvb3JkaW5hdGUgc3lzdGVtcyBk
b2VzIG5vdCBpbmNsdWRlCisgICAgICAgIHRyYW5zZm9ybXMuCisKIDIwMjEtMDgtMjAgIE15bGVz
IEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBHbHlwaEJ1ZmZl
ciBjYW4gYmVjb21lIGluY29uc2lzdGVudCB3aXRoIGl0cyBiYWNraW5nIHN0cmluZwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBi
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXgg
YWIwOTljYTIwNGFkNGI3YzAzOTA3YWY4ZjAxNjg0ZDk1Y2RjZmYxMS4uMWI0MTNhNjRhZGU0MDhi
NTlmNjY0ZjQxOTJkOWMyMGI2Y2VjMWM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC00ODgsOCArNDg4LDkgQEAgdm9pZCBS
ZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29tcHV0ZVN0aWNreVBvc2l0aW9uQ29uc3RyYWludHMoU3Rp
Y2t5UG9zaXRpb25WaWV3cG8KICAgICAvLyBDb21wdXRlIHRoZSBjb250YWluZXItcmVsYXRpdmUg
YXJlYSB3aXRoaW4gd2hpY2ggdGhlIHN0aWNreSBlbGVtZW50IGlzIGFsbG93ZWQgdG8gbW92ZS4K
ICAgICBjb250YWluZXJDb250ZW50UmVjdC5jb250cmFjdChtaW5NYXJnaW4pOwogCi0gICAgLy8g
RmluYWxseSBjb21wdXRlIGNvbnRhaW5lciByZWN0IHJlbGF0aXZlIHRvIHRoZSBzY3JvbGxpbmcg
YW5jZXN0b3IuCi0gICAgRmxvYXRSZWN0IGNvbnRhaW5lclJlY3RSZWxhdGl2ZVRvU2Nyb2xsaW5n
QW5jZXN0b3IgPSBjb250YWluaW5nQmxvY2stPmxvY2FsVG9Db250YWluZXJRdWFkKEZsb2F0UmVj
dChjb250YWluZXJDb250ZW50UmVjdCksICZlbmNsb3NpbmdDbGlwcGluZ0JveCkuYm91bmRpbmdC
b3goKTsKKyAgICAvLyBGaW5hbGx5IGNvbXB1dGUgY29udGFpbmVyIHJlY3QgcmVsYXRpdmUgdG8g
dGhlIHNjcm9sbGluZyBhbmNlc3Rvci4gV2UgcGFzcyBhbiBlbXB0eQorICAgIC8vIG1vZGUgaGVy
ZSwgYmVjYXVzZSBzdGlja3kgcG9zaXRpb25pbmcgc2hvdWxkIGlnbm9yZSB0cmFuc2Zvcm1zLgor
ICAgIEZsb2F0UmVjdCBjb250YWluZXJSZWN0UmVsYXRpdmVUb1Njcm9sbGluZ0FuY2VzdG9yID0g
Y29udGFpbmluZ0Jsb2NrLT5sb2NhbFRvQ29udGFpbmVyUXVhZChGbG9hdFJlY3QoY29udGFpbmVy
Q29udGVudFJlY3QpLCAmZW5jbG9zaW5nQ2xpcHBpbmdCb3gsIHsgfSAvKiBtb2RlICovKS5ib3Vu
ZGluZ0JveCgpOwogICAgIGlmIChlbmNsb3NpbmdDbGlwcGluZ0xheWVyKSB7CiAgICAgICAgIEZs
b2F0UG9pbnQgY29udGFpbmVyTG9jYXRpb25SZWxhdGl2ZVRvU2Nyb2xsaW5nQW5jZXN0b3IgPSBj
b250YWluZXJSZWN0UmVsYXRpdmVUb1Njcm9sbGluZ0FuY2VzdG9yLmxvY2F0aW9uKCkgLQogICAg
ICAgICAgICAgRmxvYXRTaXplKGVuY2xvc2luZ0NsaXBwaW5nQm94LmJvcmRlckxlZnQoKSArIGVu
Y2xvc2luZ0NsaXBwaW5nQm94LnBhZGRpbmdMZWZ0KCksCkBAIC01MDgsMTUgKzUwOSwxNiBAQCB2
b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21wdXRlU3RpY2t5UG9zaXRpb25Db25zdHJhaW50
cyhTdGlja3lQb3NpdGlvblZpZXdwbwogICAgIC8vIElkZWFsbHksIGl0IHdvdWxkIGJlIHBvc3Np
YmxlIHRvIGNhbGwgdGhpcy0+bG9jYWxUb0NvbnRhaW5lclF1YWQgdG8gZGV0ZXJtaW5lIHRoZSBm
cmFtZQogICAgIC8vIHJlY3RhbmdsZSBpbiB0aGUgY29vcmRpbmF0ZSBzeXN0ZW0gb2YgdGhlIHNj
cm9sbGluZyBhbmNlc3RvciwgYnV0IGxvY2FsVG9Db250YWluZXJRdWFkCiAgICAgLy8gaXRzZWxm
IGRlcGVuZHMgb24gc3RpY2t5IHBvc2l0aW9uaW5nISBJbnN0ZWFkLCBzdGFydCBmcm9tIHRoZSBw
YXJlbnQgYnV0IGZpcnN0IGFkanVzdGluZwotICAgIC8vIHRoZSByZWN0YW5nbGUgZm9yIHRoZSB3
cml0aW5nIG1vZGUgb2YgdGhpcyBzdGlja2lseS1wb3NpdGlvbmVkIGVsZW1lbnQuCisgICAgLy8g
dGhlIHJlY3RhbmdsZSBmb3IgdGhlIHdyaXRpbmcgbW9kZSBvZiB0aGlzIHN0aWNraWx5LXBvc2l0
aW9uZWQgZWxlbWVudC4gV2UgYWxzbyBwYXNzIGFuCisgICAgLy8gZW1wdHkgbW9kZSBoZXJlIGJl
Y2F1c2Ugc3RpY2t5IHBvc2l0aW9uaW5nIHNob3VsZCBpZ25vcmUgdHJhbnNmb3Jtcy4KICAgICAv
LwotICAgIC8vIEZJWE1FOiBGb3Igbm93LCBhc3N1bWUgdGhhdCB8dGhpc3wgaXMgbm90IHRyYW5z
Zm9ybWVkLiBJdCB3b3VsZCBhbHNvIGJlIG5pY2UgdG8gbm90IGhhdmUgdG8KLSAgICAvLyBjYWxs
IGxvY2FsVG9Db250YWluZXJRdWFkIGFnYWluIHNpbmNlIHdlIGhhdmUgYWxyZWFkeSBkb25lIGEg
c2ltaWxhciBjYWxsIHRvIG1vdmUgZnJvbQotICAgIC8vIHRoZSBjb250YWluaW5nIGJsb2NrIHRv
IHRoZSBzY3JvbGxpbmcgYW5jZXN0b3IgYWJvdmUsIGJ1dCBsb2NhbFRvQ29udGFpbmVyUXVhZCB0
YWtlcyBjYXJlCi0gICAgLy8gb2YgYSBsb3Qgb2YgY29tcGxleCBzaXR1YXRpb25zIGludm9sdmlu
ZyBpbmxpbmVzLCB0YWJsZXMsIGFuZCB0cmFuc2Zvcm1hdGlvbnMuCisgICAgLy8gRklYTUU6IEl0
IHdvdWxkIGFsc28gYmUgbmljZSB0byBub3QgaGF2ZSB0byBjYWxsIGxvY2FsVG9Db250YWluZXJR
dWFkIGFnYWluIHNpbmNlIHdlCisgICAgLy8gaGF2ZSBhbHJlYWR5IGRvbmUgYSBzaW1pbGFyIGNh
bGwgdG8gbW92ZSBmcm9tIHRoZSBjb250YWluaW5nIGJsb2NrIHRvIHRoZSBzY3JvbGxpbmcKKyAg
ICAvLyBhbmNlc3RvciBhYm92ZSwgYnV0IGxvY2FsVG9Db250YWluZXJRdWFkIHRha2VzIGNhcmUg
b2YgYSBsb3Qgb2YgY29tcGxleCBzaXR1YXRpb25zCisgICAgLy8gaW52b2x2aW5nIGlubGluZXMs
IHRhYmxlcywgYW5kIHRyYW5zZm9ybWF0aW9ucy4KICAgICBpZiAocGFyZW50KCktPmlzQm94KCkp
CiAgICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4ocGFyZW50KCkpLT5mbGlwRm9yV3JpdGluZ01v
ZGUoc3RpY2t5Qm94UmVjdCk7Ci0gICAgYXV0byBzdGlja3lCb3hSZWxhdGl2ZVRvU2Nyb2xsaW5n
QW5jZXN0b3IgPSBwYXJlbnQoKS0+bG9jYWxUb0NvbnRhaW5lclF1YWQoRmxvYXRSZWN0KHN0aWNr
eUJveFJlY3QpLCAmZW5jbG9zaW5nQ2xpcHBpbmdCb3gpLmJvdW5kaW5nQm94KCk7CisgICAgYXV0
byBzdGlja3lCb3hSZWxhdGl2ZVRvU2Nyb2xsaW5nQW5jZXN0b3IgPSBwYXJlbnQoKS0+bG9jYWxU
b0NvbnRhaW5lclF1YWQoRmxvYXRSZWN0KHN0aWNreUJveFJlY3QpLCAmZW5jbG9zaW5nQ2xpcHBp
bmdCb3gsIHsgfSAvKiBtb2RlICovKS5ib3VuZGluZ0JveCgpOwogCiAgICAgaWYgKGVuY2xvc2lu
Z0NsaXBwaW5nTGF5ZXIpIHsKICAgICAgICAgc3RpY2t5Qm94UmVsYXRpdmVUb1Njcm9sbGluZ0Fu
Y2VzdG9yLm1vdmUoLUZsb2F0U2l6ZShlbmNsb3NpbmdDbGlwcGluZ0JveC5ib3JkZXJMZWZ0KCkg
KyBlbmNsb3NpbmdDbGlwcGluZ0JveC5wYWRkaW5nTGVmdCgpLApkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D
aGFuZ2VMb2cKaW5kZXggNzg2Y2NlYmJlZmY2OTQ0MWY0YzFiZWIzOTgzNDY2NzVjODI5Mjk5OS4u
YjVlYTU3YTQ0MTk1NjE5NjFjMjRkMWRmMWI1NWY0Y2Q0ZTI3ZWIyZCAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDgtMTkgIE1hcnRpbiBSb2Jp
bnNvbiAgPG1yb2JpbnNvbkB3ZWJraXQub3JnPgorCisgICAgICAgIFN0aWNreSBwb3NpdGlvbiBz
aG91bGQgbm90IHVzZSB0cmFuc2Zvcm1lZCBwb3NpdGlvbiB0byBjb21wdXRlIHN0aWNreSBvZmZz
ZXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQy
OTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5MDU0NzczPgorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtcG9zaXRpb24vc3RpY2t5L3Bvc2l0aW9uLXN0aWNreS10cmFuc2Zvcm1zLXRyYW5zbGF0ZS1l
eHBlY3RlZC50eHQ6IFVwZGF0ZSByZXN1bHRzCisgICAgICAgIG9mIHRlc3QgdG8gc2hvdyBwYXNz
LgorCiAyMDIxLTA4LTIwICBUaW0gTmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CiAKICAgICAgICAg
RW5zdXJlIGFuY2VzdG9ycyB3aXRoIG9wYWNpdHkgZG9uJ3QgYWZmZWN0IHRvcCBsYXllciBlbGVt
ZW50cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3N0aWNreS9wb3NpdGlvbi1zdGlja3ktdHJhbnNmb3Jtcy10
cmFuc2xhdGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3N0aWNreS9wb3NpdGlvbi1zdGlja3ktdHJhbnNm
b3Jtcy10cmFuc2xhdGUtZXhwZWN0ZWQudHh0CmluZGV4IGY2MWJkOTc1YTJmZTgyYjAyN2U3ZTc0
YjczNTZmOTE1YWRkN2MyZjUuLmUwYjA2MTliZDdiYmVjZDE2YjI0MWNlOGZlNTgzOTZkYWE5N2Fj
NWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1wb3NpdGlvbi9zdGlja3kvcG9zaXRpb24tc3RpY2t5LXRyYW5zZm9ybXMtdHJh
bnNsYXRlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3MtcG9zaXRpb24vc3RpY2t5L3Bvc2l0aW9uLXN0aWNreS10cmFu
c2Zvcm1zLXRyYW5zbGF0ZS1leHBlY3RlZC50eHQKQEAgLTEsNSArMSw1IEBACiAKIFBBU1MgVHJh
bnNsYXRpb24gdHJhbnNmb3JtIGNhbiBtb3ZlIHN0aWNreSBlbGVtZW50IHBhc3Qgc3RpY2tpbmcg
cG9pbnQKIFBBU1MgU3R1Y2sgZWxlbWVudHMgY2FuIHN0aWxsIGJlIG1vdmVkIHZpYSB0cmFuc2xh
dGlvbnMKLUZBSUwgVGhlIHN0aWNreSBlbGVtZW50IHNob3VsZCBzdGljayBiZWZvcmUgdGhlIGNv
bnRhaW5lciBpcyBvZmZzZXQgYnkgYSB0cmFuc2xhdGlvbiBhc3NlcnRfZXF1YWxzOiBleHBlY3Rl
ZCAxNTAgYnV0IGdvdCAxMDAKK1BBU1MgVGhlIHN0aWNreSBlbGVtZW50IHNob3VsZCBzdGljayBi
ZWZvcmUgdGhlIGNvbnRhaW5lciBpcyBvZmZzZXQgYnkgYSB0cmFuc2xhdGlvbgogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436166</attachid>
            <date>2021-08-23 01:58:20 -0700</date>
            <delta_ts>2021-08-23 08:11:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-164292-20210823105819.patch</filename>
            <type>text/plain</type>
            <size>6298</size>
            <attacher name="Martin Robinson">mrobinson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWM3MThlM2I2YTlhZGZk
ODA1ZTMxYzliNmRmYzAwMzEwNzU0NTJhNS4uMTIyOTQ5NDM0Mzc0YWUwOTc4YWVkYjlkMGFkMTVi
Yzk1NDRlODllMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTIzICBNYXJ0
aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KKworICAgICAgICBTdGlja3kgcG9z
aXRpb24gc2hvdWxkIG5vdCB1c2UgdHJhbnNmb3JtZWQgcG9zaXRpb24gdG8gY29tcHV0ZSBzdGlj
a3kgb2Zmc2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MTY0MjkyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTA1NDc3Mz4KKworICAgICAgICBS
ZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGNo
YW5nZSBpcyB0ZXN0ZWQgYnkgdGhlIGZvbGxvd2luZyBXUFQgdGVzdDoKKyAgICAgICAgICB3ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1wb3NpdGlvbi9zdGlja3kvcG9zaXRpb24tc3RpY2t5LXRy
YW5zZm9ybXMtdHJhbnNsYXRlLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hN
b2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6
Y29tcHV0ZVN0aWNreVBvc2l0aW9uQ29uc3RyYWludHMgY29uc3QpOiBXaGVuIGNhbGxpbmcgbG9j
YWxUb0NvbnRhaW5lclF1YWQsCisgICAgICAgIHBhc3MgMCBmb3IgdGhlIG1vZGUgd2hpY2ggbWVh
bnMgdGhhdCB0aGUgdHJhbnNmb3JtYXRpb24gYmV0d2VlbiBjb29yZGluYXRlIHN5c3RlbXMgZG9l
cyBub3QgaW5jbHVkZQorICAgICAgICB0cmFuc2Zvcm1zLgorCiAyMDIxLTA4LTIyICBDYXJsb3Mg
R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRnJlZXR5cGVd
IFNldCBtYXhpbXVtIGFsbG93ZWQgZm9udCBzaXplIGZvciBGcmVldHlwZQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggYWIwOTlj
YTIwNGFkNGI3YzAzOTA3YWY4ZjAxNjg0ZDk1Y2RjZmYxMS4uYTg1OTIyZGU2MzQ5OTJlMTRiNDhj
ZjFjYmE1YTg4ZDEwYTY3YzI5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC00ODgsOCArNDg4LDkgQEAgdm9pZCBSZW5kZXJC
b3hNb2RlbE9iamVjdDo6Y29tcHV0ZVN0aWNreVBvc2l0aW9uQ29uc3RyYWludHMoU3RpY2t5UG9z
aXRpb25WaWV3cG8KICAgICAvLyBDb21wdXRlIHRoZSBjb250YWluZXItcmVsYXRpdmUgYXJlYSB3
aXRoaW4gd2hpY2ggdGhlIHN0aWNreSBlbGVtZW50IGlzIGFsbG93ZWQgdG8gbW92ZS4KICAgICBj
b250YWluZXJDb250ZW50UmVjdC5jb250cmFjdChtaW5NYXJnaW4pOwogCi0gICAgLy8gRmluYWxs
eSBjb21wdXRlIGNvbnRhaW5lciByZWN0IHJlbGF0aXZlIHRvIHRoZSBzY3JvbGxpbmcgYW5jZXN0
b3IuCi0gICAgRmxvYXRSZWN0IGNvbnRhaW5lclJlY3RSZWxhdGl2ZVRvU2Nyb2xsaW5nQW5jZXN0
b3IgPSBjb250YWluaW5nQmxvY2stPmxvY2FsVG9Db250YWluZXJRdWFkKEZsb2F0UmVjdChjb250
YWluZXJDb250ZW50UmVjdCksICZlbmNsb3NpbmdDbGlwcGluZ0JveCkuYm91bmRpbmdCb3goKTsK
KyAgICAvLyBGaW5hbGx5IGNvbXB1dGUgY29udGFpbmVyIHJlY3QgcmVsYXRpdmUgdG8gdGhlIHNj
cm9sbGluZyBhbmNlc3Rvci4gV2UgcGFzcyBhbiBlbXB0eQorICAgIC8vIG1vZGUgaGVyZSwgYmVj
YXVzZSBzdGlja3kgcG9zaXRpb25pbmcgc2hvdWxkIGlnbm9yZSB0cmFuc2Zvcm1zLgorICAgIEZs
b2F0UmVjdCBjb250YWluZXJSZWN0UmVsYXRpdmVUb1Njcm9sbGluZ0FuY2VzdG9yID0gY29udGFp
bmluZ0Jsb2NrLT5sb2NhbFRvQ29udGFpbmVyUXVhZChGbG9hdFJlY3QoY29udGFpbmVyQ29udGVu
dFJlY3QpLCAmZW5jbG9zaW5nQ2xpcHBpbmdCb3gsIHsgfSAvKiBpZ25vcmUgdHJhbnNmb3JtcyAq
LykuYm91bmRpbmdCb3goKTsKICAgICBpZiAoZW5jbG9zaW5nQ2xpcHBpbmdMYXllcikgewogICAg
ICAgICBGbG9hdFBvaW50IGNvbnRhaW5lckxvY2F0aW9uUmVsYXRpdmVUb1Njcm9sbGluZ0FuY2Vz
dG9yID0gY29udGFpbmVyUmVjdFJlbGF0aXZlVG9TY3JvbGxpbmdBbmNlc3Rvci5sb2NhdGlvbigp
IC0KICAgICAgICAgICAgIEZsb2F0U2l6ZShlbmNsb3NpbmdDbGlwcGluZ0JveC5ib3JkZXJMZWZ0
KCkgKyBlbmNsb3NpbmdDbGlwcGluZ0JveC5wYWRkaW5nTGVmdCgpLApAQCAtNTA4LDE1ICs1MDks
MTYgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29tcHV0ZVN0aWNreVBvc2l0aW9uQ29u
c3RyYWludHMoU3RpY2t5UG9zaXRpb25WaWV3cG8KICAgICAvLyBJZGVhbGx5LCBpdCB3b3VsZCBi
ZSBwb3NzaWJsZSB0byBjYWxsIHRoaXMtPmxvY2FsVG9Db250YWluZXJRdWFkIHRvIGRldGVybWlu
ZSB0aGUgZnJhbWUKICAgICAvLyByZWN0YW5nbGUgaW4gdGhlIGNvb3JkaW5hdGUgc3lzdGVtIG9m
IHRoZSBzY3JvbGxpbmcgYW5jZXN0b3IsIGJ1dCBsb2NhbFRvQ29udGFpbmVyUXVhZAogICAgIC8v
IGl0c2VsZiBkZXBlbmRzIG9uIHN0aWNreSBwb3NpdGlvbmluZyEgSW5zdGVhZCwgc3RhcnQgZnJv
bSB0aGUgcGFyZW50IGJ1dCBmaXJzdCBhZGp1c3RpbmcKLSAgICAvLyB0aGUgcmVjdGFuZ2xlIGZv
ciB0aGUgd3JpdGluZyBtb2RlIG9mIHRoaXMgc3RpY2tpbHktcG9zaXRpb25lZCBlbGVtZW50Lgor
ICAgIC8vIHRoZSByZWN0YW5nbGUgZm9yIHRoZSB3cml0aW5nIG1vZGUgb2YgdGhpcyBzdGlja2ls
eS1wb3NpdGlvbmVkIGVsZW1lbnQuIFdlIGFsc28gcGFzcyBhbgorICAgIC8vIGVtcHR5IG1vZGUg
aGVyZSBiZWNhdXNlIHN0aWNreSBwb3NpdGlvbmluZyBzaG91bGQgaWdub3JlIHRyYW5zZm9ybXMu
CiAgICAgLy8KLSAgICAvLyBGSVhNRTogRm9yIG5vdywgYXNzdW1lIHRoYXQgfHRoaXN8IGlzIG5v
dCB0cmFuc2Zvcm1lZC4gSXQgd291bGQgYWxzbyBiZSBuaWNlIHRvIG5vdCBoYXZlIHRvCi0gICAg
Ly8gY2FsbCBsb2NhbFRvQ29udGFpbmVyUXVhZCBhZ2FpbiBzaW5jZSB3ZSBoYXZlIGFscmVhZHkg
ZG9uZSBhIHNpbWlsYXIgY2FsbCB0byBtb3ZlIGZyb20KLSAgICAvLyB0aGUgY29udGFpbmluZyBi
bG9jayB0byB0aGUgc2Nyb2xsaW5nIGFuY2VzdG9yIGFib3ZlLCBidXQgbG9jYWxUb0NvbnRhaW5l
clF1YWQgdGFrZXMgY2FyZQotICAgIC8vIG9mIGEgbG90IG9mIGNvbXBsZXggc2l0dWF0aW9ucyBp
bnZvbHZpbmcgaW5saW5lcywgdGFibGVzLCBhbmQgdHJhbnNmb3JtYXRpb25zLgorICAgIC8vIEZJ
WE1FOiBJdCB3b3VsZCBhbHNvIGJlIG5pY2UgdG8gbm90IGhhdmUgdG8gY2FsbCBsb2NhbFRvQ29u
dGFpbmVyUXVhZCBhZ2FpbiBzaW5jZSB3ZQorICAgIC8vIGhhdmUgYWxyZWFkeSBkb25lIGEgc2lt
aWxhciBjYWxsIHRvIG1vdmUgZnJvbSB0aGUgY29udGFpbmluZyBibG9jayB0byB0aGUgc2Nyb2xs
aW5nCisgICAgLy8gYW5jZXN0b3IgYWJvdmUsIGJ1dCBsb2NhbFRvQ29udGFpbmVyUXVhZCB0YWtl
cyBjYXJlIG9mIGEgbG90IG9mIGNvbXBsZXggc2l0dWF0aW9ucworICAgIC8vIGludm9sdmluZyBp
bmxpbmVzLCB0YWJsZXMsIGFuZCB0cmFuc2Zvcm1hdGlvbnMuCiAgICAgaWYgKHBhcmVudCgpLT5p
c0JveCgpKQogICAgICAgICBkb3duY2FzdDxSZW5kZXJCb3g+KHBhcmVudCgpKS0+ZmxpcEZvcldy
aXRpbmdNb2RlKHN0aWNreUJveFJlY3QpOwotICAgIGF1dG8gc3RpY2t5Qm94UmVsYXRpdmVUb1Nj
cm9sbGluZ0FuY2VzdG9yID0gcGFyZW50KCktPmxvY2FsVG9Db250YWluZXJRdWFkKEZsb2F0UmVj
dChzdGlja3lCb3hSZWN0KSwgJmVuY2xvc2luZ0NsaXBwaW5nQm94KS5ib3VuZGluZ0JveCgpOwor
ICAgIGF1dG8gc3RpY2t5Qm94UmVsYXRpdmVUb1Njcm9sbGluZ0FuY2VzdG9yID0gcGFyZW50KCkt
PmxvY2FsVG9Db250YWluZXJRdWFkKEZsb2F0UmVjdChzdGlja3lCb3hSZWN0KSwgJmVuY2xvc2lu
Z0NsaXBwaW5nQm94LCB7IH0gLyogaWdub3JlIHRyYW5zZm9ybXMgKi8pLmJvdW5kaW5nQm94KCk7
CiAKICAgICBpZiAoZW5jbG9zaW5nQ2xpcHBpbmdMYXllcikgewogICAgICAgICBzdGlja3lCb3hS
ZWxhdGl2ZVRvU2Nyb2xsaW5nQW5jZXN0b3IubW92ZSgtRmxvYXRTaXplKGVuY2xvc2luZ0NsaXBw
aW5nQm94LmJvcmRlckxlZnQoKSArIGVuY2xvc2luZ0NsaXBwaW5nQm94LnBhZGRpbmdMZWZ0KCks
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA1YjY3MTk2OWFkMTIxYmNhMTU3ZDdi
YmZmOThhMmRkZTUwZjU5ZDNkLi45YWY3OWYwNjc4NDYzNWEyMzcxMzE4NjBmMmE3MDI1NjgxMzU4
NGE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAy
MS0wOC0yMyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CisKKyAgICAg
ICAgU3RpY2t5IHBvc2l0aW9uIHNob3VsZCBub3QgdXNlIHRyYW5zZm9ybWVkIHBvc2l0aW9uIHRv
IGNvbXB1dGUgc3RpY2t5IG9mZnNldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTE2NDI5MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjkwNTQ3NzM+
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICogd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3MtcG9zaXRpb24vc3RpY2t5L3Bvc2l0aW9uLXN0aWNreS10cmFu
c2Zvcm1zLXRyYW5zbGF0ZS1leHBlY3RlZC50eHQ6IFVwZGF0ZSByZXN1bHRzCisgICAgICAgIG9m
IHRlc3QgdG8gc2hvdyBwYXNzLgorCiAyMDIxLTA4LTIyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1t
YXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgQ29udHJvbCBjaGFyYWN0ZXJzIChVbmljb2Rl
IGNhdGVnb3J5IENjKSBzaG91bGQgYmUgcmVuZGVyZWQgdmlzaWJseQpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9u
L3N0aWNreS9wb3NpdGlvbi1zdGlja3ktdHJhbnNmb3Jtcy10cmFuc2xhdGUtZXhwZWN0ZWQudHh0
IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBv
c2l0aW9uL3N0aWNreS9wb3NpdGlvbi1zdGlja3ktdHJhbnNmb3Jtcy10cmFuc2xhdGUtZXhwZWN0
ZWQudHh0CmluZGV4IGY2MWJkOTc1YTJmZTgyYjAyN2U3ZTc0YjczNTZmOTE1YWRkN2MyZjUuLmUw
YjA2MTliZDdiYmVjZDE2YjI0MWNlOGZlNTgzOTZkYWE5N2FjNWEgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1wb3NpdGlvbi9z
dGlja3kvcG9zaXRpb24tc3RpY2t5LXRyYW5zZm9ybXMtdHJhbnNsYXRlLWV4cGVjdGVkLnR4dAor
KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
cG9zaXRpb24vc3RpY2t5L3Bvc2l0aW9uLXN0aWNreS10cmFuc2Zvcm1zLXRyYW5zbGF0ZS1leHBl
Y3RlZC50eHQKQEAgLTEsNSArMSw1IEBACiAKIFBBU1MgVHJhbnNsYXRpb24gdHJhbnNmb3JtIGNh
biBtb3ZlIHN0aWNreSBlbGVtZW50IHBhc3Qgc3RpY2tpbmcgcG9pbnQKIFBBU1MgU3R1Y2sgZWxl
bWVudHMgY2FuIHN0aWxsIGJlIG1vdmVkIHZpYSB0cmFuc2xhdGlvbnMKLUZBSUwgVGhlIHN0aWNr
eSBlbGVtZW50IHNob3VsZCBzdGljayBiZWZvcmUgdGhlIGNvbnRhaW5lciBpcyBvZmZzZXQgYnkg
YSB0cmFuc2xhdGlvbiBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAxNTAgYnV0IGdvdCAxMDAKK1BB
U1MgVGhlIHN0aWNreSBlbGVtZW50IHNob3VsZCBzdGljayBiZWZvcmUgdGhlIGNvbnRhaW5lciBp
cyBvZmZzZXQgYnkgYSB0cmFuc2xhdGlvbgogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>