<?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>217315</bug_id>
          
          <creation_ts>2020-10-05 08:28:02 -0700</creation_ts>
          <short_desc>Lazy loaded iframe should not lazy load when scripting is disabled</short_desc>
          <delta_ts>2020-12-01 09:14:53 -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>Frames</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="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>clopez</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>sam</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1694690</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-10-05 08:28:02 -0700</bug_when>
    <thetext>Lazy loaded iframe should not lazy load when scripting is disabled [1].

[1] https://html.spec.whatwg.org/#will-lazy-load-element-steps</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1694694</commentid>
    <comment_count>1</comment_count>
      <attachid>410519</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-10-05 08:29:57 -0700</bug_when>
    <thetext>Created attachment 410519
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1694695</commentid>
    <comment_count>2</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2020-10-05 08:30:34 -0700</bug_when>
    <thetext>This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1694707</commentid>
    <comment_count>3</comment_count>
      <attachid>410522</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-10-05 08:52:23 -0700</bug_when>
    <thetext>Created attachment 410522
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1696856</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-10-12 08:28:16 -0700</bug_when>
    <thetext>&lt;rdar://problem/70207607&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698491</commentid>
    <comment_count>5</comment_count>
      <attachid>411543</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-10-16 01:11:56 -0700</bug_when>
    <thetext>Created attachment 411543
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710301</commentid>
    <comment_count>6</comment_count>
      <attachid>414945</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-11-27 08:32:52 -0800</bug_when>
    <thetext>Created attachment 414945
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710439</commentid>
    <comment_count>7</comment_count>
      <attachid>414945</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2020-11-28 11:53:32 -0800</bug_when>
    <thetext>Comment on attachment 414945
Patch

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

&gt; Source/WebCore/html/HTMLIFrameElement.cpp:173
&gt;  
&gt; +    if (document.frame() &amp;&amp; !document.frame()-&gt;script().canExecuteScripts(NotAboutToExecuteScript))
&gt; +        return false;

For a document without a frame (e.g. one created via new Document() in JS, it seems like this should probably also return false, since script is pretty much implicitly disabled there. 

Would be nice to test that case as well (if its meaningful).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710492</commentid>
    <comment_count>8</comment_count>
      <attachid>414990</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-11-29 12:13:57 -0800</bug_when>
    <thetext>Created attachment 414990
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710499</commentid>
    <comment_count>9</comment_count>
      <attachid>414945</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-11-29 13:33:01 -0800</bug_when>
    <thetext>Comment on attachment 414945
Patch

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

&gt;&gt; Source/WebCore/html/HTMLIFrameElement.cpp:173
&gt;&gt; +        return false;
&gt; 
&gt; For a document without a frame (e.g. one created via new Document() in JS, it seems like this should probably also return false, since script is pretty much implicitly disabled there. 
&gt; 
&gt; Would be nice to test that case as well (if its meaningful).

Very good point, thanks! Fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710527</commentid>
    <comment_count>10</comment_count>
      <attachid>414990</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-11-29 21:20:44 -0800</bug_when>
    <thetext>Comment on attachment 414990
Patch

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

&gt; Source/WebCore/html/HTMLIFrameElement.cpp:172
&gt; +    if (!document.frame() || !document.frame()-&gt;script().canExecuteScripts(NotAboutToExecuteScript))

Can we find a way to share this expression with HTMLImageElement::isLazyLoadable? Null check on frame makes this expression long enough that it seems worth while. Maybe.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710576</commentid>
    <comment_count>11</comment_count>
      <attachid>415018</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-11-30 05:40:57 -0800</bug_when>
    <thetext>Created attachment 415018
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710611</commentid>
    <comment_count>12</comment_count>
      <attachid>414990</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-11-30 07:42:39 -0800</bug_when>
    <thetext>Comment on attachment 414990
Patch

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

&gt;&gt; Source/WebCore/html/HTMLIFrameElement.cpp:172
&gt;&gt; +    if (!document.frame() || !document.frame()-&gt;script().canExecuteScripts(NotAboutToExecuteScript))
&gt; 
&gt; Can we find a way to share this expression with HTMLImageElement::isLazyLoadable? Null check on frame makes this expression long enough that it seems worth while. Maybe.

The best way to share, I think, is to make it even more general, since this construction is used in a few places in HTML. So I added a helper to HTMLElement.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1710991</commentid>
    <comment_count>13</comment_count>
      <attachid>415118</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-12-01 02:32:37 -0800</bug_when>
    <thetext>Created attachment 415118
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711053</commentid>
    <comment_count>14</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-12-01 09:14:53 -0800</bug_when>
    <thetext>Committed r270300: &lt;https://trac.webkit.org/changeset/270300&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 415118.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410519</attachid>
            <date>2020-10-05 08:29:57 -0700</date>
            <delta_ts>2020-10-05 08:53:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217315-20201005162956.patch</filename>
            <type>text/plain</type>
            <size>5648</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEzODZjNmQ5OGI3ZWE4
OTgzYmVhNTM5NzM2ZTk1YTBmYzA5ZWM1OS4uMjVmMTE3ODVmNDgxODJmMTA5ZTNkZWEzZDYyZDMy
MzVmMzU2ODFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTA1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNo
b3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUg
c2hvdWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQgWzFdLgorCisg
ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6
eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKKworICAgICAgICBbMV0gaHR0cHM6Ly9o
dG1sLnNwZWMud2hhdHdnLm9yZy8jd2lsbC1sYXp5LWxvYWQtZWxlbWVudC1zdGVwcworCisgICAg
ICAgICogaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0Zy
YW1lTGF6eUxvYWRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJRnJhbWVFbGVtZW50Ojpz
aG91bGRMb2FkRnJhbWVMYXppbHkpOgorCiAyMDIwLTEwLTA1ICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CiAKICAgICAgICAgTUlNRSB0eXBlIHBhcnNlciBzaG91bGQgc2tpcCB0cmFpbGlu
ZyBIVFRQIHdoaXRlc3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElG
cmFtZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5j
cHAKaW5kZXggZjY4M2VmZTNlYjE5ZTAzYjc4NTAyOGVmNTdmNWRmNTUwNWUyYWViNS4uMmRhMzVk
MzlhNDQ3OTFhYzc2NTA5NmNlYjgxNzM1NTUyNTNmNDFjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt
bC9IVE1MSUZyYW1lRWxlbWVudC5jcHAKQEAgLTE2NCwxMSArMTY0LDE0IEBAIHZvaWQgSFRNTElG
cmFtZUVsZW1lbnQ6OnNldExvYWRpbmdGb3JCaW5kaW5ncyhjb25zdCBBdG9tU3RyaW5nJiB2YWx1
ZSkKICAgICBzZXRBdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKGxvYWRpbmdBdHRyLCB2
YWx1ZSk7CiB9CiAKLXN0YXRpYyBib29sIGlzRnJhbWVMYXp5TG9hZGFibGUoY29uc3QgVVJMJiBj
b21wbGV0ZVVSTCwgY29uc3QgQXRvbVN0cmluZyYgbG9hZGluZ0F0dHJpYnV0ZVZhbHVlKQorc3Rh
dGljIGJvb2wgaXNGcmFtZUxhenlMb2FkYWJsZShjb25zdCBEb2N1bWVudCYgLCBjb25zdCBVUkwm
IGNvbXBsZXRlVVJMLCBjb25zdCBBdG9tU3RyaW5nJiBsb2FkaW5nQXR0cmlidXRlVmFsdWUpCiB7
CiAgICAgaWYgKCFjb21wbGV0ZVVSTC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAg
IHJldHVybiBmYWxzZTsKIAorICAgIGlmIChkb2N1bWVudC5mcmFtZSgpICYmICFkb2N1bWVudC5m
cmFtZSgpLT5zY3JpcHQoKS5jYW5FeGVjdXRlU2NyaXB0cyhOb3RBYm91dFRvRXhlY3V0ZVNjcmlw
dCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIHJldHVybiBlcXVhbExldHRlcnNJZ25v
cmluZ0FTQ0lJQ2FzZShsb2FkaW5nQXR0cmlidXRlVmFsdWUsICJsYXp5Iik7CiB9CiAKQEAgLTE3
Niw3ICsxNzksNyBAQCBib29sIEhUTUxJRnJhbWVFbGVtZW50OjpzaG91bGRMb2FkRnJhbWVMYXpp
bHkoKQogewogICAgIGlmICghbV9sYXp5TG9hZEZyYW1lT2JzZXJ2ZXIgJiYgZG9jdW1lbnQoKS5z
ZXR0aW5ncygpLmxhenlJZnJhbWVMb2FkaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgIFVSTCBjb21w
bGV0ZVVSTCA9IGRvY3VtZW50KCkuY29tcGxldGVVUkwoZnJhbWVVUkwoKSk7Ci0gICAgICAgIGlm
IChpc0ZyYW1lTGF6eUxvYWRhYmxlKGNvbXBsZXRlVVJMLCBhdHRyaWJ1dGVXaXRob3V0U3luY2hy
b25pemF0aW9uKEhUTUxOYW1lczo6bG9hZGluZ0F0dHIpKSkgeworICAgICAgICBpZiAoaXNGcmFt
ZUxhenlMb2FkYWJsZShkb2N1bWVudCgpLCBjb21wbGV0ZVVSTCwgYXR0cmlidXRlV2l0aG91dFN5
bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OmxvYWRpbmdBdHRyKSkpIHsKICAgICAgICAgICAgIGF1
dG8gY3VycmVudFJlZmVycmVyUG9saWN5ID0gcmVmZXJyZXJQb2xpY3koKTsKICAgICAgICAgICAg
IGxhenlMb2FkRnJhbWVPYnNlcnZlcigpLm9ic2VydmUoY29tcGxldGVVUkwuc3RyaW5nKCksIGN1
cnJlbnRSZWZlcnJlclBvbGljeSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDA4MDE1ZGEyOGNmM2U1ZWQ4ZThhN2Q1MmRlNDg3NTZj
NjI1NmE2NTEuLjYzZGQ3MDNlOGZjMGNmOTQ5ZTU4YzgzNTg3ODA5ZDdmOGNiNTZlZmUgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTEwLTA1ICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1l
IHNob3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10
ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9p
ZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlwdC1kaXNhYmxlZC1pZnJhbWUuaHRtbDogQWRkZWQu
CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNv
bnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L3Jlc291cmNlcy9pZnJhbWUtbG9hZGluZy1sYXp5LWlu
LXZpZXdwb3J0Lmh0bWw6IEFkZGVkLgorCiAyMDIwLTEwLTA1ICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CiAKICAgICAgICAgTUlNRSB0eXBlIHBhcnNlciBzaG91bGQgc2tpcCB0cmFpbGlu
ZyBIVFRQIHdoaXRlc3BhY2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZy
YW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1l
Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwv
c2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2Fk
aW5nLWxhenktaW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU5YjMw
OTcxMTZlNTFlMTU4ZTNmNzU1NWQ2NmI0YzhiZTc4MTAxNmIKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenkt
aW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS5odG1sCkBAIC0wLDAgKzEsMjMgQEAKKzwhRE9DVFlQ
RSBodG1sPgorPGhlYWQ+Cis8dGl0bGU+SWZyYW1lcyB3aXRoIGxvYWRpbmc9J2xhenknIGluIHNj
cmlwdCBkaXNhYmxlZCBpZnJhbWUgYXJlIG5vdCBoYW5kbGVkCisgICAgICAgYXMgJ2xhenknPC90
aXRsZT4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9naXRodWIuY29tL3Njb3R0LWxp
dHRsZS9sYXp5bG9hZCI+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+
PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+
PC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxkaXYgc3R5bGU9ImhlaWdodDoxMDAwdmg7Ij48L2Rpdj4K
KzxpZnJhbWUgaWQ9ImlmcmFtZSIgc2FuZGJveD0iYWxsb3ctc2FtZS1vcmlnaW4iCisgICAgICAg
IHNyYz0icmVzb3VyY2VzL2lmcmFtZS1sb2FkaW5nLWxhenktaW4tdmlld3BvcnQuaHRtbCI+Cis8
L2lmcmFtZT4KKzxzY3JpcHQ+Citwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CisgIGF3YWl0IG5l
dyBQcm9taXNlKHJlc29sdmUgPT4gaWZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCByZXNv
bHZlKSk7CisKKyAgY29uc3QgaW5uZXJfaWZyYW1lID0gaWZyYW1lLmNvbnRlbnREb2N1bWVudC5x
dWVyeVNlbGVjdG9yKCJpZnJhbWUiKTsKKworICBhc3NlcnRfdHJ1ZShpbm5lcl9pZnJhbWUuY29u
dGVudERvY3VtZW50ICE9IG51bGwsCisgICAgICAgICAgICAgICJsYXp5LWxvYWQgaWZyYW1lIHNo
b3VsZG4ndCBiZSBob25vcmVkIGluIHNjcmlwdCBkaXNhYmxlZCBpZnJhbWUiKTsKK30pOworPC9z
Y3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50
L3Jlc291cmNlcy9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXZpZXdwb3J0Lmh0bWwgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVk
ZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L3Jlc291cmNlcy9pZnJhbWUtbG9hZGluZy1s
YXp5LWluLXZpZXdwb3J0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjVhZTgyNTlkZjdhNzBiNTE1MmZmMzJh
Yzg1NTc5ZmU4NjBhNjQxOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90
aGUtaWZyYW1lLWVsZW1lbnQvcmVzb3VyY2VzL2lmcmFtZS1sb2FkaW5nLWxhenktaW4tdmlld3Bv
cnQuaHRtbApAQCAtMCwwICsxLDcgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aWZyYW1lIGlkPSJp
ZnJhbWUiIGxvYWRpbmc9ImxhenkiIHNyYz0ic3ViZnJhbWUuaHRtbCI+CisKKzxzY3JpcHQ+Cisg
IGNvbnN0IGlmcmFtZSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJyNpZnJhbWUnKTsKKzwvc2Ny
aXB0Pgo=
</data>
<flag name="commit-queue"
          id="426482"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410522</attachid>
            <date>2020-10-05 08:52:23 -0700</date>
            <delta_ts>2020-10-16 01:11:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217315-20201005165222.patch</filename>
            <type>text/plain</type>
            <size>5656</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEzODZjNmQ5OGI3ZWE4
OTgzYmVhNTM5NzM2ZTk1YTBmYzA5ZWM1OS4uMjVmMTE3ODVmNDgxODJmMTA5ZTNkZWEzZDYyZDMy
MzVmMzU2ODFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTA1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNo
b3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUg
c2hvdWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQgWzFdLgorCisg
ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6
eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKKworICAgICAgICBbMV0gaHR0cHM6Ly9o
dG1sLnNwZWMud2hhdHdnLm9yZy8jd2lsbC1sYXp5LWxvYWQtZWxlbWVudC1zdGVwcworCisgICAg
ICAgICogaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0Zy
YW1lTGF6eUxvYWRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJRnJhbWVFbGVtZW50Ojpz
aG91bGRMb2FkRnJhbWVMYXppbHkpOgorCiAyMDIwLTEwLTA1ICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CiAKICAgICAgICAgTUlNRSB0eXBlIHBhcnNlciBzaG91bGQgc2tpcCB0cmFpbGlu
ZyBIVFRQIHdoaXRlc3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElG
cmFtZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5j
cHAKaW5kZXggZjY4M2VmZTNlYjE5ZTAzYjc4NTAyOGVmNTdmNWRmNTUwNWUyYWViNS4uOTBjNWZj
MzFkZmYwMTQwZWY1ODliYzRkMTliN2MyYmNiNzE0MGZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt
bC9IVE1MSUZyYW1lRWxlbWVudC5jcHAKQEAgLTE2NCwxMSArMTY0LDE0IEBAIHZvaWQgSFRNTElG
cmFtZUVsZW1lbnQ6OnNldExvYWRpbmdGb3JCaW5kaW5ncyhjb25zdCBBdG9tU3RyaW5nJiB2YWx1
ZSkKICAgICBzZXRBdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKGxvYWRpbmdBdHRyLCB2
YWx1ZSk7CiB9CiAKLXN0YXRpYyBib29sIGlzRnJhbWVMYXp5TG9hZGFibGUoY29uc3QgVVJMJiBj
b21wbGV0ZVVSTCwgY29uc3QgQXRvbVN0cmluZyYgbG9hZGluZ0F0dHJpYnV0ZVZhbHVlKQorc3Rh
dGljIGJvb2wgaXNGcmFtZUxhenlMb2FkYWJsZShjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQsIGNv
bnN0IFVSTCYgY29tcGxldGVVUkwsIGNvbnN0IEF0b21TdHJpbmcmIGxvYWRpbmdBdHRyaWJ1dGVW
YWx1ZSkKIHsKICAgICBpZiAoIWNvbXBsZXRlVVJMLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkK
ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKGRvY3VtZW50LmZyYW1lKCkgJiYgIWRv
Y3VtZW50LmZyYW1lKCktPnNjcmlwdCgpLmNhbkV4ZWN1dGVTY3JpcHRzKE5vdEFib3V0VG9FeGVj
dXRlU2NyaXB0KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgcmV0dXJuIGVxdWFsTGV0
dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGxvYWRpbmdBdHRyaWJ1dGVWYWx1ZSwgImxhenkiKTsKIH0K
IApAQCAtMTc2LDcgKzE3OSw3IEBAIGJvb2wgSFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZExvYWRG
cmFtZUxhemlseSgpCiB7CiAgICAgaWYgKCFtX2xhenlMb2FkRnJhbWVPYnNlcnZlciAmJiBkb2N1
bWVudCgpLnNldHRpbmdzKCkubGF6eUlmcmFtZUxvYWRpbmdFbmFibGVkKCkpIHsKICAgICAgICAg
VVJMIGNvbXBsZXRlVVJMID0gZG9jdW1lbnQoKS5jb21wbGV0ZVVSTChmcmFtZVVSTCgpKTsKLSAg
ICAgICAgaWYgKGlzRnJhbWVMYXp5TG9hZGFibGUoY29tcGxldGVVUkwsIGF0dHJpYnV0ZVdpdGhv
dXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjpsb2FkaW5nQXR0cikpKSB7CisgICAgICAgIGlm
IChpc0ZyYW1lTGF6eUxvYWRhYmxlKGRvY3VtZW50KCksIGNvbXBsZXRlVVJMLCBhdHRyaWJ1dGVX
aXRob3V0U3luY2hyb25pemF0aW9uKEhUTUxOYW1lczo6bG9hZGluZ0F0dHIpKSkgewogICAgICAg
ICAgICAgYXV0byBjdXJyZW50UmVmZXJyZXJQb2xpY3kgPSByZWZlcnJlclBvbGljeSgpOwogICAg
ICAgICAgICAgbGF6eUxvYWRGcmFtZU9ic2VydmVyKCkub2JzZXJ2ZShjb21wbGV0ZVVSTC5zdHJp
bmcoKSwgY3VycmVudFJlZmVycmVyUG9saWN5KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMDgwMTVkYTI4Y2YzZTVlZDhlOGE3ZDUy
ZGU0ODc1NmM2MjU2YTY1MS4uNjNkZDcwM2U4ZmMwY2Y5NDllNThjODM1ODc4MDlkN2Y4Y2I1NmVm
ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAt
MTAtMDUgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBMYXp5IGxvYWRl
ZCBpZnJhbWUgc2hvdWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzMxNQor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBs
YXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1l
bGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenktaW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS5odG1s
OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1i
ZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvcmVzb3VyY2VzL2lmcmFtZS1sb2FkaW5n
LWxhenktaW4tdmlld3BvcnQuaHRtbDogQWRkZWQuCisKIDIwMjAtMTAtMDUgIFJvYiBCdWlzICA8
cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBNSU1FIHR5cGUgcGFyc2VyIHNob3VsZCBza2lw
IHRyYWlsaW5nIEhUVFAgd2hpdGVzcGFjZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50
L3RoZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlwdC1kaXNhYmxl
ZC1pZnJhbWUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZy
YW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKbmV3IGZpbGUg
bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MC4uNTliMzA5NzExNmU1MWUxNThlM2Y3NTU1ZDY2YjRjOGJlNzgxMDE2YgotLS0gL2Rldi9udWxs
CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9z
ZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRp
bmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKQEAgLTAsMCArMSwyMyBAQAor
PCFET0NUWVBFIGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5JZnJhbWVzIHdpdGggbG9hZGluZz0nbGF6
eScgaW4gc2NyaXB0IGRpc2FibGVkIGlmcmFtZSBhcmUgbm90IGhhbmRsZWQKKyAgICAgICBhcyAn
bGF6eSc8L3RpdGxlPgorPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2dpdGh1Yi5jb20v
c2NvdHQtbGl0dGxlL2xhenlsb2FkIj4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJu
ZXNzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVw
b3J0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKworPGRpdiBzdHlsZT0iaGVpZ2h0OjEwMDB2aDsi
PjwvZGl2PgorPGlmcmFtZSBpZD0iaWZyYW1lIiBzYW5kYm94PSJhbGxvdy1zYW1lLW9yaWdpbiIK
KyAgICAgICAgc3JjPSJyZXNvdXJjZXMvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi12aWV3cG9ydC5o
dG1sIj4KKzwvaWZyYW1lPgorPHNjcmlwdD4KK3Byb21pc2VfdGVzdChhc3luYyB0ID0+IHsKKyAg
YXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBpZnJhbWUuYWRkRXZlbnRMaXN0ZW5lcigibG9h
ZCIsIHJlc29sdmUpKTsKKworICBjb25zdCBpbm5lcl9pZnJhbWUgPSBpZnJhbWUuY29udGVudERv
Y3VtZW50LnF1ZXJ5U2VsZWN0b3IoImlmcmFtZSIpOworCisgIGFzc2VydF90cnVlKGlubmVyX2lm
cmFtZS5jb250ZW50RG9jdW1lbnQgIT0gbnVsbCwKKyAgICAgICAgICAgICAgImxhenktbG9hZCBp
ZnJhbWUgc2hvdWxkbid0IGJlIGhvbm9yZWQgaW4gc2NyaXB0IGRpc2FibGVkIGlmcmFtZSIpOwor
fSk7Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1l
LWVsZW1lbnQvcmVzb3VyY2VzL2lmcmFtZS1sb2FkaW5nLWxhenktaW4tdmlld3BvcnQuaHRtbCBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvcmVzb3VyY2VzL2lmcmFtZS1s
b2FkaW5nLWxhenktaW4tdmlld3BvcnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iNWFlODI1OWRmN2E3MGI1
MTUyZmYzMmFjODU1NzlmZTg2MGE2NDE5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1j
b250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9yZXNvdXJjZXMvaWZyYW1lLWxvYWRpbmctbGF6eS1p
bi12aWV3cG9ydC5odG1sCkBAIC0wLDAgKzEsNyBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxpZnJh
bWUgaWQ9ImlmcmFtZSIgbG9hZGluZz0ibGF6eSIgc3JjPSJzdWJmcmFtZS5odG1sIj4KKworPHNj
cmlwdD4KKyAgY29uc3QgaWZyYW1lID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignI2lmcmFtZScp
OworPC9zY3JpcHQ+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>411543</attachid>
            <date>2020-10-16 01:11:56 -0700</date>
            <delta_ts>2020-11-27 08:32:44 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217315-20201016101154.patch</filename>
            <type>text/plain</type>
            <size>6580</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVhZWNhNTc2NzA2NGI0
MGRmODYyYzI0YTRjYzMyOTRmZmNlOWFlZS4uZTk4NTA0ZmJlZTc1ZDQxMTk1YTdhODk4YjY2ZWVh
NDU3YTUxMmI4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTE2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNo
b3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUg
c2hvdWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQgWzFdLgorCisg
ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6
eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKKworICAgICAgICBbMV0gaHR0cHM6Ly9o
dG1sLnNwZWMud2hhdHdnLm9yZy8jd2lsbC1sYXp5LWxvYWQtZWxlbWVudC1zdGVwcworCisgICAg
ICAgICogaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0Zy
YW1lTGF6eUxvYWRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJRnJhbWVFbGVtZW50Ojpz
aG91bGRMb2FkRnJhbWVMYXppbHkpOgorCiAyMDIwLTEwLTE1ICBDaHJpcyBMb3JkICA8Y2xvcmRA
aWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIEFkZCBzdXBwb3J0IGZvciBzbW9vdGgg
c2Nyb2xsaW5nIGFuaW1hdGlvbiB3aXRoIGFzeW5jIHNjcm9sbGluZwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o
dG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcAppbmRleCBmNjgzZWZlM2ViMTllMDNiNzg1MDI4ZWY1
N2Y1ZGY1NTA1ZTJhZWI1Li45MGM1ZmMzMWRmZjAxNDBlZjU4OWJjNGQxOWI3YzJiY2I3MTQwZmQw
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcApAQCAtMTY0LDEx
ICsxNjQsMTQgQEAgdm9pZCBIVE1MSUZyYW1lRWxlbWVudDo6c2V0TG9hZGluZ0ZvckJpbmRpbmdz
KGNvbnN0IEF0b21TdHJpbmcmIHZhbHVlKQogICAgIHNldEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJv
bml6YXRpb24obG9hZGluZ0F0dHIsIHZhbHVlKTsKIH0KIAotc3RhdGljIGJvb2wgaXNGcmFtZUxh
enlMb2FkYWJsZShjb25zdCBVUkwmIGNvbXBsZXRlVVJMLCBjb25zdCBBdG9tU3RyaW5nJiBsb2Fk
aW5nQXR0cmlidXRlVmFsdWUpCitzdGF0aWMgYm9vbCBpc0ZyYW1lTGF6eUxvYWRhYmxlKGNvbnN0
IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgVVJMJiBjb21wbGV0ZVVSTCwgY29uc3QgQXRvbVN0
cmluZyYgbG9hZGluZ0F0dHJpYnV0ZVZhbHVlKQogewogICAgIGlmICghY29tcGxldGVVUkwucHJv
dG9jb2xJc0luSFRUUEZhbWlseSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAo
ZG9jdW1lbnQuZnJhbWUoKSAmJiAhZG9jdW1lbnQuZnJhbWUoKS0+c2NyaXB0KCkuY2FuRXhlY3V0
ZVNjcmlwdHMoTm90QWJvdXRUb0V4ZWN1dGVTY3JpcHQpKQorICAgICAgICByZXR1cm4gZmFsc2U7
CisKICAgICByZXR1cm4gZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UobG9hZGluZ0F0dHJp
YnV0ZVZhbHVlLCAibGF6eSIpOwogfQogCkBAIC0xNzYsNyArMTc5LDcgQEAgYm9vbCBIVE1MSUZy
YW1lRWxlbWVudDo6c2hvdWxkTG9hZEZyYW1lTGF6aWx5KCkKIHsKICAgICBpZiAoIW1fbGF6eUxv
YWRGcmFtZU9ic2VydmVyICYmIGRvY3VtZW50KCkuc2V0dGluZ3MoKS5sYXp5SWZyYW1lTG9hZGlu
Z0VuYWJsZWQoKSkgewogICAgICAgICBVUkwgY29tcGxldGVVUkwgPSBkb2N1bWVudCgpLmNvbXBs
ZXRlVVJMKGZyYW1lVVJMKCkpOwotICAgICAgICBpZiAoaXNGcmFtZUxhenlMb2FkYWJsZShjb21w
bGV0ZVVSTCwgYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OmxvYWRp
bmdBdHRyKSkpIHsKKyAgICAgICAgaWYgKGlzRnJhbWVMYXp5TG9hZGFibGUoZG9jdW1lbnQoKSwg
Y29tcGxldGVVUkwsIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjps
b2FkaW5nQXR0cikpKSB7CiAgICAgICAgICAgICBhdXRvIGN1cnJlbnRSZWZlcnJlclBvbGljeSA9
IHJlZmVycmVyUG9saWN5KCk7CiAgICAgICAgICAgICBsYXp5TG9hZEZyYW1lT2JzZXJ2ZXIoKS5v
YnNlcnZlKGNvbXBsZXRlVVJMLnN0cmluZygpLCBjdXJyZW50UmVmZXJyZXJQb2xpY3kpOwogICAg
ICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBm
ZDdiMjlhMDFiZTA0NWZhZDhiZmQ1ZmFiMzg0Y2ZkOTZlNTg3MGNjLi5iNzRjMzZlZjc2YTkyODAw
ZDE2OGY2NGI5MDRhZTk4ZjJmYzljM2NlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxNiBAQAorMjAyMC0xMC0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t
PgorCisgICAgICAgIExhenkgbG9hZGVkIGlmcmFtZSBzaG91bGQgbm90IGxhenkgbG9hZCB3aGVu
IHNjcmlwdGluZyBpcyBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjE3MzE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgSW1wb3J0IGlmcmFtZS1sb2FkaW5nLWxhenktaW4tdmlld3BvcnQuaHRt
bC4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRl
ZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlw
dC1kaXNhYmxlZC1pZnJhbWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxh
dGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVs
ZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWw6
IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJl
ZGRlZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9yZXNvdXJjZXMvaWZyYW1lLWxvYWRpbmct
bGF6eS1pbi12aWV3cG9ydC5odG1sOiBBZGRlZC4KKwogMjAyMC0xMC0xNCAgU2VyZ2lvIFZpbGxh
ciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWZsZXhib3hdIGZs
ZXgtZ3JvdyBwcm9wZXJ0eSBzaG91bGQgYmUgYW5pbWF0YWJsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJl
ZGRlZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNj
cmlwdC1kaXNhYmxlZC1pZnJhbWUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3Ro
ZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlwdC1kaXNhYmxlZC1p
ZnJhbWUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJiZDlmMDY4MzE3NjQzYjZiZmZiNTYyN2Ey
ZTY1YTNkZGJmZDNjOTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhl
LWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenktaW4tc2NyaXB0LWRpc2FibGVkLWlm
cmFtZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACisKKworUEFTUyBJZnJhbWVzIHdpdGgg
bG9hZGluZz0nbGF6eScgaW4gc2NyaXB0IGRpc2FibGVkIGlmcmFtZSBhcmUgbm90IGhhbmRsZWQK
KyAgICAgICBhcyAnbGF6eScKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1p
ZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlwdC1kaXNhYmxlZC1pZnJh
bWUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRt
bC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxv
YWRpbmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAx
MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGYx
OTFjZDc4NDI2NzVkNzYzMDc5OTExZmU5ZjhiODBiZDQ0NzUwNgotLS0gL2Rldi9udWxsCisrKyBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6
eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKQEAgLTAsMCArMSwyMyBAQAorPCFET0NU
WVBFIGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5JZnJhbWVzIHdpdGggbG9hZGluZz0nbGF6eScgaW4g
c2NyaXB0IGRpc2FibGVkIGlmcmFtZSBhcmUgbm90IGhhbmRsZWQKKyAgICAgICBhcyAnbGF6eSc8
L3RpdGxlPgorPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2dpdGh1Yi5jb20vc2NvdHQt
bGl0dGxlL2xhenlsb2FkIj4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpz
Ij48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0Lmpz
Ij48L3NjcmlwdD4KKzwvaGVhZD4KKworPGRpdiBzdHlsZT0iaGVpZ2h0OjEwMDB2aDsiPjwvZGl2
PgorPGlmcmFtZSBpZD0iaWZyYW1lIiBzYW5kYm94PSJhbGxvdy1zYW1lLW9yaWdpbiIKKyAgICAg
ICAgc3JjPSJyZXNvdXJjZXMvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi12aWV3cG9ydC5odG1sIj4K
KzwvaWZyYW1lPgorPHNjcmlwdD4KK3Byb21pc2VfdGVzdChhc3luYyB0ID0+IHsKKyAgYXdhaXQg
bmV3IFByb21pc2UocmVzb2x2ZSA9PiBpZnJhbWUuYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIHJl
c29sdmUpKTsKKworICBjb25zdCBpbm5lcl9pZnJhbWUgPSBpZnJhbWUuY29udGVudERvY3VtZW50
LnF1ZXJ5U2VsZWN0b3IoImlmcmFtZSIpOworCisgIGFzc2VydF9lcXVhbHMoaW5uZXJfaWZyYW1l
LmNvbnRlbnREb2N1bWVudC5ib2R5LnRleHRDb250ZW50LnRyaW0oKSwgJ1N1YmZyYW1lJywKKyAg
ICAgICAgICAgICAgImxhenktbG9hZCBpZnJhbWUgc2hvdWxkbid0IGJlIGhvbm9yZWQgaW4gc2Ny
aXB0IGRpc2FibGVkIGlmcmFtZSIpOworfSk7Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1i
ZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvcmVzb3VyY2VzL2lmcmFtZS1sb2FkaW5n
LWxhenktaW4tdmlld3BvcnQuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVs
ZW1lbnQvcmVzb3VyY2VzL2lmcmFtZS1sb2FkaW5nLWxhenktaW4tdmlld3BvcnQuaHRtbApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi4xZWZkMmJkMDU2ZGRlODBkZTAzNDQ4YTc2YjliZDI4Zjk0ZmQxNzk1Ci0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9o
dG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9yZXNvdXJj
ZXMvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi12aWV3cG9ydC5odG1sCkBAIC0wLDAgKzEsMiBAQAor
PCFET0NUWVBFIGh0bWw+Cis8aWZyYW1lIGlkPSJpZnJhbWUiIGxvYWRpbmc9ImxhenkiIHNyYz0i
c3ViZnJhbWUuaHRtbCI+PC9pZnJhbWU+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>414945</attachid>
            <date>2020-11-27 08:32:52 -0800</date>
            <delta_ts>2020-11-29 12:13:51 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217315-20201127173250.patch</filename>
            <type>text/plain</type>
            <size>4955</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTFkZDllNjFhMjBjNDRk
MGQ5Y2EzMDM0YmMzMTNiOTdlMGViYzBiZS4uNWI1NDVlZTRhMzA5OGIxMWZhOWMxZWI4MzA0ODYx
ZWM2NmRmZjI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTExLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNo
b3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUg
c2hvdWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQgWzFdLgorCisg
ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6
eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKKworICAgICAgICBbMV0gaHR0cHM6Ly9o
dG1sLnNwZWMud2hhdHdnLm9yZy8jd2lsbC1sYXp5LWxvYWQtZWxlbWVudC1zdGVwcworCisgICAg
ICAgIFRoaXMgbWF0Y2hlcyBDaHJvbWUgYW5kIEZpcmVmb3guCisKKyAgICAgICAgKiBodG1sL0hU
TUxJRnJhbWVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzRnJhbWVMYXp5TG9hZGFi
bGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZExvYWRGcmFt
ZUxhemlseSk6CisKIDIwMjAtMTEtMjcgIFbDrWN0b3IgTWFudWVsIErDoXF1ZXogTGVhbCAgPHZq
YXF1ZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjk2NDIpIFtHU3RyZWFt
ZXJdW1dlYlJUQ10gVW5leHBlY3RlZCByZXN1bHRzIGFmdGVyIHVwZGF0ZSB0byBNODcKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwIGIvU291cmNl
L1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAKaW5kZXggZjY4M2VmZTNlYjE5ZTAz
Yjc4NTAyOGVmNTdmNWRmNTUwNWUyYWViNS4uOTBjNWZjMzFkZmYwMTQwZWY1ODliYzRkMTliN2My
YmNiNzE0MGZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxl
bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAK
QEAgLTE2NCwxMSArMTY0LDE0IEBAIHZvaWQgSFRNTElGcmFtZUVsZW1lbnQ6OnNldExvYWRpbmdG
b3JCaW5kaW5ncyhjb25zdCBBdG9tU3RyaW5nJiB2YWx1ZSkKICAgICBzZXRBdHRyaWJ1dGVXaXRo
b3V0U3luY2hyb25pemF0aW9uKGxvYWRpbmdBdHRyLCB2YWx1ZSk7CiB9CiAKLXN0YXRpYyBib29s
IGlzRnJhbWVMYXp5TG9hZGFibGUoY29uc3QgVVJMJiBjb21wbGV0ZVVSTCwgY29uc3QgQXRvbVN0
cmluZyYgbG9hZGluZ0F0dHJpYnV0ZVZhbHVlKQorc3RhdGljIGJvb2wgaXNGcmFtZUxhenlMb2Fk
YWJsZShjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFVSTCYgY29tcGxldGVVUkwsIGNv
bnN0IEF0b21TdHJpbmcmIGxvYWRpbmdBdHRyaWJ1dGVWYWx1ZSkKIHsKICAgICBpZiAoIWNvbXBs
ZXRlVVJMLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog
CisgICAgaWYgKGRvY3VtZW50LmZyYW1lKCkgJiYgIWRvY3VtZW50LmZyYW1lKCktPnNjcmlwdCgp
LmNhbkV4ZWN1dGVTY3JpcHRzKE5vdEFib3V0VG9FeGVjdXRlU2NyaXB0KSkKKyAgICAgICAgcmV0
dXJuIGZhbHNlOworCiAgICAgcmV0dXJuIGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGxv
YWRpbmdBdHRyaWJ1dGVWYWx1ZSwgImxhenkiKTsKIH0KIApAQCAtMTc2LDcgKzE3OSw3IEBAIGJv
b2wgSFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZExvYWRGcmFtZUxhemlseSgpCiB7CiAgICAgaWYg
KCFtX2xhenlMb2FkRnJhbWVPYnNlcnZlciAmJiBkb2N1bWVudCgpLnNldHRpbmdzKCkubGF6eUlm
cmFtZUxvYWRpbmdFbmFibGVkKCkpIHsKICAgICAgICAgVVJMIGNvbXBsZXRlVVJMID0gZG9jdW1l
bnQoKS5jb21wbGV0ZVVSTChmcmFtZVVSTCgpKTsKLSAgICAgICAgaWYgKGlzRnJhbWVMYXp5TG9h
ZGFibGUoY29tcGxldGVVUkwsIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRNTE5h
bWVzOjpsb2FkaW5nQXR0cikpKSB7CisgICAgICAgIGlmIChpc0ZyYW1lTGF6eUxvYWRhYmxlKGRv
Y3VtZW50KCksIGNvbXBsZXRlVVJMLCBhdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKEhU
TUxOYW1lczo6bG9hZGluZ0F0dHIpKSkgewogICAgICAgICAgICAgYXV0byBjdXJyZW50UmVmZXJy
ZXJQb2xpY3kgPSByZWZlcnJlclBvbGljeSgpOwogICAgICAgICAgICAgbGF6eUxvYWRGcmFtZU9i
c2VydmVyKCkub2JzZXJ2ZShjb21wbGV0ZVVSTC5zdHJpbmcoKSwgY3VycmVudFJlZmVycmVyUG9s
aWN5KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM
b2cKaW5kZXggZWI3MTdiMjNhZGJhMzc2OWRhNzdkNzkzNTEyZTI4YjYyNmI4ZjFmNC4uYWM1MzU4
N2FiMTI3NjBiYjcyMWY3ZWQ5Y2YxYzQyOWRkYzBkYTc0NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTEtMjcgIFJvYiBCdWlzICA8cmJ1aXNA
aWdhbGlhLmNvbT4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUgc2hvdWxkIG5vdCBsYXp5
IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzMxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcG9ydCBpZnJhbWUtbG9hZGluZy1sYXp5LWluLXZp
ZXdwb3J0Lmh0bWwuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6
eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg
ICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhl
LWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenktaW4tc2NyaXB0LWRpc2FibGVkLWlm
cmFtZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1h
bnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvcmVzb3VyY2VzL2lmcmFt
ZS1sb2FkaW5nLWxhenktaW4tdmlld3BvcnQuaHRtbDogQWRkZWQuCisKIDIwMjAtMTEtMjAgIFNl
cmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1m
bGV4XSBJbWFnZXMgYXMgZmxleCBpdGVtcyBzaG91bGQgdXNlIHRoZSBvdmVycmlkaW5nTG9naWNh
bFdpZHRoIHdoZW4gZGVmaW5lZCB0byBjb21wdXRlIHRoZSBsb2dpY2FsIGhlaWdodApkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3Nl
bWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGlu
Zy1sYXp5LWluLXNjcmlwdC1kaXNhYmxlZC1pZnJhbWUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRl
ZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlw
dC1kaXNhYmxlZC1pZnJhbWUtZXhwZWN0ZWQudHh0CmluZGV4IGQyMzllOTNhZGNkOWZjMGFkMjFj
MmNhOGIwZDE1ZTQxYWZjZDhlYTUuLjJiZDlmMDY4MzE3NjQzYjZiZmZiNTYyN2EyZTY1YTNkZGJm
ZDNjOTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQv
aWZyYW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLWV4cGVjdGVkLnR4
dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwv
c2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2Fk
aW5nLWxhenktaW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQKQEAgLTEsNSAr
MSw1IEBACiAKIAotRkFJTCBJZnJhbWVzIHdpdGggbG9hZGluZz0nbGF6eScgaW4gc2NyaXB0IGRp
c2FibGVkIGlmcmFtZSBhcmUgbm90IGhhbmRsZWQKLSAgICAgICBhcyAnbGF6eScgcHJvbWlzZV90
ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdpdGggdmFsdWU6IG9iamVjdCAiVHlwZUVycm9yOiBu
dWxsIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRpbmcgJ2lubmVyX2lmcmFtZS5jb250ZW50RG9j
dW1lbnQuYm9keScpIgorUEFTUyBJZnJhbWVzIHdpdGggbG9hZGluZz0nbGF6eScgaW4gc2NyaXB0
IGRpc2FibGVkIGlmcmFtZSBhcmUgbm90IGhhbmRsZWQKKyAgICAgICBhcyAnbGF6eScKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>414990</attachid>
            <date>2020-11-29 12:13:57 -0800</date>
            <delta_ts>2020-11-30 05:40:53 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217315-20201129211355.patch</filename>
            <type>text/plain</type>
            <size>5637</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVhMmE2NmU1NWQ5NTg0
NmRhMWJhNzRlZGQ0MTQ0NTg2MGUwZmI1Yi4uOTQ0ZTViMGE4Y2Y0MDgyZDk2ZWEyOGY2NGY5YWZj
MmM4NDk0Nzg4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTExLTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNo
b3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUg
c2hvdWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQgWzFdLgorCisg
ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6
eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKKworICAgICAgICBbMV0gaHR0cHM6Ly9o
dG1sLnNwZWMud2hhdHdnLm9yZy8jd2lsbC1sYXp5LWxvYWQtZWxlbWVudC1zdGVwcworCisgICAg
ICAgIFRoaXMgbWF0Y2hlcyBDaHJvbWUgYW5kIEZpcmVmb3guCisKKyAgICAgICAgKiBodG1sL0hU
TUxJRnJhbWVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzRnJhbWVMYXp5TG9hZGFi
bGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZExvYWRGcmFt
ZUxhemlseSk6CisKIDIwMjAtMTEtMjkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K
IAogICAgICAgICBbTEZDXVtJRkNdIENyZWF0ZSBydW5zIGZvciBpbmxpbmUgYm94ZXMKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwIGIvU291cmNl
L1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAKaW5kZXggZjY4M2VmZTNlYjE5ZTAz
Yjc4NTAyOGVmNTdmNWRmNTUwNWUyYWViNS4uMzA2ZjI2NzhkM2VmN2QwYTYyODU2YTQyY2ViYWNi
MDQwN2ZkYjI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxl
bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAK
QEAgLTE2NCwxMSArMTY0LDE0IEBAIHZvaWQgSFRNTElGcmFtZUVsZW1lbnQ6OnNldExvYWRpbmdG
b3JCaW5kaW5ncyhjb25zdCBBdG9tU3RyaW5nJiB2YWx1ZSkKICAgICBzZXRBdHRyaWJ1dGVXaXRo
b3V0U3luY2hyb25pemF0aW9uKGxvYWRpbmdBdHRyLCB2YWx1ZSk7CiB9CiAKLXN0YXRpYyBib29s
IGlzRnJhbWVMYXp5TG9hZGFibGUoY29uc3QgVVJMJiBjb21wbGV0ZVVSTCwgY29uc3QgQXRvbVN0
cmluZyYgbG9hZGluZ0F0dHJpYnV0ZVZhbHVlKQorc3RhdGljIGJvb2wgaXNGcmFtZUxhenlMb2Fk
YWJsZShjb25zdCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFVSTCYgY29tcGxldGVVUkwsIGNv
bnN0IEF0b21TdHJpbmcmIGxvYWRpbmdBdHRyaWJ1dGVWYWx1ZSkKIHsKICAgICBpZiAoIWNvbXBs
ZXRlVVJMLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog
CisgICAgaWYgKCFkb2N1bWVudC5mcmFtZSgpIHx8ICFkb2N1bWVudC5mcmFtZSgpLT5zY3JpcHQo
KS5jYW5FeGVjdXRlU2NyaXB0cyhOb3RBYm91dFRvRXhlY3V0ZVNjcmlwdCkpCisgICAgICAgIHJl
dHVybiBmYWxzZTsKKwogICAgIHJldHVybiBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShs
b2FkaW5nQXR0cmlidXRlVmFsdWUsICJsYXp5Iik7CiB9CiAKQEAgLTE3Niw3ICsxNzksNyBAQCBi
b29sIEhUTUxJRnJhbWVFbGVtZW50OjpzaG91bGRMb2FkRnJhbWVMYXppbHkoKQogewogICAgIGlm
ICghbV9sYXp5TG9hZEZyYW1lT2JzZXJ2ZXIgJiYgZG9jdW1lbnQoKS5zZXR0aW5ncygpLmxhenlJ
ZnJhbWVMb2FkaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgIFVSTCBjb21wbGV0ZVVSTCA9IGRvY3Vt
ZW50KCkuY29tcGxldGVVUkwoZnJhbWVVUkwoKSk7Ci0gICAgICAgIGlmIChpc0ZyYW1lTGF6eUxv
YWRhYmxlKGNvbXBsZXRlVVJMLCBhdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKEhUTUxO
YW1lczo6bG9hZGluZ0F0dHIpKSkgeworICAgICAgICBpZiAoaXNGcmFtZUxhenlMb2FkYWJsZShk
b2N1bWVudCgpLCBjb21wbGV0ZVVSTCwgYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihI
VE1MTmFtZXM6OmxvYWRpbmdBdHRyKSkpIHsKICAgICAgICAgICAgIGF1dG8gY3VycmVudFJlZmVy
cmVyUG9saWN5ID0gcmVmZXJyZXJQb2xpY3koKTsKICAgICAgICAgICAgIGxhenlMb2FkRnJhbWVP
YnNlcnZlcigpLm9ic2VydmUoY29tcGxldGVVUkwuc3RyaW5nKCksIGN1cnJlbnRSZWZlcnJlclBv
bGljeSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ
bWFnZUVsZW1lbnQuY3BwCmluZGV4IGM1YTRiMTA1MWYwNWFlZWIxYjljN2ZiOTExMWJjY2YwY2Vj
MWVhNTcuLjAyMjFiNGU3ZDgyYmJiNzljODM1MDZjM2MyNzQ2MmVkZWRjYmIxMTAgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcApAQCAtODcwLDcgKzg3MCw3IEBAIGJv
b2wgSFRNTEltYWdlRWxlbWVudDo6aXNEZWZlcnJlZCgpIGNvbnN0CiAKIGJvb2wgSFRNTEltYWdl
RWxlbWVudDo6aXNMYXp5TG9hZGFibGUoKSBjb25zdAogewotICAgIGlmIChkb2N1bWVudCgpLmZy
YW1lKCkgJiYgIWRvY3VtZW50KCkuZnJhbWUoKS0+c2NyaXB0KCkuY2FuRXhlY3V0ZVNjcmlwdHMo
Tm90QWJvdXRUb0V4ZWN1dGVTY3JpcHQpKQorICAgIGlmICghZG9jdW1lbnQoKS5mcmFtZSgpIHx8
ICFkb2N1bWVudCgpLmZyYW1lKCktPnNjcmlwdCgpLmNhbkV4ZWN1dGVTY3JpcHRzKE5vdEFib3V0
VG9FeGVjdXRlU2NyaXB0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiBoYXNM
YXp5TG9hZGFibGVBdHRyaWJ1dGVWYWx1ZShhdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9u
KEhUTUxOYW1lczo6bG9hZGluZ0F0dHIpKTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n
CmluZGV4IGViNzE3YjIzYWRiYTM3NjlkYTc3ZDc5MzUxMmUyOGI2MjZiOGYxZjQuLjgxYjIzNGQz
ZmRiMmNkMjMzZjZlMTM0NzFhMzcwM2U0NGJkMzRkMjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No
YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTExLTI5ICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNob3VsZCBub3QgbGF6eSBs
b2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBJbXBvcnQgaWZyYW1lLWxvYWRpbmctbGF6eS1pbi12aWV3
cG9ydC5odG1sLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenkt
aW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq
IHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1p
ZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlwdC1kaXNhYmxlZC1pZnJh
bWUuaHRtbDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50
aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L3Jlc291cmNlcy9pZnJhbWUt
bG9hZGluZy1sYXp5LWluLXZpZXdwb3J0Lmh0bWw6IEFkZGVkLgorCiAyMDIwLTExLTIwICBTZXJn
aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZmxl
eF0gSW1hZ2VzIGFzIGZsZXggaXRlbXMgc2hvdWxkIHVzZSB0aGUgb3ZlcnJpZGluZ0xvZ2ljYWxX
aWR0aCB3aGVuIGRlZmluZWQgdG8gY29tcHV0ZSB0aGUgbG9naWNhbCBoZWlnaHQKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1h
bnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmct
bGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQt
Y29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQt
ZGlzYWJsZWQtaWZyYW1lLWV4cGVjdGVkLnR4dAppbmRleCBkMjM5ZTkzYWRjZDlmYzBhZDIxYzJj
YThiMGQxNWU0MWFmY2Q4ZWE1Li4yYmQ5ZjA2ODMxNzY0M2I2YmZmYjU2MjdhMmU2NWEzZGRiZmQz
YzkwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lm
cmFtZS1sb2FkaW5nLWxhenktaW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQK
KysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3Nl
bWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGlu
Zy1sYXp5LWluLXNjcmlwdC1kaXNhYmxlZC1pZnJhbWUtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEs
NSBAQAogCiAKLUZBSUwgSWZyYW1lcyB3aXRoIGxvYWRpbmc9J2xhenknIGluIHNjcmlwdCBkaXNh
YmxlZCBpZnJhbWUgYXJlIG5vdCBoYW5kbGVkCi0gICAgICAgYXMgJ2xhenknIHByb21pc2VfdGVz
dDogVW5oYW5kbGVkIHJlamVjdGlvbiB3aXRoIHZhbHVlOiBvYmplY3QgIlR5cGVFcnJvcjogbnVs
bCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICdpbm5lcl9pZnJhbWUuY29udGVudERvY3Vt
ZW50LmJvZHknKSIKK1BBU1MgSWZyYW1lcyB3aXRoIGxvYWRpbmc9J2xhenknIGluIHNjcmlwdCBk
aXNhYmxlZCBpZnJhbWUgYXJlIG5vdCBoYW5kbGVkCisgICAgICAgYXMgJ2xhenknCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415018</attachid>
            <date>2020-11-30 05:40:57 -0800</date>
            <delta_ts>2020-12-01 02:32:33 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217315-20201130144056.patch</filename>
            <type>text/plain</type>
            <size>8697</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTkyOGJiMmM0ZWE4Mzg3
MzI4NTY4NDE2MWI2MjY4YjM3OGM4N2E1Zi4uZjIzNThhMDk3NTE3ZWUyODI2NGVlNGNmZDQzNDg5
OTAyOGI4MzNhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTExLTMwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNo
b3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUgc2hv
dWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQgWzFdLgorCisgICAg
ICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3Mv
ZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6eS1p
bi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKKworICAgICAgICBbMV0gaHR0cHM6Ly9odG1s
LnNwZWMud2hhdHdnLm9yZy8jd2lsbC1sYXp5LWxvYWQtZWxlbWVudC1zdGVwcworCisgICAgICAg
IFRoaXMgbWF0Y2hlcyBDaHJvbWUgYW5kIEZpcmVmb3guCisKKyAgICAgICAgKiBodG1sL0hUTUxD
YW52YXNFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDYW52YXNFbGVtZW50Ojpj
cmVhdGVFbGVtZW50UmVuZGVyZXIpOgorICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnQuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnQ6OnJlbmRlcmVySXNFdmVyTmVlZGVkKToKKyAg
ICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50OjpzY3JpcHRpbmdFbmFibGVkIGNvbnN0KTogQWRk
CisgICAgICAgIGhlbHBlciBtZXRob2QuCisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5oOgor
ICAgICAgICAqIGh0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
SFRNTElGcmFtZUVsZW1lbnQ6OmlzRnJhbWVMYXp5TG9hZGFibGUgY29uc3QpOgorICAgICAgICAo
V2ViQ29yZTo6SFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZExvYWRGcmFtZUxhemlseSk6CisgICAg
ICAgIChXZWJDb3JlOjppc0ZyYW1lTGF6eUxvYWRhYmxlKTogRGVsZXRlZC4KKyAgICAgICAgKiBo
dG1sL0hUTUxJRnJhbWVFbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VFbGVtZW50
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6OmlzTGF6eUxvYWRhYmxl
IGNvbnN0KToKKwogMjAyMC0xMS0zMCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJp
c0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIE1lZGlhIHBsYXllciBkb2VzIG5v
dCBwcm9wZXJseSBpbmhpYml0LCB1bmluaGliaXQgc2xlZXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I
VE1MQ2FudmFzRWxlbWVudC5jcHAKaW5kZXggMTY5Y2FhOTAwMjRkMjY3NzIzMDUwNjJmNTk4ZDEy
Y2NkZGJhYjNmZi4uZTg1OWM4YTRiYTJiODMzOTZmNzEzZTQ1YmJhYWFjYjQzM2IzMjdlZSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKQEAgLTE2Niw4ICsxNjYs
NyBAQCB2b2lkIEhUTUxDYW52YXNFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZp
ZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tU3RyaQogCiBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4g
SFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZUVsZW1lbnRSZW5kZXJlcihSZW5kZXJTdHlsZSYmIHN0
eWxlLCBjb25zdCBSZW5kZXJUcmVlUG9zaXRpb24mIGluc2VydGlvblBvc2l0aW9uKQogewotICAg
IFJlZlB0cjxGcmFtZT4gZnJhbWUgPSBkb2N1bWVudCgpLmZyYW1lKCk7Ci0gICAgaWYgKGZyYW1l
ICYmIGZyYW1lLT5zY3JpcHQoKS5jYW5FeGVjdXRlU2NyaXB0cyhOb3RBYm91dFRvRXhlY3V0ZVNj
cmlwdCkpCisgICAgaWYgKHNjcmlwdGluZ0VuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIGNyZWF0
ZVJlbmRlcmVyPFJlbmRlckhUTUxDYW52YXM+KCp0aGlzLCBXVEZNb3ZlKHN0eWxlKSk7CiAgICAg
cmV0dXJuIEhUTUxFbGVtZW50OjpjcmVhdGVFbGVtZW50UmVuZGVyZXIoV1RGTW92ZShzdHlsZSks
IGluc2VydGlvblBvc2l0aW9uKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv
SFRNTEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKaW5k
ZXggNjU4ZmI5MTg5YWRlNTJiYjFiZmRiMDMxYjYwYmU3ZGMzZWE2MzNmNy4uODJjMjIzYzQyYjVl
Y2I5OTliODViMDlkZGJkZTE2OTAyNzA4MDRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
aHRtbC9IVE1MRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVu
dC5jcHAKQEAgLTc3OCw4ICs3NzgsNyBAQCB2b2lkIEhUTUxFbGVtZW50OjpzZXRUcmFuc2xhdGUo
Ym9vbCBlbmFibGUpCiBib29sIEhUTUxFbGVtZW50OjpyZW5kZXJlcklzRXZlck5lZWRlZCgpCiB7
CiAgICAgaWYgKGhhc1RhZ05hbWUobm9zY3JpcHRUYWcpKSB7Ci0gICAgICAgIFJlZlB0cjxGcmFt
ZT4gZnJhbWUgPSBkb2N1bWVudCgpLmZyYW1lKCk7Ci0gICAgICAgIGlmIChmcmFtZSAmJiBmcmFt
ZS0+c2NyaXB0KCkuY2FuRXhlY3V0ZVNjcmlwdHMoTm90QWJvdXRUb0V4ZWN1dGVTY3JpcHQpKQor
ICAgICAgICBpZiAoc2NyaXB0aW5nRW5hYmxlZCgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNl
OwogICAgIH0gZWxzZSBpZiAoaGFzVGFnTmFtZShub2VtYmVkVGFnKSkgewogICAgICAgICBSZWZQ
dHI8RnJhbWU+IGZyYW1lID0gZG9jdW1lbnQoKS5mcmFtZSgpOwpAQCAtMTE4Niw2ICsxMTg1LDEz
IEBAIHZvaWQgSFRNTEVsZW1lbnQ6OnNldEVudGVyS2V5SGludChjb25zdCBTdHJpbmcmIHZhbHVl
KQogICAgIHNldEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oZW50ZXJrZXloaW50QXR0
ciwgdmFsdWUpOwogfQogCitib29sIEhUTUxFbGVtZW50OjpzY3JpcHRpbmdFbmFibGVkKCkgY29u
c3QKK3sKKyAgICBpZiAoYXV0byBmcmFtZSA9IGRvY3VtZW50KCkuZnJhbWUoKSkKKyAgICAgICAg
cmV0dXJuIGZyYW1lLT5zY3JpcHQoKS5jYW5FeGVjdXRlU2NyaXB0cyhOb3RBYm91dFRvRXhlY3V0
ZVNjcmlwdCk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl
CiAKICNpZm5kZWYgTkRFQlVHCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxF
bGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmgKaW5kZXggNzZhYzA3
NDY3OTRlNzFkMDUwN2U2MWEwYWRhODA0M2ZmNzZhMjg5OC4uNjczNDZiYmRkNzI1ZjI0ZWIxZmVm
NzVkYjQxMGY0YjBiM2M4YjRiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M
RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuaApAQCAtMTIy
LDYgKzEyMiw4IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgZW50ZXJLZXlIaW50KCkgY29uc3Q7CiAg
ICAgdm9pZCBzZXRFbnRlcktleUhpbnQoY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAKKyAgICBib29s
IHNjcmlwdGluZ0VuYWJsZWQoKSBjb25zdDsKKwogcHJvdGVjdGVkOgogICAgIEhUTUxFbGVtZW50
KGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50JiwgQ29uc3RydWN0aW9uVHlw
ZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQu
Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHAKaW5kZXggZjY4
M2VmZTNlYjE5ZTAzYjc4NTAyOGVmNTdmNWRmNTUwNWUyYWViNS4uYzE0ZmU5YTUwZDg0MWE1MzRh
NzIxNWM4MjgzNzFlZjJiMGUxMmU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I
VE1MSUZyYW1lRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1l
RWxlbWVudC5jcHAKQEAgLTE2NCwxOSArMTY0LDIyIEBAIHZvaWQgSFRNTElGcmFtZUVsZW1lbnQ6
OnNldExvYWRpbmdGb3JCaW5kaW5ncyhjb25zdCBBdG9tU3RyaW5nJiB2YWx1ZSkKICAgICBzZXRB
dHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKGxvYWRpbmdBdHRyLCB2YWx1ZSk7CiB9CiAK
LXN0YXRpYyBib29sIGlzRnJhbWVMYXp5TG9hZGFibGUoY29uc3QgVVJMJiBjb21wbGV0ZVVSTCwg
Y29uc3QgQXRvbVN0cmluZyYgbG9hZGluZ0F0dHJpYnV0ZVZhbHVlKQorYm9vbCBIVE1MSUZyYW1l
RWxlbWVudDo6aXNGcmFtZUxhenlMb2FkYWJsZShjb25zdCBVUkwmIGNvbXBsZXRlVVJMKSBjb25z
dAogewogICAgIGlmICghY29tcGxldGVVUkwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQogICAg
ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJ
SUNhc2UobG9hZGluZ0F0dHJpYnV0ZVZhbHVlLCAibGF6eSIpOworICAgIGlmICghc2NyaXB0aW5n
RW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gZXF1YWxMZXR0
ZXJzSWdub3JpbmdBU0NJSUNhc2UoYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1M
TmFtZXM6OmxvYWRpbmdBdHRyKSwgImxhenkiKTsKIH0KIAogYm9vbCBIVE1MSUZyYW1lRWxlbWVu
dDo6c2hvdWxkTG9hZEZyYW1lTGF6aWx5KCkKIHsKICAgICBpZiAoIW1fbGF6eUxvYWRGcmFtZU9i
c2VydmVyICYmIGRvY3VtZW50KCkuc2V0dGluZ3MoKS5sYXp5SWZyYW1lTG9hZGluZ0VuYWJsZWQo
KSkgewogICAgICAgICBVUkwgY29tcGxldGVVUkwgPSBkb2N1bWVudCgpLmNvbXBsZXRlVVJMKGZy
YW1lVVJMKCkpOwotICAgICAgICBpZiAoaXNGcmFtZUxhenlMb2FkYWJsZShjb21wbGV0ZVVSTCwg
YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OmxvYWRpbmdBdHRyKSkp
IHsKKyAgICAgICAgaWYgKGlzRnJhbWVMYXp5TG9hZGFibGUoY29tcGxldGVVUkwpKSB7CiAgICAg
ICAgICAgICBhdXRvIGN1cnJlbnRSZWZlcnJlclBvbGljeSA9IHJlZmVycmVyUG9saWN5KCk7CiAg
ICAgICAgICAgICBsYXp5TG9hZEZyYW1lT2JzZXJ2ZXIoKS5vYnNlcnZlKGNvbXBsZXRlVVJMLnN0
cmluZygpLCBjdXJyZW50UmVmZXJyZXJQb2xpY3kpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmggYi9T
b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmgKaW5kZXggMjFjMzdjNmZiMTRk
NDM0MTEyZGFjYmMxNzljMTg0MDBlMWRkZGE3YS4uNmU0NWQ3Zjg0YTdmNWEyMzkyM2E3MzM4M2U3
ZTQzMDYyYWFjZjZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1l
RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuaApA
QCAtNjcsNiArNjcsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgcmVuZGVyZXJJc05lZWRlZChjb25z
dCBSZW5kZXJTdHlsZSYpIGZpbmFsOwogICAgIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBjcmVh
dGVFbGVtZW50UmVuZGVyZXIoUmVuZGVyU3R5bGUmJiwgY29uc3QgUmVuZGVyVHJlZVBvc2l0aW9u
JikgZmluYWw7CiAKKyAgICBib29sIGlzRnJhbWVMYXp5TG9hZGFibGUoY29uc3QgVVJMJiBjb21w
bGV0ZVVSTCkgY29uc3Q7CisKICAgICBib29sIHNob3VsZExvYWRGcmFtZUxhemlseSgpIGZpbmFs
OwogICAgIGJvb2wgaXNMYXp5TG9hZE9ic2VydmVyQWN0aXZlKCkgY29uc3QgZmluYWw7CiAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCmluZGV4IGM1YTRiMTA1MWYwNWFl
ZWIxYjljN2ZiOTExMWJjY2YwY2VjMWVhNTcuLjU5MjIxYzkyNGVmNjBjZTZiM2M1Zjk3NGJhZGFm
MmRjYmJlODdjNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxl
bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcApA
QCAtODcwLDcgKzg3MCw3IEBAIGJvb2wgSFRNTEltYWdlRWxlbWVudDo6aXNEZWZlcnJlZCgpIGNv
bnN0CiAKIGJvb2wgSFRNTEltYWdlRWxlbWVudDo6aXNMYXp5TG9hZGFibGUoKSBjb25zdAogewot
ICAgIGlmIChkb2N1bWVudCgpLmZyYW1lKCkgJiYgIWRvY3VtZW50KCkuZnJhbWUoKS0+c2NyaXB0
KCkuY2FuRXhlY3V0ZVNjcmlwdHMoTm90QWJvdXRUb0V4ZWN1dGVTY3JpcHQpKQorICAgIGlmICgh
c2NyaXB0aW5nRW5hYmxlZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmV0dXJuIGhh
c0xhenlMb2FkYWJsZUF0dHJpYnV0ZVZhbHVlKGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRp
b24oSFRNTE5hbWVzOjpsb2FkaW5nQXR0cikpOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM
b2cKaW5kZXggY2U1ODliN2QwMzFkY2Q4YzRmNGZiMTA5MDg2NGJhOTFiOTFhYjMzYi4uNTZiMjcx
MWExODZhNmMwZDNmMGQzZmI4ZTliZmY5ZmJjOGQyNjViOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTEtMzAgIFJvYiBCdWlzICA8cmJ1aXNA
aWdhbGlhLmNvbT4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUgc2hvdWxkIG5vdCBsYXp5
IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzMxNQorCisgICAgICAgIFJldmlld2VkIGJ5IERh
cmluIEFkbGVyLgorCisgICAgICAgIFVwZGF0ZSBpbXByb3ZlZCB0ZXN0IGV4cGVjdGF0aW9uLgor
CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNv
bnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenktaW4tc2NyaXB0LWRp
c2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQ6CisKIDIwMjAtMTEtMzAgIFNlcmdpbyBWaWxsYXIg
U2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1mbGV4XSBJbXBvcnQg
ZmxleC1hc3BlY3QtcmF0aW8taW1nLSogdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29u
dGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQtZGlz
YWJsZWQtaWZyYW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1l
LWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLWV4
cGVjdGVkLnR4dAppbmRleCBkMjM5ZTkzYWRjZDlmYzBhZDIxYzJjYThiMGQxNWU0MWFmY2Q4ZWE1
Li4yYmQ5ZjA2ODMxNzY0M2I2YmZmYjU2MjdhMmU2NWEzZGRiZmQzYzkwIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenkt
aW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1j
b250ZW50L3RoZS1pZnJhbWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlwdC1k
aXNhYmxlZC1pZnJhbWUtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAogCiAKLUZBSUwgSWZy
YW1lcyB3aXRoIGxvYWRpbmc9J2xhenknIGluIHNjcmlwdCBkaXNhYmxlZCBpZnJhbWUgYXJlIG5v
dCBoYW5kbGVkCi0gICAgICAgYXMgJ2xhenknIHByb21pc2VfdGVzdDogVW5oYW5kbGVkIHJlamVj
dGlvbiB3aXRoIHZhbHVlOiBvYmplY3QgIlR5cGVFcnJvcjogbnVsbCBpcyBub3QgYW4gb2JqZWN0
IChldmFsdWF0aW5nICdpbm5lcl9pZnJhbWUuY29udGVudERvY3VtZW50LmJvZHknKSIKK1BBU1Mg
SWZyYW1lcyB3aXRoIGxvYWRpbmc9J2xhenknIGluIHNjcmlwdCBkaXNhYmxlZCBpZnJhbWUgYXJl
IG5vdCBoYW5kbGVkCisgICAgICAgYXMgJ2xhenknCiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415118</attachid>
            <date>2020-12-01 02:32:37 -0800</date>
            <delta_ts>2020-12-01 09:14:53 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217315-20201201113236.patch</filename>
            <type>text/plain</type>
            <size>5479</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjEyOGM3YzVkZTAzNTBh
ZWJmODdhZTlmZDQ2NTM4MTFmY2M3ZjRkNi4uZmNmYjRiNjE1MmUzYTdhZTI3YTQ4MWU4MzgwYzc5
YzMyOGNjNzIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEyLTAxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTGF6eSBsb2FkZWQgaWZyYW1lIHNo
b3VsZCBub3QgbGF6eSBsb2FkIHdoZW4gc2NyaXB0aW5nIGlzIGRpc2FibGVkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTczMTUKKworICAgICAgICBS
ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUgc2hv
dWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQgWzFdLgorCisgICAg
ICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3Mv
ZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQvaWZyYW1lLWxvYWRpbmctbGF6eS1p
bi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLmh0bWwKKworICAgICAgICBbMV0gaHR0cHM6Ly9odG1s
LnNwZWMud2hhdHdnLm9yZy8jd2lsbC1sYXp5LWxvYWQtZWxlbWVudC1zdGVwcworCisgICAgICAg
IFRoaXMgbWF0Y2hlcyBDaHJvbWUgYW5kIEZpcmVmb3guCisKKyAgICAgICAgKiBodG1sL0hUTUxJ
RnJhbWVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzRnJhbWVMYXp5TG9hZGFibGUp
OgorICAgICAgICAoV2ViQ29yZTo6SFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZExvYWRGcmFtZUxh
emlseSk6CisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6OmlzTGF6eUxvYWRhYmxlIGNvbnN0KToKKwogMjAyMC0x
Mi0wMSAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBb
R1RLXVtXUEVdIEFzeW5jIHNjcm9sbGluZyB1ZHBhdGVzIGFyZSBibG9ja2VkIGluIHRoZSBtYWlu
IHRocmVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVu
dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcAppbmRleCBm
NjgzZWZlM2ViMTllMDNiNzg1MDI4ZWY1N2Y1ZGY1NTA1ZTJhZWI1Li4zMDZmMjY3OGQzZWY3ZDBh
NjI4NTZhNDJjZWJhY2IwNDA3ZmRiMjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s
L0hUTUxJRnJhbWVFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJh
bWVFbGVtZW50LmNwcApAQCAtMTY0LDExICsxNjQsMTQgQEAgdm9pZCBIVE1MSUZyYW1lRWxlbWVu
dDo6c2V0TG9hZGluZ0ZvckJpbmRpbmdzKGNvbnN0IEF0b21TdHJpbmcmIHZhbHVlKQogICAgIHNl
dEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obG9hZGluZ0F0dHIsIHZhbHVlKTsKIH0K
IAotc3RhdGljIGJvb2wgaXNGcmFtZUxhenlMb2FkYWJsZShjb25zdCBVUkwmIGNvbXBsZXRlVVJM
LCBjb25zdCBBdG9tU3RyaW5nJiBsb2FkaW5nQXR0cmlidXRlVmFsdWUpCitzdGF0aWMgYm9vbCBp
c0ZyYW1lTGF6eUxvYWRhYmxlKGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgVVJMJiBj
b21wbGV0ZVVSTCwgY29uc3QgQXRvbVN0cmluZyYgbG9hZGluZ0F0dHJpYnV0ZVZhbHVlKQogewog
ICAgIGlmICghY29tcGxldGVVUkwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQogICAgICAgICBy
ZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWRvY3VtZW50LmZyYW1lKCkgfHwgIWRvY3VtZW50LmZy
YW1lKCktPnNjcmlwdCgpLmNhbkV4ZWN1dGVTY3JpcHRzKE5vdEFib3V0VG9FeGVjdXRlU2NyaXB0
KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgcmV0dXJuIGVxdWFsTGV0dGVyc0lnbm9y
aW5nQVNDSUlDYXNlKGxvYWRpbmdBdHRyaWJ1dGVWYWx1ZSwgImxhenkiKTsKIH0KIApAQCAtMTc2
LDcgKzE3OSw3IEBAIGJvb2wgSFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZExvYWRGcmFtZUxhemls
eSgpCiB7CiAgICAgaWYgKCFtX2xhenlMb2FkRnJhbWVPYnNlcnZlciAmJiBkb2N1bWVudCgpLnNl
dHRpbmdzKCkubGF6eUlmcmFtZUxvYWRpbmdFbmFibGVkKCkpIHsKICAgICAgICAgVVJMIGNvbXBs
ZXRlVVJMID0gZG9jdW1lbnQoKS5jb21wbGV0ZVVSTChmcmFtZVVSTCgpKTsKLSAgICAgICAgaWYg
KGlzRnJhbWVMYXp5TG9hZGFibGUoY29tcGxldGVVUkwsIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJv
bml6YXRpb24oSFRNTE5hbWVzOjpsb2FkaW5nQXR0cikpKSB7CisgICAgICAgIGlmIChpc0ZyYW1l
TGF6eUxvYWRhYmxlKGRvY3VtZW50KCksIGNvbXBsZXRlVVJMLCBhdHRyaWJ1dGVXaXRob3V0U3lu
Y2hyb25pemF0aW9uKEhUTUxOYW1lczo6bG9hZGluZ0F0dHIpKSkgewogICAgICAgICAgICAgYXV0
byBjdXJyZW50UmVmZXJyZXJQb2xpY3kgPSByZWZlcnJlclBvbGljeSgpOwogICAgICAgICAgICAg
bGF6eUxvYWRGcmFtZU9ic2VydmVyKCkub2JzZXJ2ZShjb21wbGV0ZVVSTC5zdHJpbmcoKSwgY3Vy
cmVudFJlZmVycmVyUG9saWN5KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJD
b3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKaW5kZXggYzVhNGIxMDUxZjA1YWVlYjFiOWM3
ZmI5MTExYmNjZjBjZWMxZWE1Ny4uMDIyMWI0ZTdkODJiYmI3OWM4MzUwNmMzYzI3NDYyZWRlZGNi
YjExMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCkBAIC04NzAs
NyArODcwLDcgQEAgYm9vbCBIVE1MSW1hZ2VFbGVtZW50Ojppc0RlZmVycmVkKCkgY29uc3QKIAog
Ym9vbCBIVE1MSW1hZ2VFbGVtZW50Ojppc0xhenlMb2FkYWJsZSgpIGNvbnN0CiB7Ci0gICAgaWYg
KGRvY3VtZW50KCkuZnJhbWUoKSAmJiAhZG9jdW1lbnQoKS5mcmFtZSgpLT5zY3JpcHQoKS5jYW5F
eGVjdXRlU2NyaXB0cyhOb3RBYm91dFRvRXhlY3V0ZVNjcmlwdCkpCisgICAgaWYgKCFkb2N1bWVu
dCgpLmZyYW1lKCkgfHwgIWRvY3VtZW50KCkuZnJhbWUoKS0+c2NyaXB0KCkuY2FuRXhlY3V0ZVNj
cmlwdHMoTm90QWJvdXRUb0V4ZWN1dGVTY3JpcHQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAg
ICAgcmV0dXJuIGhhc0xhenlMb2FkYWJsZUF0dHJpYnV0ZVZhbHVlKGF0dHJpYnV0ZVdpdGhvdXRT
eW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjpsb2FkaW5nQXR0cikpOwogfQpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cKaW5kZXggNmNkYjA2NDY1ZDJlNjY3NTljMTZjN2VmOGExMmFiYTk3M2Rh
ZDY3MC4uYTM4MzQ5YmQxMjZiM2EzZDcwOWE5YWU5NzBlYzE0OWRiYTBhNzRlYyAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTItMDEgIFJvYiBC
dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBMYXp5IGxvYWRlZCBpZnJhbWUgc2hv
dWxkIG5vdCBsYXp5IGxvYWQgd2hlbiBzY3JpcHRpbmcgaXMgZGlzYWJsZWQKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzMxNQorCisgICAgICAgIFJl
dmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFVwZGF0ZSBpbXByb3ZlZCB0ZXN0IGV4
cGVjdGF0aW9uLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxhenkt
aW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQ6CisKIDIwMjAtMTItMDEgIFNl
cmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1m
bGV4Ym94XSBXZWJLaXQgZG9lc24ndCBwcmVzZXJ2ZSBhc3BlY3QgcmF0aW8gd2hlbiBjb21wdXRp
bmcgY3Jvc3Mgc2l6ZSBvZiBmbGV4ZWQgaW1hZ2VzIGluIGF1dG8taGVpZ2h0IGZsZXggY29udGFp
bmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lm
cmFtZS1sb2FkaW5nLWxhenktaW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50
aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWlmcmFtZS1lbGVtZW50L2lmcmFtZS1sb2FkaW5nLWxh
enktaW4tc2NyaXB0LWRpc2FibGVkLWlmcmFtZS1leHBlY3RlZC50eHQKaW5kZXggZDIzOWU5M2Fk
Y2Q5ZmMwYWQyMWMyY2E4YjBkMTVlNDFhZmNkOGVhNS4uMmJkOWYwNjgzMTc2NDNiNmJmZmI1NjI3
YTJlNjVhM2RkYmZkM2M5MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pZnJh
bWUtZWxlbWVudC9pZnJhbWUtbG9hZGluZy1sYXp5LWluLXNjcmlwdC1kaXNhYmxlZC1pZnJhbWUt
ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaWZyYW1lLWVsZW1lbnQv
aWZyYW1lLWxvYWRpbmctbGF6eS1pbi1zY3JpcHQtZGlzYWJsZWQtaWZyYW1lLWV4cGVjdGVkLnR4
dApAQCAtMSw1ICsxLDUgQEAKIAogCi1GQUlMIElmcmFtZXMgd2l0aCBsb2FkaW5nPSdsYXp5JyBp
biBzY3JpcHQgZGlzYWJsZWQgaWZyYW1lIGFyZSBub3QgaGFuZGxlZAotICAgICAgIGFzICdsYXp5
JyBwcm9taXNlX3Rlc3Q6IFVuaGFuZGxlZCByZWplY3Rpb24gd2l0aCB2YWx1ZTogb2JqZWN0ICJU
eXBlRXJyb3I6IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAnaW5uZXJfaWZyYW1l
LmNvbnRlbnREb2N1bWVudC5ib2R5JykiCitQQVNTIElmcmFtZXMgd2l0aCBsb2FkaW5nPSdsYXp5
JyBpbiBzY3JpcHQgZGlzYWJsZWQgaWZyYW1lIGFyZSBub3QgaGFuZGxlZAorICAgICAgIGFzICds
YXp5JwogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>