<?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>213144</bug_id>
          
          <creation_ts>2020-06-12 13:19:39 -0700</creation_ts>
          <short_desc>Make API tests tolerant of our relatively new use of WebPageProxy::preconnectTo</short_desc>
          <delta_ts>2020-06-15 15:35:17 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Alex Christensen">achristensen</reporter>
          <assigned_to name="Alex Christensen">achristensen</assigned_to>
          <cc>cdumez</cc>
    
    <cc>ggaren</cc>
    
    <cc>jbedard</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1662115</commentid>
    <comment_count>0</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-12 13:19:39 -0700</bug_when>
    <thetext>Make API tests tolerant of our relatively new use of WebPageProxy::preconnectTo</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662117</commentid>
    <comment_count>1</comment_count>
      <attachid>401771</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-12 13:29:39 -0700</bug_when>
    <thetext>Created attachment 401771
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662136</commentid>
    <comment_count>2</comment_count>
      <attachid>401771</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-12 13:53:08 -0700</bug_when>
    <thetext>Comment on attachment 401771
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662177</commentid>
    <comment_count>3</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-12 14:53:13 -0700</bug_when>
    <thetext>Looks like MultipleClientCertificateConnections tests also need fixing.  That was a real regression that was covered up.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662180</commentid>
    <comment_count>4</comment_count>
      <attachid>401789</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-12 14:58:55 -0700</bug_when>
    <thetext>Created attachment 401789
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662193</commentid>
    <comment_count>5</comment_count>
      <attachid>401789</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-12 15:14:34 -0700</bug_when>
    <thetext>Comment on attachment 401789
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662208</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-12 15:58:06 -0700</bug_when>
    <thetext>Geofferey Garen found in /Volumes/Data/worker/Commit-Queue/build/Tools/ChangeLog does not appear to be a valid reviewer according to contributors.json.
/Volumes/Data/worker/Commit-Queue/build/Tools/ChangeLog neither lists a valid reviewer nor contains the string &quot;Unreviewed&quot; or &quot;Rubber stamp&quot; (case insensitive).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662212</commentid>
    <comment_count>7</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-12 16:01:24 -0700</bug_when>
    <thetext>(In reply to EWS from comment #6)
&gt; Geofferey Garen found in
&gt; /Volumes/Data/worker/Commit-Queue/build/Tools/ChangeLog does not appear to
&gt; be a valid reviewer according to contributors.json.

That&apos;s why I go with &quot;Geoff Garen&quot; in ChangeLogs :P</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662221</commentid>
    <comment_count>8</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-12 16:32:29 -0700</bug_when>
    <thetext>http://trac.webkit.org/r262985</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662223</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-12 16:33:19 -0700</bug_when>
    <thetext>&lt;rdar://problem/64316743&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662863</commentid>
    <comment_count>10</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-15 15:29:24 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662864</commentid>
    <comment_count>11</comment_count>
      <attachid>401950</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-15 15:29:25 -0700</bug_when>
    <thetext>Created attachment 401950
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1662866</commentid>
    <comment_count>12</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-15 15:35:12 -0700</bug_when>
    <thetext>https://trac.webkit.org/changeset/263066/webkit</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401771</attachid>
            <date>2020-06-12 13:29:39 -0700</date>
            <delta_ts>2020-06-12 14:58:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213144-20200612132938.patch</filename>
            <type>text/plain</type>
            <size>14139</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjI5MjYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTEyICBBbGV4IENocmlz
dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBBUEkgdGVz
dHMgdG9sZXJhbnQgb2Ygb3VyIHJlbGF0aXZlbHkgbmV3IHVzZSBvZiBXZWJQYWdlUHJveHk6OnBy
ZWNvbm5lY3RUbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjEzMTQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgUmVtb3ZlIHRoZSBjaGVjayB0byBub3QgcHJlY29ubmVjdCB0byBsb29wYmFjayBhZGRyZXNz
ZXMuCisgICAgICAgIFRoaXMgd2FzIG1ha2luZyBvdXIgdGVzdHMgZGlmZmVyZW50IHRoYW4gdGhl
IHJlYWwgaW50ZXJuZXQgYW5kIHByZXZlbnRlZCBtZSBmcm9tIGxhbmRpbmcgYSBwZXJmZWN0bHkg
Z29vZCB0ZXN0CisgICAgICAgIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMTMxMDkKKworICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz
UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpwcmVjb25u
ZWN0VG8pOgorCiAyMDIwLTA2LTExICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAog
ICAgICAgICBSZXBsYWNlIGluc3RhbmNlcyBvZiB3aGl0ZWxpc3QgaW4gV2ViQ29yZSB3aXRoIGFs
bG93bGlzdApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJv
Y2Vzc1Byb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3
b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiAyNjI5MjApCisrKyBTb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCSh3b3JraW5n
IGNvcHkpCkBAIC0xNDcyLDcgKzE0NzIsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6Omdl
dExvY2FsU3RvcmFnCiAKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6cHJlY29ubmVjdFRvKFBB
TDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgV2ViUGFnZVByb3h5SWRlbnRpZmllciB3ZWJQYWdlUHJv
eHlJRCwgV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIgd2ViUGFnZUlELCBjb25zdCBVUkwmIHVybCwg
Y29uc3QgU3RyaW5nJiB1c2VyQWdlbnQsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5
IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBPcHRpb25hbDxOYXZpZ2F0aW5nVG9BcHBCb3VuZERv
bWFpbj4gaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbikKIHsKLSAgICBpZiAoIXVybC5pc1Zh
bGlkKCkgfHwgIXVybC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgfHwgU2VjdXJpdHlPcmlnaW46
OmlzTG9jYWxIb3N0T3JMb29wYmFja0lQQWRkcmVzcyh1cmwuaG9zdCgpKSkKKyAgICBpZiAoIXVy
bC5pc1ZhbGlkKCkgfHwgIXVybC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgIHJl
dHVybjsKICAgICBzZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6UHJlY29ubmVjdFRvKHNl
c3Npb25JRCwgd2ViUGFnZVByb3h5SUQsIHdlYlBhZ2VJRCwgdXJsLCB1c2VyQWdlbnQsIHN0b3Jl
ZENyZWRlbnRpYWxzUG9saWN5LCBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKSwgMCk7CiB9
CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShy
ZXZpc2lvbiAyNjI5NzEpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs
MyArMSwzMyBAQAorMjAyMC0wNi0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3
ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgQVBJIHRlc3RzIHRvbGVyYW50IG9mIG91ciByZWxh
dGl2ZWx5IG5ldyB1c2Ugb2YgV2ViUGFnZVByb3h5OjpwcmVjb25uZWN0VG8KKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzE0NAorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vc3QgY2hhbmdlcyBhcmUgc3Ry
YWlnaHRmb3J3YXJkIG1vdmluZyB0byBIVFRQU2VydmVyLCB3aGljaCBpcyBtb3JlIHRvbGVyYW50
IG9mIGRpZmZlcmVudCBudW1iZXJzIG9mIGNvbm5lY3Rpb25zIGV4Y2VwdCB0aGVzZSB0d286CisK
KyAgICAgICAgVGhlIFJlc291cmNlTG9hZERlbGVnYXRlLkNoYWxsZW5nZSBBUEkgdGVzdCB3YXMg
Y2hlY2tpbmcgdGhlIG91dHB1dCBvZiBfV0tSZXNvdXJjZUxvYWREZWxlZ2F0ZS5kaWRSZWNlaXZl
Q2hhbGxlbmdlCisgICAgICAgIGJ5IHVzaW5nIGEgc2VydmVyIHRydXN0IGNoYWxsZW5nZS4gIE5v
dyB0aGF0IHByZWNvbm5lY3RpbmcgaGFwcGVucywgdGhlIHNlcnZlciB0cnVzdCBldmFsdWF0aW9u
IHdvdWxkIGhhcHBlbiB3aXRoIGEKKyAgICAgICAgUHJlY29ubmVjdFRhc2ssIG5vdCB0aGUgbWFp
biByZXNvdXJjZSBsb2FkLiAgVGhlIFdLTmF2aWdhdGlvbkRlbGVnYXRlIHN0aWxsIGdldHMgdGhl
IGNoYWxsZW5nZSBhbmQgdGhlcmUgaXMgbm8gcHJvYmxlbQorICAgICAgICBoZXJlLCBidXQgaW4g
b3JkZXIgdG8gY29udGludWUgdG8gdGVzdCBfV0tSZXNvdXJjZUxvYWREZWxlZ2F0ZS5kaWRSZWNl
aXZlQ2hhbGxlbmdlIEkgdXNlIGEgYmFzaWMgYXV0aGVudGljYXRpb24gY2hhbGxlbmdlCisgICAg
ICAgIGluc3RlYWQgb2YgYSBzZXJ2ZXIgdHJ1c3QgZXZhbHVhdGlvbi4KKworICAgICAgICBUaGUg
V2ViS2l0LkZhc3RTZXJ2ZXJUcnVzdCBBUEkgdGVzdCBub3cgaGFzIHR3byBmYWlsZWQgYXR0ZW1w
dHMgKG9uZSBmcm9tIHRoZSBwcmVjb25uZWN0IGF0dGVtcHQsIG9uZSBmcm9tIHRoZSBtYWluIHJl
c291cmNlIGxvYWQgYXR0ZW1wdCksCisgICAgICAgIGJ1dCBvbmx5IHdoZW4gX3N0cmljdFRydXN0
RXZhbHVhdGUgaXMgbm90IGF2YWlsYWJsZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVENQ
U2VydmVyLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRDUFNlcnZlcjo6VENQU2VydmVy
KToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1RDUFNlcnZlci5oOgorICAgICAgICAqIFRlc3RX
ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQ2hhbGxlbmdlLm1tOgorICAgICAgICAoVEVTVCk6
CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ
L1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tOgorICAgICAgICAqIFRl
c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtlckJhc2ljLm1tOgorICAg
ICAgICAqIFRlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5oOgorICAgICAgICAqIFRlc3RX
ZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkhU
VFBTZXJ2ZXI6OnJlc3BvbmRXaXRoQ2hhbGxlbmdlVGhlbk9LKToKKwogMjAyMC0wNi0xMiAgVGFr
YXNoaSBLb21vcmkgIDxUYWthc2hpLktvbW9yaUBzb255LmNvbT4KIAogICAgICAgICBbQ3VybF0g
SW1wbGVtZW50IGZ1bmN0aW9ucyB0byB1c2UgUmVzb3VyY2VMb2FkU3RhdGlzdGljcy4KSW5kZXg6
IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVENQU2VydmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9U
ZXN0V2ViS2l0QVBJL1RDUFNlcnZlci5jcHAJKHJldmlzaW9uIDI2MjkyMCkKKysrIFRvb2xzL1Rl
c3RXZWJLaXRBUEkvVENQU2VydmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA3LDcgKzIwNyw3
IEBAIHZvaWQgVENQU2VydmVyOjpzdGFydFNlY3VyZUNvbm5lY3Rpb24oU28KICAgICBzZWN1cmVD
b25uZWN0aW9uSGFuZGxlcihhY2NlcHRSZXN1bHQgPiAwID8gc3NsLmdldCgpIDogbnVsbHB0cik7
CiB9OwogCi1UQ1BTZXJ2ZXI6OlRDUFNlcnZlcihQcm90b2NvbCBwcm90b2NvbCwgRnVuY3Rpb248
dm9pZChTU0wqKT4mJiBzZWN1cmVDb25uZWN0aW9uSGFuZGxlciwgT3B0aW9uYWw8dWludDE2X3Q+
IG1heFRMU1ZlcnNpb24pCitUQ1BTZXJ2ZXI6OlRDUFNlcnZlcihQcm90b2NvbCBwcm90b2NvbCwg
RnVuY3Rpb248dm9pZChTU0wqKT4mJiBzZWN1cmVDb25uZWN0aW9uSGFuZGxlciwgT3B0aW9uYWw8
dWludDE2X3Q+IG1heFRMU1ZlcnNpb24sIHNpemVfdCBjb25uZWN0aW9ucykKIHsKICAgICBzd2l0
Y2ggKHByb3RvY29sKSB7CiAgICAgY2FzZSBQcm90b2NvbDo6SFRUUFM6CkBAIC0yMzIsNyArMjMy
LDcgQEAgVENQU2VydmVyOjpUQ1BTZXJ2ZXIoUHJvdG9jb2wgcHJvdG9jb2wsIAogICAgICAgICB9
OwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgbGlzdGVuRm9yQ29ubmVjdGlvbnMoMSk7Cisg
ICAgbGlzdGVuRm9yQ29ubmVjdGlvbnMoY29ubmVjdGlvbnMpOwogfQogI2VuZGlmIC8vIEhBVkUo
U1NMKQogCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1RDUFNlcnZlci5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVENQU2VydmVyLmgJKHJldmlzaW9uIDI2MjkyMCkKKysr
IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVENQU2VydmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcg
KzQ3LDcgQEAgcHVibGljOgogICAgIGVudW0gY2xhc3MgUHJvdG9jb2wgOiB1aW50OF90IHsKICAg
ICAgICAgSFRUUFMsIEhUVFBTUHJveHksIEhUVFBTV2l0aENsaWVudENlcnRpZmljYXRlUmVxdWVz
dAogICAgIH07Ci0gICAgVENQU2VydmVyKFByb3RvY29sLCBGdW5jdGlvbjx2b2lkKFNTTCopPiYm
LCBPcHRpb25hbDx1aW50MTZfdD4gbWF4VExTVmVyc2lvbiA9IFdURjo6bnVsbG9wdCk7CisgICAg
VENQU2VydmVyKFByb3RvY29sLCBGdW5jdGlvbjx2b2lkKFNTTCopPiYmLCBPcHRpb25hbDx1aW50
MTZfdD4gbWF4VExTVmVyc2lvbiA9IFdURjo6bnVsbG9wdCwgc2l6ZV90IGNvbm5lY3Rpb25zID0g
MSk7CiAjZW5kaWYgLy8gSEFWRShTU0wpCiAgICAgflRDUFNlcnZlcigpOwogICAgIApJbmRleDog
VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9DaGFsbGVuZ2UubW0KPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9DaGFsbGVuZ2Uu
bW0JKHJldmlzaW9uIDI2MjkyMCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0
Q29jb2EvQ2hhbGxlbmdlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMDMsMTAgKzIwMywxMiBAQCAt
ICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkCiAKIEBlbmQKIAorI2lmIEhB
VkUoTkVUV09SS19GUkFNRVdPUkspCisKIFRFU1QoQ2hhbGxlbmdlLCBCYXNpY1Byb3Bvc2VkQ3Jl
ZGVudGlhbCkKIHsKICAgICB1c2luZyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKLSAgICBUQ1BT
ZXJ2ZXIgc2VydmVyKFRDUFNlcnZlcjo6cmVzcG9uZFdpdGhDaGFsbGVuZ2VUaGVuT0ssIDIpOwor
ICAgIEhUVFBTZXJ2ZXIgc2VydmVyKEhUVFBTZXJ2ZXI6OnJlc3BvbmRXaXRoQ2hhbGxlbmdlVGhl
bk9LKTsKICAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSByZXRhaW5QdHIoW1dLV2ViVmlld0NvbmZp
Z3VyYXRpb24gX3Rlc3RfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiQmFz
aWNQcm9wb3NlZENyZWRlbnRpYWxQbHVnSW4iXSk7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHRO
UyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRp
b246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtQ
cm9wb3NlZENyZWRlbnRpYWxEZWxlZ2F0ZSBuZXddKTsKQEAgLTIxNiw3ICsyMTgsNyBAQCBURVNU
KENoYWxsZW5nZSwgQmFzaWNQcm9wb3NlZENyZWRlbnRpYWwpCiAgICAgTlNVUkxQcm90ZWN0aW9u
U3BhY2UgKnByb3RlY3Rpb25TcGFjZSA9IFtbW05TVVJMUHJvdGVjdGlvblNwYWNlIGFsbG9jXSBp
bml0V2l0aEhvc3Q6QCIxMjcuMC4wLjEiIHBvcnQ6c2VydmVyLnBvcnQoKSBwcm90b2NvbDpOU1VS
TFByb3RlY3Rpb25TcGFjZUhUVFAgcmVhbG06QCJ0ZXN0cmVhbG0iIGF1dGhlbnRpY2F0aW9uTWV0
aG9kOk5TVVJMQXV0aGVudGljYXRpb25NZXRob2RIVFRQQmFzaWNdIGF1dG9yZWxlYXNlXTsKICAg
ICBbW3dlYlZpZXcgY29uZmlndXJhdGlvbl0ucHJvY2Vzc1Bvb2wgX2NsZWFyUGVybWFuZW50Q3Jl
ZGVudGlhbHNGb3JQcm90ZWN0aW9uU3BhY2U6cHJvdGVjdGlvblNwYWNlXTsKIAotICAgIFJldGFp
blB0cjxOU1VSTFJlcXVlc3Q+IHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJM
OltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cDov
LzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgpXV1dOworICAgIFJldGFpblB0cjxOU1VSTFJl
cXVlc3Q+IHJlcXVlc3QgPSBzZXJ2ZXIucmVxdWVzdCgpOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1
ZXN0OnJlcXVlc3QuZ2V0KCldOwogICAgIFV0aWw6OnJ1bigmbmF2aWdhdGlvbkZpbmlzaGVkKTsK
ICAgICBuYXZpZ2F0aW9uRmluaXNoZWQgPSBmYWxzZTsKQEAgLTIyOCw2ICsyMzAsOCBAQCBURVNU
KENoYWxsZW5nZSwgQmFzaWNQcm9wb3NlZENyZWRlbnRpYWwpCiAgICAgW1t3ZWJWaWV3IGNvbmZp
Z3VyYXRpb25dLnByb2Nlc3NQb29sIF9jbGVhclBlcm1hbmVudENyZWRlbnRpYWxzRm9yUHJvdGVj
dGlvblNwYWNlOnByb3RlY3Rpb25TcGFjZV07CiB9CiAKKyNlbmRpZiAvLyBIQVZFKE5FVFdPUktf
RlJBTUVXT1JLKQorCiAjaWYgSEFWRShTU0wpCiBzdGF0aWMgdm9pZCB2ZXJpZnlDZXJ0aWZpY2F0
ZUFuZFB1YmxpY0tleShTZWNUcnVzdFJlZiB0cnVzdCkKIHsKQEAgLTM3OSw3ICszODMsNyBAQCBU
RVNUKFdlYktpdCwgRmFzdFNlcnZlclRydXN0KQogI2Vsc2UKICAgICBUQ1BTZXJ2ZXIgc2VydmVy
KFRDUFNlcnZlcjo6UHJvdG9jb2w6OkhUVFBTLCBbXShTU0wqIHNzbCkgewogICAgICAgICBFWFBF
Q1RfRkFMU0Uoc3NsKTsKLSAgICB9KTsKKyAgICB9LCBXVEY6Om51bGxvcHQsIDIpOwogI2VuZGlm
CiAgICAgV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbiA9IFtbW1dLV2ViVmll
d0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKICAgICBfV0tXZWJzaXRl
RGF0YVN0b3JlQ29uZmlndXJhdGlvbiAqZGF0YVN0b3JlQ29uZmlndXJhdGlvbiA9IFtbW19XS1dl
YnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSBhdXRvcmVsZWFzZV07Cklu
ZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZERl
bGVnYXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0
Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0JKHJldmlzaW9uIDI2MjkyMCkKKysrIFRvb2xz
L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0J
KHdvcmtpbmcgY29weSkKQEAgLTM5MCw0MyArMzkwLDM1IEBAIFRFU1QoUmVzb3VyY2VMb2FkRGVs
ZWdhdGUsIExvYWRJbmZvKQogCiAvLyBGSVhNRTogQWRkIGEgdGVzdCBmb3IgbG9hZGVkRnJvbUNh
Y2hlLgogCi0jZW5kaWYgLy8gSEFWRShORVRXT1JLX0ZSQU1FV09SSykKLQotI2lmIEhBVkUoU1NM
KQotCiBURVNUKFJlc291cmNlTG9hZERlbGVnYXRlLCBDaGFsbGVuZ2UpCiB7CiAgICAgdXNpbmcg
bmFtZXNwYWNlIFRlc3RXZWJLaXRBUEk7Ci0gICAgVENQU2VydmVyIHNlcnZlcihUQ1BTZXJ2ZXI6
OlByb3RvY29sOjpIVFRQUywgW10gKFNTTCogc3NsKSB7Ci0gICAgICAgIEVYUEVDVF9UUlVFKCEh
c3NsKTsgLy8gQ29ubmVjdGlvbiBzaG91bGQgc3VjY2VlZCBhZnRlciBhIHNlcnZlciB0cnVzdCBj
aGFsbGVuZ2UuCi0gICAgICAgIC8vIFNlbmQgbm90aGluZyB0byBtYWtlIHRoZSByZXNvdXJjZSBs
b2FkIGZhaWwuCi0gICAgfSk7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoSFRUUFNlcnZlcjo6cmVz
cG9uZFdpdGhDaGFsbGVuZ2VUaGVuT0spOwogCiAgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUg
PSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOwogICAgIFtuYXZpZ2F0aW9u
RGVsZWdhdGUgc2V0RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl4oV0tXZWJWaWV3
ICosIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgdm9pZCAoXmNvbXBs
ZXRpb25IYW5kbGVyKShOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24sIE5TVVJM
Q3JlZGVudGlhbCAqKSkgewotICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoY2hhbGxlbmdlLnByb3Rl
Y3Rpb25TcGFjZS5hdXRoZW50aWNhdGlvbk1ldGhvZCwgTlNVUkxBdXRoZW50aWNhdGlvbk1ldGhv
ZFNlcnZlclRydXN0KTsKLSAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoTlNVUkxTZXNzaW9uQXV0
aENoYWxsZW5nZVVzZUNyZWRlbnRpYWwsIFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlhbEZvclRy
dXN0OmNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHJ1c3RdKTsKKyAgICAgICAgRVhQ
RUNUX1dLX1NUUkVRKGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UuYXV0aGVudGljYXRpb25NZXRo
b2QsIE5TVVJMQXV0aGVudGljYXRpb25NZXRob2RIVFRQQmFzaWMpOworICAgICAgICBjb21wbGV0
aW9uSGFuZGxlcihOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlVXNlQ3JlZGVudGlhbCwgW05TVVJM
Q3JlZGVudGlhbCBjcmVkZW50aWFsV2l0aFVzZXI6QCJ0ZXN0dXNlciIgcGFzc3dvcmQ6QCJ0ZXN0
cGFzc3dvcmQiIHBlcnNpc3RlbmNlOk5TVVJMQ3JlZGVudGlhbFBlcnNpc3RlbmNlTm9uZV0pOwog
ICAgIH1dOwogCiAgICAgX19ibG9jayBib29sIHJlY2VpdmVkRXJyb3JOb3RpZmljYXRpb24gPSBm
YWxzZTsKICAgICBfX2Jsb2NrIGJvb2wgcmVjZWl2ZWRDaGFsbGVuZ2VOb3RpZmljaWF0aW9uID0g
ZmFsc2U7CiAgICAgYXV0byByZXNvdXJjZUxvYWREZWxlZ2F0ZSA9IGFkb3B0TlMoW1Rlc3RSZXNv
dXJjZUxvYWREZWxlZ2F0ZSBuZXddKTsKICAgICBbcmVzb3VyY2VMb2FkRGVsZWdhdGUgc2V0RGlk
UmVjZWl2ZUNoYWxsZW5nZTpeKFdLV2ViVmlldyAqLCBfV0tSZXNvdXJjZUxvYWRJbmZvICosIE5T
VVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSkgewotICAgICAgICBFWFBFQ1Rf
V0tfU1RSRVEoY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZS5hdXRoZW50aWNhdGlvbk1ldGhvZCwg
TlNVUkxBdXRoZW50aWNhdGlvbk1ldGhvZFNlcnZlclRydXN0KTsKKyAgICAgICAgRVhQRUNUX1dL
X1NUUkVRKGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UuYXV0aGVudGljYXRpb25NZXRob2QsIE5T
VVJMQXV0aGVudGljYXRpb25NZXRob2RIVFRQQmFzaWMpOwogICAgICAgICByZWNlaXZlZENoYWxs
ZW5nZU5vdGlmaWNpYXRpb24gPSB0cnVlOwogICAgIH1dOwogICAgIFtyZXNvdXJjZUxvYWREZWxl
Z2F0ZSBzZXREaWRDb21wbGV0ZVdpdGhFcnJvcjpeKFdLV2ViVmlldyAqLCBfV0tSZXNvdXJjZUxv
YWRJbmZvICosIE5TRXJyb3IgKmVycm9yLCBOU1VSTFJlc3BvbnNlICopIHsKLSAgICAgICAgRVhQ
RUNUX0VRKGVycm9yLmNvZGUsIGtDRlVSTEVycm9yQ2Fubm90Q29ubmVjdFRvSG9zdCk7Ci0gICAg
ICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5kb21haW4sIE5TVVJMRXJyb3JEb21haW4pOworICAg
ICAgICBFWFBFQ1RfRkFMU0UoZXJyb3IpOwogICAgICAgICByZWNlaXZlZEVycm9yTm90aWZpY2F0
aW9uID0gdHJ1ZTsKICAgICB9XTsKIAogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2Vi
VmlldyBuZXddKTsKICAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlv
bkRlbGVnYXRlLmdldCgpXTsKICAgICBbd2ViVmlldyBfc2V0UmVzb3VyY2VMb2FkRGVsZWdhdGU6
cmVzb3VyY2VMb2FkRGVsZWdhdGUuZ2V0KCldOwotICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltO
U1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5n
IHN0cmluZ1dpdGhGb3JtYXQ6QCJodHRwczovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgp
XV1dXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpzZXJ2ZXIucmVxdWVzdCgpXTsKICAgICBU
ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkRXJyb3JOb3RpZmljYXRpb24pOwogICAg
IEVYUEVDVF9UUlVFKHJlY2VpdmVkQ2hhbGxlbmdlTm90aWZpY2lhdGlvbik7CiB9CiAKLSNlbmRp
ZiAvLyBIQVZFKFNTTCkKKyNlbmRpZiAvLyBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKQpJbmRleDog
VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29ya2VyQmFzaWMu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9T
ZXJ2aWNlV29ya2VyQmFzaWMubW0JKHJldmlzaW9uIDI2MjkyMCkKKysrIFRvb2xzL1Rlc3RXZWJL
aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtlckJhc2ljLm1tCSh3b3JraW5nIGNv
cHkpCkBAIC0xNTczLDYgKzE1NzMsOCBAQCBURVNUKFNlcnZpY2VXb3JrZXJzLCBQYXJhbGxlbFBy
b2Nlc3NMYXVuCiAgICAgd2FpdFVudGlsU2VydmljZVdvcmtlclByb2Nlc3NDb3VudChwcm9jZXNz
UG9vbCwgMik7CiB9CiAKKyNpZiBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKQorCiBzdGF0aWMgc2l6
ZV90IGxhdW5jaFNlcnZpY2VXb3JrZXJQcm9jZXNzKGJvb2wgdXNlU2VwYXJhdGVTZXJ2aWNlV29y
a2VyUHJvY2VzcywgYm9vbCBsb2FkQWJvdXRCbGFua0JlZm9yZVBhZ2UpCiB7CiAgICAgW1dLV2Vi
c2l0ZURhdGFTdG9yZSBfYWxsb3dXZWJzaXRlRGF0YVJlY29yZHNGb3JBbGxPcmlnaW5zXTsKQEAg
LTE1ODksOSArMTU5MSw5IEBAIHN0YXRpYyBzaXplX3QgbGF1bmNoU2VydmljZVdvcmtlclByb2Nl
c3MKICAgICBhdXRvIG1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW1NXTWVzc2FnZUhhbmRsZXIg
YWxsb2NdIGluaXRdKTsKICAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVy
XSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxlci5nZXQoKSBuYW1lOkAic3ci
XTsKIAotICAgIFNlcnZpY2VXb3JrZXJUQ1BTZXJ2ZXIgc2VydmVyKHsKLSAgICAgICAgeyAidGV4
dC9odG1sIiwgbWFpbkJ5dGVzIH0sCi0gICAgICAgIHsgImFwcGxpY2F0aW9uL2phdmFzY3JpcHQi
LCBzY3JpcHRCeXRlcyB9LAorICAgIFRlc3RXZWJLaXRBUEk6OkhUVFBTZXJ2ZXIgc2VydmVyKHsK
KyAgICAgICAgeyAiLyIsIHsgbWFpbkJ5dGVzIH0gfSwKKyAgICAgICAgeyAiL3N3LmpzIiwgeyB7
eyAiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiIH19LCBzY3JpcHRCeXRl
cyB9IH0KICAgICB9KTsKIAogICAgIGF1dG8gKnByb2Nlc3NQb29sID0gY29uZmlndXJhdGlvbi5n
ZXQoKS5wcm9jZXNzUG9vbDsKQEAgLTE2MzUsNiArMTYzNyw4IEBAIFRFU1QoU2VydmljZVdvcmtl
cnMsIExvYWRBYm91dEJsYW5rQmVmb3IKICAgICBFWFBFQ1RfRVEoMnUsIGxhdW5jaFNlcnZpY2VX
b3JrZXJQcm9jZXNzKHVzZVNlcGFyYXRlU2VydmljZVdvcmtlclByb2Nlc3MsIGZpcnN0TG9hZEFi
b3V0QmxhbmspKTsKIH0KIAorI2VuZGlmIC8vIEhBVkUoTkVUV09SS19GUkFNRVdPUkspCisKIHZv
aWQgd2FpdFVudGlsU2VydmljZVdvcmtlclByb2Nlc3NGb3JlZ3JvdW5kQWN0aXZpdHlTdGF0ZShX
S1dlYlZpZXcgKnBhZ2UsIGJvb2wgc2hvdWxkSGF2ZUFjdGl2aXR5KQogewogICAgIGRvIHsKSW5k
ZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5oCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5oCShyZXZpc2lvbiAyNjI5MjAp
CisrKyBUb29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIuaAkod29ya2luZyBjb3B5
KQpAQCAtNTMsNiArNTMsOCBAQCBwdWJsaWM6CiAgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0KGNv
bnN0IFN0cmluZyYgcGF0aCA9ICIvIl9zdHIpIGNvbnN0OwogICAgIHNpemVfdCB0b3RhbFJlcXVl
c3RzKCkgY29uc3Q7CiAKKyAgICBzdGF0aWMgdm9pZCByZXNwb25kV2l0aENoYWxsZW5nZVRoZW5P
SyhDb25uZWN0aW9uKTsKKyAgICAKIHByaXZhdGU6CiAgICAgc3RhdGljIFJldGFpblB0cjxud19w
YXJhbWV0ZXJzX3Q+IGxpc3RlbmVyUGFyYW1ldGVycyhQcm90b2NvbCwgQ2VydGlmaWNhdGVWZXJp
ZmllciYmKTsKICAgICBzdGF0aWMgdm9pZCByZXNwb25kVG9SZXF1ZXN0cyhDb25uZWN0aW9uLCBS
ZWZQdHI8UmVxdWVzdERhdGE+KTsKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRU
UFNlcnZlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBT
ZXJ2ZXIubW0JKHJldmlzaW9uIDI2MjkyMCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2Ev
SFRUUFNlcnZlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTE1LDYgKzExNSwyNiBAQCAgICAgLCBt
X3Byb3RvY29sKHByb3RvY29sKQogCiBIVFRQU2VydmVyOjp+SFRUUFNlcnZlcigpID0gZGVmYXVs
dDsKIAordm9pZCBIVFRQU2VydmVyOjpyZXNwb25kV2l0aENoYWxsZW5nZVRoZW5PSyhDb25uZWN0
aW9uIGNvbm5lY3Rpb24pCit7CisgICAgY29ubmVjdGlvbi5yZWNlaXZlSFRUUFJlcXVlc3QoW2Nv
bm5lY3Rpb25dIChWZWN0b3I8Y2hhcj4mJikgeworICAgICAgICBjb25zdCBjaGFyKiBjaGFsbGVu
Z2VIZWFkZXIgPQorICAgICAgICAiSFRUUC8xLjEgNDAxIFVuYXV0aG9yaXplZFxyXG4iCisgICAg
ICAgICJEYXRlOiBTYXQsIDIzIE1hciAyMDE5IDA2OjI5OjAxIEdNVFxyXG4iCisgICAgICAgICJD
b250ZW50LUxlbmd0aDogMFxyXG4iCisgICAgICAgICJXV1ctQXV0aGVudGljYXRlOiBCYXNpYyBy
ZWFsbT1cInRlc3RyZWFsbVwiXHJcblxyXG4iOworICAgICAgICBjb25uZWN0aW9uLnNlbmQoY2hh
bGxlbmdlSGVhZGVyLCBbY29ubmVjdGlvbl0geworICAgICAgICAgICAgY29ubmVjdGlvbi5yZWNl
aXZlSFRUUFJlcXVlc3QoW2Nvbm5lY3Rpb25dIChWZWN0b3I8Y2hhcj4mJikgeworICAgICAgICAg
ICAgICAgIGNvbm5lY3Rpb24uc2VuZCgKKyAgICAgICAgICAgICAgICAgICAgIkhUVFAvMS4xIDIw
MCBPS1xyXG4iCisgICAgICAgICAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogMTNcclxuXHJc
biIKKyAgICAgICAgICAgICAgICAgICAgIkhlbGxvLCBXb3JsZCEiCisgICAgICAgICAgICAgICAg
KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICB9KTsKK30KKwogc2l6ZV90IEhU
VFBTZXJ2ZXI6OnRvdGFsUmVxdWVzdHMoKSBjb25zdAogewogICAgIGlmICghbV9yZXF1ZXN0RGF0
YSkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401789</attachid>
            <date>2020-06-12 14:58:55 -0700</date>
            <delta_ts>2020-06-15 15:30:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213144-20200612145854.patch</filename>
            <type>text/plain</type>
            <size>18477</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjI5NzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA2LTEyICBBbGV4IENocmlz
dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBBUEkgdGVz
dHMgdG9sZXJhbnQgb2Ygb3VyIHJlbGF0aXZlbHkgbmV3IHVzZSBvZiBXZWJQYWdlUHJveHk6OnBy
ZWNvbm5lY3RUbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjEzMTQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6CisgICAgICAg
ICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAg
KC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246dGFzazp3aWxsUGVyZm9ybUhU
VFBSZWRpcmVjdGlvbjpuZXdSZXF1ZXN0OmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAo
LVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZENvbXBsZXRlV2l0
aEVycm9yOl0pOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lv
bjpkYXRhVGFzazpkaWRSZWNlaXZlUmVzcG9uc2U6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAg
ICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6OnRhc2tTZXJ2ZXJDb25uZWN0aW9uU3Vj
Y2VlZGVkKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6dGFza1JlY2Vp
dmVkQnl0ZXMpOiBEZWxldGVkLgorICAgICAgICBGaXggb3VyIGxvZ2ljIHRoYXQgcmVtZW1iZXJz
IHN1Y2Nlc3NmdWwgY2xpZW50IGNlcnRpZmljYXRlIGNvbm5lY3Rpb25zLgorICAgICAgICBJZiBh
IHRhc2sgY29tcGxldGVzIHdpdGggbm8gZXJyb3IgKGxpa2UgYSBwcmVjb25uZWN0IHRhc2sgZG9l
cyksIGNvbnNpZGVyIHRoYXQgYSBzdWNjZXNzZnVsIGNvbm5lY3Rpb24uCisKKyAgICAgICAgKiBV
SVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktp
dDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6cHJlY29ubmVjdFRvKToKKyAgICAgICAgUmVtb3ZlIHRo
ZSBjaGVjayB0byBub3QgcHJlY29ubmVjdCB0byBsb29wYmFjayBhZGRyZXNzZXMuCisgICAgICAg
IFRoaXMgd2FzIG1ha2luZyBvdXIgdGVzdHMgZGlmZmVyZW50IHRoYW4gdGhlIHJlYWwgaW50ZXJu
ZXQgYW5kIHByZXZlbnRlZCBtZSBmcm9tIGxhbmRpbmcgYSBwZXJmZWN0bHkgZ29vZCB0ZXN0Cisg
ICAgICAgIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMxMDkK
KwogMjAyMC0wNi0xMiAgVGFrYXNoaSBLb21vcmkgIDxUYWthc2hpLktvbW9yaUBzb255LmNvbT4K
IAogICAgICAgICBbQ3VybF0gSW1wbGVtZW50IGZ1bmN0aW9ucyB0byB1c2UgUmVzb3VyY2VMb2Fk
U3RhdGlzdGljcy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0
d29ya1Nlc3Npb25Db2NvYS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1By
b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCShyZXZpc2lvbiAyNjI5MjApCisrKyBT
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EuaAko
d29ya2luZyBjb3B5KQpAQCAtMTAyLDcgKzEwMiw3IEBAIHB1YmxpYzoKICAgICBib29sIHByZXZl
bnRzU3lzdGVtSFRUUFByb3h5QXV0aGVudGljYXRpb24oKSBjb25zdCB7IHJldHVybiBtX3ByZXZl
bnRzU3lzdGVtSFRUUFByb3h5QXV0aGVudGljYXRpb247IH0KICAgICAKICAgICB2b2lkIGNsaWVu
dENlcnRpZmljYXRlU3VnZ2VzdGVkRm9ySG9zdChOZXR3b3JrRGF0YVRhc2tDb2NvYTo6VGFza0lk
ZW50aWZpZXIsIE5TVVJMQ3JlZGVudGlhbCAqLCBjb25zdCBTdHJpbmcmIGhvc3QsIHVpbnQxNl90
IHBvcnQpOwotICAgIHZvaWQgdGFza1JlY2VpdmVkQnl0ZXMoTmV0d29ya0RhdGFUYXNrQ29jb2E6
OlRhc2tJZGVudGlmaWVyKTsKKyAgICB2b2lkIHRhc2tTZXJ2ZXJDb25uZWN0aW9uU3VjY2VlZGVk
KE5ldHdvcmtEYXRhVGFza0NvY29hOjpUYXNrSWRlbnRpZmllcik7CiAgICAgdm9pZCB0YXNrRmFp
bGVkKE5ldHdvcmtEYXRhVGFza0NvY29hOjpUYXNrSWRlbnRpZmllcik7CiAgICAgTlNVUkxDcmVk
ZW50aWFsICpzdWNjZXNzZnVsQ2xpZW50Q2VydGlmaWNhdGVGb3JIb3N0KGNvbnN0IFN0cmluZyYg
aG9zdCwgdWludDE2X3QgcG9ydCkgY29uc3Q7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29y
a1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0JKHJl
dmlzaW9uIDI2MjkyMCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0
d29ya1Nlc3Npb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNTMyLDcgKzUzMiw3IEBAIC0g
KHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2kKICAgICAgICAgYXV0byBjb21w
bGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25IYW5kbGVyKTsKIAogICAg
ICAgICBpZiAoYXV0byogc2Vzc2lvbkNvY29hID0gW3NlbGYgc2Vzc2lvbkZyb21UYXNrOnRhc2td
KQotICAgICAgICAgICAgc2Vzc2lvbkNvY29hLT50YXNrUmVjZWl2ZWRCeXRlcyh0YXNrSWRlbnRp
Zmllcik7CisgICAgICAgICAgICBzZXNzaW9uQ29jb2EtPnRhc2tTZXJ2ZXJDb25uZWN0aW9uU3Vj
Y2VlZGVkKHRhc2tJZGVudGlmaWVyKTsKIAogICAgICAgICBib29sIHNob3VsZElnbm9yZUhTVFMg
PSBmYWxzZTsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQpAQCAtNzMwLDgg
KzczMCwxMiBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3NpCiAgICAg
fQogCiAgICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IFtzZWxmIGV4aXN0aW5nVGFzazp0
YXNrXSkgewotICAgICAgICBpZiAoYXV0byogc2Vzc2lvbkNvY29hID0gW3NlbGYgc2Vzc2lvbkZy
b21UYXNrOnRhc2tdKQotICAgICAgICAgICAgc2Vzc2lvbkNvY29hLT50YXNrRmFpbGVkKHRhc2su
dGFza0lkZW50aWZpZXIpOworICAgICAgICBpZiAoYXV0byogc2Vzc2lvbkNvY29hID0gW3NlbGYg
c2Vzc2lvbkZyb21UYXNrOnRhc2tdKSB7CisgICAgICAgICAgICBpZiAoZXJyb3IpCisgICAgICAg
ICAgICAgICAgc2Vzc2lvbkNvY29hLT50YXNrRmFpbGVkKHRhc2sudGFza0lkZW50aWZpZXIpOwor
ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHNlc3Npb25Db2NvYS0+dGFza1NlcnZl
ckNvbm5lY3Rpb25TdWNjZWVkZWQodGFzay50YXNrSWRlbnRpZmllcik7CisgICAgICAgIH0KICAg
ICAgICAgbmV0d29ya0RhdGFUYXNrLT5kaWRDb21wbGV0ZVdpdGhFcnJvcihlcnJvciwgbmV0d29y
a0RhdGFUYXNrLT5uZXR3b3JrTG9hZE1ldHJpY3MoKSk7CiAgICAgfSBlbHNlIGlmIChlcnJvcikg
ewogICAgICAgICBpZiAoIV9zZXNzaW9uV3JhcHBlcikKQEAgLTg3Miw3ICs4NzYsNyBAQCAtICh2
b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3NpCiAgICAgICAgIEFTU0VSVChSdW5M
b29wOjppc01haW4oKSk7CiAKICAgICAgICAgaWYgKGF1dG8qIHNlc3Npb25Db2NvYSA9IFtzZWxm
IHNlc3Npb25Gcm9tVGFzazpkYXRhVGFza10pCi0gICAgICAgICAgICBzZXNzaW9uQ29jb2EtPnRh
c2tSZWNlaXZlZEJ5dGVzKHRhc2tJZGVudGlmaWVyKTsKKyAgICAgICAgICAgIHNlc3Npb25Db2Nv
YS0+dGFza1NlcnZlckNvbm5lY3Rpb25TdWNjZWVkZWQodGFza0lkZW50aWZpZXIpOwogCiAgICAg
ICAgIE5lZ290aWF0ZWRMZWdhY3lUTFMgbmVnb3RpYXRlZExlZ2FjeVRMUyA9IE5lZ290aWF0ZWRM
ZWdhY3lUTFM6Ok5vOwogI2lmIEhBVkUoVExTX1BST1RPQ09MX1ZFUlNJT05fVCkKQEAgLTEwNjEs
NyArMTA2NSw3IEBAIHZvaWQgTmV0d29ya1Nlc3Npb25Db2NvYTo6Y2xpZW50Q2VydGlmaWMKICAg
ICBtX3N1Z2dlc3RlZENsaWVudENlcnRpZmljYXRlcy5zZXQodGFza0lELCBTdWdnZXN0ZWRDbGll
bnRDZXJ0aWZpY2F0ZSB7IGhvc3QsIHBvcnQsIGNyZWRlbnRpYWwgfSk7CiB9CiAKLXZvaWQgTmV0
d29ya1Nlc3Npb25Db2NvYTo6dGFza1JlY2VpdmVkQnl0ZXMoTmV0d29ya0RhdGFUYXNrQ29jb2E6
OlRhc2tJZGVudGlmaWVyIGlkZW50aWZpZXIpCit2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OnRh
c2tTZXJ2ZXJDb25uZWN0aW9uU3VjY2VlZGVkKE5ldHdvcmtEYXRhVGFza0NvY29hOjpUYXNrSWRl
bnRpZmllciBpZGVudGlmaWVyKQogewogICAgIGlmIChMSUtFTFkobV9zdWdnZXN0ZWRDbGllbnRD
ZXJ0aWZpY2F0ZXMuaXNFbXB0eSgpKSkKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku
Y3BwCShyZXZpc2lvbiAyNjI5MjApCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3Jr
L05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcyLDcgKzE0NzIs
NyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OmdldExvY2FsU3RvcmFnCiAKIHZvaWQgTmV0
d29ya1Byb2Nlc3NQcm94eTo6cHJlY29ubmVjdFRvKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwg
V2ViUGFnZVByb3h5SWRlbnRpZmllciB3ZWJQYWdlUHJveHlJRCwgV2ViQ29yZTo6UGFnZUlkZW50
aWZpZXIgd2ViUGFnZUlELCBjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQs
IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5
LCBPcHRpb25hbDxOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbj4gaXNOYXZpZ2F0aW5nVG9BcHBC
b3VuZERvbWFpbikKIHsKLSAgICBpZiAoIXVybC5pc1ZhbGlkKCkgfHwgIXVybC5wcm90b2NvbElz
SW5IVFRQRmFtaWx5KCkgfHwgU2VjdXJpdHlPcmlnaW46OmlzTG9jYWxIb3N0T3JMb29wYmFja0lQ
QWRkcmVzcyh1cmwuaG9zdCgpKSkKKyAgICBpZiAoIXVybC5pc1ZhbGlkKCkgfHwgIXVybC5wcm90
b2NvbElzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgIHJldHVybjsKICAgICBzZW5kKE1lc3NhZ2Vz
OjpOZXR3b3JrUHJvY2Vzczo6UHJlY29ubmVjdFRvKHNlc3Npb25JRCwgd2ViUGFnZVByb3h5SUQs
IHdlYlBhZ2VJRCwgdXJsLCB1c2VyQWdlbnQsIHN0b3JlZENyZWRlbnRpYWxzUG9saWN5LCBpc05h
dmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluKSwgMCk7CiB9CkluZGV4OiBUb29scy9DaGFuZ2VMb2cK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjI5NzEpCisrKyBUb29s
cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzMyBAQAorMjAyMC0wNi0xMiAg
QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIE1h
a2UgQVBJIHRlc3RzIHRvbGVyYW50IG9mIG91ciByZWxhdGl2ZWx5IG5ldyB1c2Ugb2YgV2ViUGFn
ZVByb3h5OjpwcmVjb25uZWN0VG8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxMzE0NAorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmZXJleSBHYXJl
bi4KKworICAgICAgICBNb3N0IGNoYW5nZXMgYXJlIHN0cmFpZ2h0Zm9yd2FyZCBtb3ZpbmcgdG8g
SFRUUFNlcnZlciwgd2hpY2ggaXMgbW9yZSB0b2xlcmFudCBvZiBkaWZmZXJlbnQgbnVtYmVycyBv
ZiBjb25uZWN0aW9ucyBleGNlcHQgdGhlc2UgdHdvOgorCisgICAgICAgIFRoZSBSZXNvdXJjZUxv
YWREZWxlZ2F0ZS5DaGFsbGVuZ2UgQVBJIHRlc3Qgd2FzIGNoZWNraW5nIHRoZSBvdXRwdXQgb2Yg
X1dLUmVzb3VyY2VMb2FkRGVsZWdhdGUuZGlkUmVjZWl2ZUNoYWxsZW5nZQorICAgICAgICBieSB1
c2luZyBhIHNlcnZlciB0cnVzdCBjaGFsbGVuZ2UuICBOb3cgdGhhdCBwcmVjb25uZWN0aW5nIGhh
cHBlbnMsIHRoZSBzZXJ2ZXIgdHJ1c3QgZXZhbHVhdGlvbiB3b3VsZCBoYXBwZW4gd2l0aCBhCisg
ICAgICAgIFByZWNvbm5lY3RUYXNrLCBub3QgdGhlIG1haW4gcmVzb3VyY2UgbG9hZC4gIFRoZSBX
S05hdmlnYXRpb25EZWxlZ2F0ZSBzdGlsbCBnZXRzIHRoZSBjaGFsbGVuZ2UgYW5kIHRoZXJlIGlz
IG5vIHByb2JsZW0KKyAgICAgICAgaGVyZSwgYnV0IGluIG9yZGVyIHRvIGNvbnRpbnVlIHRvIHRl
c3QgX1dLUmVzb3VyY2VMb2FkRGVsZWdhdGUuZGlkUmVjZWl2ZUNoYWxsZW5nZSBJIHVzZSBhIGJh
c2ljIGF1dGhlbnRpY2F0aW9uIGNoYWxsZW5nZQorICAgICAgICBpbnN0ZWFkIG9mIGEgc2VydmVy
IHRydXN0IGV2YWx1YXRpb24uCisKKyAgICAgICAgVGhlIFdlYktpdC5GYXN0U2VydmVyVHJ1c3Qg
QVBJIHRlc3Qgbm93IGhhcyB0d28gZmFpbGVkIGF0dGVtcHRzIChvbmUgZnJvbSB0aGUgcHJlY29u
bmVjdCBhdHRlbXB0LCBvbmUgZnJvbSB0aGUgbWFpbiByZXNvdXJjZSBsb2FkIGF0dGVtcHQpLAor
ICAgICAgICBidXQgb25seSB3aGVuIF9zdHJpY3RUcnVzdEV2YWx1YXRlIGlzIG5vdCBhdmFpbGFi
bGUuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1RDUFNlcnZlci5jcHA6CisgICAgICAgIChU
ZXN0V2ViS2l0QVBJOjpUQ1BTZXJ2ZXI6OlRDUFNlcnZlcik6CisgICAgICAgICogVGVzdFdlYktp
dEFQSS9UQ1BTZXJ2ZXIuaDoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv
Y29hL0NoYWxsZW5nZS5tbToKKyAgICAgICAgKFRFU1QpOgorICAgICAgICAoVGVzdFdlYktpdEFQ
STo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNv
dXJjZUxvYWREZWxlZ2F0ZS5tbToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp
dENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2Nv
Y29hL0hUVFBTZXJ2ZXIuaDoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2
ZXIubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyOjpyZXNwb25kV2l0aENo
YWxsZW5nZVRoZW5PSyk6CisKIDIwMjAtMDYtMTIgIFRha2FzaGkgS29tb3JpICA8VGFrYXNoaS5L
b21vcmlAc29ueS5jb20+CiAKICAgICAgICAgW0N1cmxdIEltcGxlbWVudCBmdW5jdGlvbnMgdG8g
dXNlIFJlc291cmNlTG9hZFN0YXRpc3RpY3MuCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1RD
UFNlcnZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UQ1BTZXJ2ZXIu
Y3BwCShyZXZpc2lvbiAyNjI5MjApCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1RDUFNlcnZlci5j
cHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNyw3ICsyMDcsNyBAQCB2b2lkIFRDUFNlcnZlcjo6c3Rh
cnRTZWN1cmVDb25uZWN0aW9uKFNvCiAgICAgc2VjdXJlQ29ubmVjdGlvbkhhbmRsZXIoYWNjZXB0
UmVzdWx0ID4gMCA/IHNzbC5nZXQoKSA6IG51bGxwdHIpOwogfTsKIAotVENQU2VydmVyOjpUQ1BT
ZXJ2ZXIoUHJvdG9jb2wgcHJvdG9jb2wsIEZ1bmN0aW9uPHZvaWQoU1NMKik+JiYgc2VjdXJlQ29u
bmVjdGlvbkhhbmRsZXIsIE9wdGlvbmFsPHVpbnQxNl90PiBtYXhUTFNWZXJzaW9uKQorVENQU2Vy
dmVyOjpUQ1BTZXJ2ZXIoUHJvdG9jb2wgcHJvdG9jb2wsIEZ1bmN0aW9uPHZvaWQoU1NMKik+JiYg
c2VjdXJlQ29ubmVjdGlvbkhhbmRsZXIsIE9wdGlvbmFsPHVpbnQxNl90PiBtYXhUTFNWZXJzaW9u
LCBzaXplX3QgY29ubmVjdGlvbnMpCiB7CiAgICAgc3dpdGNoIChwcm90b2NvbCkgewogICAgIGNh
c2UgUHJvdG9jb2w6OkhUVFBTOgpAQCAtMjMyLDcgKzIzMiw3IEBAIFRDUFNlcnZlcjo6VENQU2Vy
dmVyKFByb3RvY29sIHByb3RvY29sLCAKICAgICAgICAgfTsKICAgICAgICAgYnJlYWs7CiAgICAg
fQotICAgIGxpc3RlbkZvckNvbm5lY3Rpb25zKDEpOworICAgIGxpc3RlbkZvckNvbm5lY3Rpb25z
KGNvbm5lY3Rpb25zKTsKIH0KICNlbmRpZiAvLyBIQVZFKFNTTCkKIApJbmRleDogVG9vbHMvVGVz
dFdlYktpdEFQSS9UQ1BTZXJ2ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJ
L1RDUFNlcnZlci5oCShyZXZpc2lvbiAyNjI5MjApCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1RD
UFNlcnZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKICAgICBl
bnVtIGNsYXNzIFByb3RvY29sIDogdWludDhfdCB7CiAgICAgICAgIEhUVFBTLCBIVFRQU1Byb3h5
LCBIVFRQU1dpdGhDbGllbnRDZXJ0aWZpY2F0ZVJlcXVlc3QKICAgICB9OwotICAgIFRDUFNlcnZl
cihQcm90b2NvbCwgRnVuY3Rpb248dm9pZChTU0wqKT4mJiwgT3B0aW9uYWw8dWludDE2X3Q+IG1h
eFRMU1ZlcnNpb24gPSBXVEY6Om51bGxvcHQpOworICAgIFRDUFNlcnZlcihQcm90b2NvbCwgRnVu
Y3Rpb248dm9pZChTU0wqKT4mJiwgT3B0aW9uYWw8dWludDE2X3Q+IG1heFRMU1ZlcnNpb24gPSBX
VEY6Om51bGxvcHQsIHNpemVfdCBjb25uZWN0aW9ucyA9IDEpOwogI2VuZGlmIC8vIEhBVkUoU1NM
KQogICAgIH5UQ1BTZXJ2ZXIoKTsKICAgICAKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz
dHMvV2ViS2l0Q29jb2EvQ2hhbGxlbmdlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJL
aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQ2hhbGxlbmdlLm1tCShyZXZpc2lvbiAyNjI5MjApCisr
KyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NoYWxsZW5nZS5tbQkod29y
a2luZyBjb3B5KQpAQCAtMjAzLDEwICsyMDMsMTIgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZp
ZXcgKil3ZWJWaWV3IGRpZAogCiBAZW5kCiAKKyNpZiBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKQor
CiBURVNUKENoYWxsZW5nZSwgQmFzaWNQcm9wb3NlZENyZWRlbnRpYWwpCiB7CiAgICAgdXNpbmcg
bmFtZXNwYWNlIFRlc3RXZWJLaXRBUEk7Ci0gICAgVENQU2VydmVyIHNlcnZlcihUQ1BTZXJ2ZXI6
OnJlc3BvbmRXaXRoQ2hhbGxlbmdlVGhlbk9LLCAyKTsKKyAgICBIVFRQU2VydmVyIHNlcnZlcihI
VFRQU2VydmVyOjpyZXNwb25kV2l0aENoYWxsZW5nZVRoZW5PSyk7CiAgICAgYXV0byBjb25maWd1
cmF0aW9uID0gcmV0YWluUHRyKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF90ZXN0X2NvbmZpZ3Vy
YXRpb25XaXRoVGVzdFBsdWdJbkNsYXNzTmFtZTpAIkJhc2ljUHJvcG9zZWRDcmVkZW50aWFsUGx1
Z0luIl0pOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGlu
aXRXaXRoRnJhbWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCld
KTsKICAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbUHJvcG9zZWRDcmVkZW50aWFsRGVsZWdh
dGUgbmV3XSk7CkBAIC0yMTYsNyArMjE4LDcgQEAgVEVTVChDaGFsbGVuZ2UsIEJhc2ljUHJvcG9z
ZWRDcmVkZW50aWFsKQogICAgIE5TVVJMUHJvdGVjdGlvblNwYWNlICpwcm90ZWN0aW9uU3BhY2Ug
PSBbW1tOU1VSTFByb3RlY3Rpb25TcGFjZSBhbGxvY10gaW5pdFdpdGhIb3N0OkAiMTI3LjAuMC4x
IiBwb3J0OnNlcnZlci5wb3J0KCkgcHJvdG9jb2w6TlNVUkxQcm90ZWN0aW9uU3BhY2VIVFRQIHJl
YWxtOkAidGVzdHJlYWxtIiBhdXRoZW50aWNhdGlvbk1ldGhvZDpOU1VSTEF1dGhlbnRpY2F0aW9u
TWV0aG9kSFRUUEJhc2ljXSBhdXRvcmVsZWFzZV07CiAgICAgW1t3ZWJWaWV3IGNvbmZpZ3VyYXRp
b25dLnByb2Nlc3NQb29sIF9jbGVhclBlcm1hbmVudENyZWRlbnRpYWxzRm9yUHJvdGVjdGlvblNw
YWNlOnByb3RlY3Rpb25TcGFjZV07CiAKLSAgICBSZXRhaW5QdHI8TlNVUkxSZXF1ZXN0PiByZXF1
ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpb
TlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImh0dHA6Ly8xMjcuMC4wLjE6JWQvIiwgc2VydmVy
LnBvcnQoKV1dXTsKKyAgICBSZXRhaW5QdHI8TlNVUkxSZXF1ZXN0PiByZXF1ZXN0ID0gc2VydmVy
LnJlcXVlc3QoKTsKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0LmdldCgpXTsKICAg
ICBVdGlsOjpydW4oJm5hdmlnYXRpb25GaW5pc2hlZCk7CiAgICAgbmF2aWdhdGlvbkZpbmlzaGVk
ID0gZmFsc2U7CkBAIC0yMjgsNiArMjMwLDggQEAgVEVTVChDaGFsbGVuZ2UsIEJhc2ljUHJvcG9z
ZWRDcmVkZW50aWFsKQogICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS5wcm9jZXNzUG9vbCBf
Y2xlYXJQZXJtYW5lbnRDcmVkZW50aWFsc0ZvclByb3RlY3Rpb25TcGFjZTpwcm90ZWN0aW9uU3Bh
Y2VdOwogfQogCisjZW5kaWYgLy8gSEFWRShORVRXT1JLX0ZSQU1FV09SSykKKwogI2lmIEhBVkUo
U1NMKQogc3RhdGljIHZvaWQgdmVyaWZ5Q2VydGlmaWNhdGVBbmRQdWJsaWNLZXkoU2VjVHJ1c3RS
ZWYgdHJ1c3QpCiB7CkBAIC0zNzksNyArMzgzLDcgQEAgVEVTVChXZWJLaXQsIEZhc3RTZXJ2ZXJU
cnVzdCkKICNlbHNlCiAgICAgVENQU2VydmVyIHNlcnZlcihUQ1BTZXJ2ZXI6OlByb3RvY29sOjpI
VFRQUywgW10oU1NMKiBzc2wpIHsKICAgICAgICAgRVhQRUNUX0ZBTFNFKHNzbCk7Ci0gICAgfSk7
CisgICAgfSwgV1RGOjpudWxsb3B0LCAyKTsKICNlbmRpZgogICAgIFdLV2ViVmlld0NvbmZpZ3Vy
YXRpb24gKmNvbmZpZ3VyYXRpb24gPSBbW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBp
bml0XSBhdXRvcmVsZWFzZV07CiAgICAgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24g
KmRhdGFTdG9yZUNvbmZpZ3VyYXRpb24gPSBbW1tfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh
dGlvbiBhbGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdOwpAQCAtNDkyLDcgKzQ5Niw3IEBAIFRFU1Qo
TXVsdGlwbGVDbGllbnRDZXJ0aWZpY2F0ZUNvbm5lY3Rpb24KICAgICBzaXplX3QgY2VydENoYWxs
ZW5nZXNBZnRlckluaXRpYWxGYWlsdXJlID0gY291bnRDbGllbnRDZXJ0Q2hhbGxlbmdlcyhtZXRo
b2RzKTsKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpzZXJ2ZXIucmVxdWVzdCgpXTsKICAgICBb
ZGVsZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOwotICAgIEVYUEVDVF9FUShjb3Vu
dENsaWVudENlcnRDaGFsbGVuZ2VzKG1ldGhvZHMpLCBjZXJ0Q2hhbGxlbmdlc0FmdGVySW5pdGlh
bEZhaWx1cmUgKyAxKTsKKyAgICBFWFBFQ1RfRVEoY291bnRDbGllbnRDZXJ0Q2hhbGxlbmdlcyht
ZXRob2RzKSwgY2VydENoYWxsZW5nZXNBZnRlckluaXRpYWxGYWlsdXJlKTsKIH0KIAogVEVTVChN
dWx0aXBsZUNsaWVudENlcnRpZmljYXRlQ29ubmVjdGlvbnMsIE5vblBlcnNpc3RlbnREYXRhU3Rv
cmUpCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNl
TG9hZERlbGVnYXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv
V2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0JKHJldmlzaW9uIDI2MjkyMCkKKysr
IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdh
dGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTM5MCw0MyArMzkwLDM1IEBAIFRFU1QoUmVzb3VyY2VM
b2FkRGVsZWdhdGUsIExvYWRJbmZvKQogCiAvLyBGSVhNRTogQWRkIGEgdGVzdCBmb3IgbG9hZGVk
RnJvbUNhY2hlLgogCi0jZW5kaWYgLy8gSEFWRShORVRXT1JLX0ZSQU1FV09SSykKLQotI2lmIEhB
VkUoU1NMKQotCiBURVNUKFJlc291cmNlTG9hZERlbGVnYXRlLCBDaGFsbGVuZ2UpCiB7CiAgICAg
dXNpbmcgbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEk7Ci0gICAgVENQU2VydmVyIHNlcnZlcihUQ1BT
ZXJ2ZXI6OlByb3RvY29sOjpIVFRQUywgW10gKFNTTCogc3NsKSB7Ci0gICAgICAgIEVYUEVDVF9U
UlVFKCEhc3NsKTsgLy8gQ29ubmVjdGlvbiBzaG91bGQgc3VjY2VlZCBhZnRlciBhIHNlcnZlciB0
cnVzdCBjaGFsbGVuZ2UuCi0gICAgICAgIC8vIFNlbmQgbm90aGluZyB0byBtYWtlIHRoZSByZXNv
dXJjZSBsb2FkIGZhaWwuCi0gICAgfSk7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoSFRUUFNlcnZl
cjo6cmVzcG9uZFdpdGhDaGFsbGVuZ2VUaGVuT0spOwogCiAgICAgYXV0byBuYXZpZ2F0aW9uRGVs
ZWdhdGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOwogICAgIFtuYXZp
Z2F0aW9uRGVsZWdhdGUgc2V0RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl4oV0tX
ZWJWaWV3ICosIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgdm9pZCAo
XmNvbXBsZXRpb25IYW5kbGVyKShOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24s
IE5TVVJMQ3JlZGVudGlhbCAqKSkgewotICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoY2hhbGxlbmdl
LnByb3RlY3Rpb25TcGFjZS5hdXRoZW50aWNhdGlvbk1ldGhvZCwgTlNVUkxBdXRoZW50aWNhdGlv
bk1ldGhvZFNlcnZlclRydXN0KTsKLSAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoTlNVUkxTZXNz
aW9uQXV0aENoYWxsZW5nZVVzZUNyZWRlbnRpYWwsIFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlh
bEZvclRydXN0OmNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHJ1c3RdKTsKKyAgICAg
ICAgRVhQRUNUX1dLX1NUUkVRKGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UuYXV0aGVudGljYXRp
b25NZXRob2QsIE5TVVJMQXV0aGVudGljYXRpb25NZXRob2RIVFRQQmFzaWMpOworICAgICAgICBj
b21wbGV0aW9uSGFuZGxlcihOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlVXNlQ3JlZGVudGlhbCwg
W05TVVJMQ3JlZGVudGlhbCBjcmVkZW50aWFsV2l0aFVzZXI6QCJ0ZXN0dXNlciIgcGFzc3dvcmQ6
QCJ0ZXN0cGFzc3dvcmQiIHBlcnNpc3RlbmNlOk5TVVJMQ3JlZGVudGlhbFBlcnNpc3RlbmNlTm9u
ZV0pOwogICAgIH1dOwogCiAgICAgX19ibG9jayBib29sIHJlY2VpdmVkRXJyb3JOb3RpZmljYXRp
b24gPSBmYWxzZTsKICAgICBfX2Jsb2NrIGJvb2wgcmVjZWl2ZWRDaGFsbGVuZ2VOb3RpZmljaWF0
aW9uID0gZmFsc2U7CiAgICAgYXV0byByZXNvdXJjZUxvYWREZWxlZ2F0ZSA9IGFkb3B0TlMoW1Rl
c3RSZXNvdXJjZUxvYWREZWxlZ2F0ZSBuZXddKTsKICAgICBbcmVzb3VyY2VMb2FkRGVsZWdhdGUg
c2V0RGlkUmVjZWl2ZUNoYWxsZW5nZTpeKFdLV2ViVmlldyAqLCBfV0tSZXNvdXJjZUxvYWRJbmZv
ICosIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSkgewotICAgICAgICBF
WFBFQ1RfV0tfU1RSRVEoY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZS5hdXRoZW50aWNhdGlvbk1l
dGhvZCwgTlNVUkxBdXRoZW50aWNhdGlvbk1ldGhvZFNlcnZlclRydXN0KTsKKyAgICAgICAgRVhQ
RUNUX1dLX1NUUkVRKGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UuYXV0aGVudGljYXRpb25NZXRo
b2QsIE5TVVJMQXV0aGVudGljYXRpb25NZXRob2RIVFRQQmFzaWMpOwogICAgICAgICByZWNlaXZl
ZENoYWxsZW5nZU5vdGlmaWNpYXRpb24gPSB0cnVlOwogICAgIH1dOwogICAgIFtyZXNvdXJjZUxv
YWREZWxlZ2F0ZSBzZXREaWRDb21wbGV0ZVdpdGhFcnJvcjpeKFdLV2ViVmlldyAqLCBfV0tSZXNv
dXJjZUxvYWRJbmZvICosIE5TRXJyb3IgKmVycm9yLCBOU1VSTFJlc3BvbnNlICopIHsKLSAgICAg
ICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIGtDRlVSTEVycm9yQ2Fubm90Q29ubmVjdFRvSG9zdCk7
Ci0gICAgICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5kb21haW4sIE5TVVJMRXJyb3JEb21haW4p
OworICAgICAgICBFWFBFQ1RfRkFMU0UoZXJyb3IpOwogICAgICAgICByZWNlaXZlZEVycm9yTm90
aWZpY2F0aW9uID0gdHJ1ZTsKICAgICB9XTsKIAogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMo
W1dLV2ViVmlldyBuZXddKTsKICAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2
aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKICAgICBbd2ViVmlldyBfc2V0UmVzb3VyY2VMb2FkRGVs
ZWdhdGU6cmVzb3VyY2VMb2FkRGVsZWdhdGUuZ2V0KCldOwotICAgIFt3ZWJWaWV3IGxvYWRSZXF1
ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05T
U3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJodHRwczovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIu
cG9ydCgpXV1dXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpzZXJ2ZXIucmVxdWVzdCgpXTsK
ICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkRXJyb3JOb3RpZmljYXRpb24p
OwogICAgIEVYUEVDVF9UUlVFKHJlY2VpdmVkQ2hhbGxlbmdlTm90aWZpY2lhdGlvbik7CiB9CiAK
LSNlbmRpZiAvLyBIQVZFKFNTTCkKKyNlbmRpZiAvLyBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKQpJ
bmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29ya2Vy
QmFzaWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD
b2NvYS9TZXJ2aWNlV29ya2VyQmFzaWMubW0JKHJldmlzaW9uIDI2MjkyMCkKKysrIFRvb2xzL1Rl
c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtlckJhc2ljLm1tCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xNTczLDYgKzE1NzMsOCBAQCBURVNUKFNlcnZpY2VXb3JrZXJzLCBQYXJh
bGxlbFByb2Nlc3NMYXVuCiAgICAgd2FpdFVudGlsU2VydmljZVdvcmtlclByb2Nlc3NDb3VudChw
cm9jZXNzUG9vbCwgMik7CiB9CiAKKyNpZiBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKQorCiBzdGF0
aWMgc2l6ZV90IGxhdW5jaFNlcnZpY2VXb3JrZXJQcm9jZXNzKGJvb2wgdXNlU2VwYXJhdGVTZXJ2
aWNlV29ya2VyUHJvY2VzcywgYm9vbCBsb2FkQWJvdXRCbGFua0JlZm9yZVBhZ2UpCiB7CiAgICAg
W1dLV2Vic2l0ZURhdGFTdG9yZSBfYWxsb3dXZWJzaXRlRGF0YVJlY29yZHNGb3JBbGxPcmlnaW5z
XTsKQEAgLTE1ODksOSArMTU5MSw5IEBAIHN0YXRpYyBzaXplX3QgbGF1bmNoU2VydmljZVdvcmtl
clByb2Nlc3MKICAgICBhdXRvIG1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW1NXTWVzc2FnZUhh
bmRsZXIgYWxsb2NdIGluaXRdKTsKICAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250
cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxlci5nZXQoKSBuYW1l
OkAic3ciXTsKIAotICAgIFNlcnZpY2VXb3JrZXJUQ1BTZXJ2ZXIgc2VydmVyKHsKLSAgICAgICAg
eyAidGV4dC9odG1sIiwgbWFpbkJ5dGVzIH0sCi0gICAgICAgIHsgImFwcGxpY2F0aW9uL2phdmFz
Y3JpcHQiLCBzY3JpcHRCeXRlcyB9LAorICAgIFRlc3RXZWJLaXRBUEk6OkhUVFBTZXJ2ZXIgc2Vy
dmVyKHsKKyAgICAgICAgeyAiLyIsIHsgbWFpbkJ5dGVzIH0gfSwKKyAgICAgICAgeyAiL3N3Lmpz
IiwgeyB7eyAiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiIH19LCBzY3Jp
cHRCeXRlcyB9IH0KICAgICB9KTsKIAogICAgIGF1dG8gKnByb2Nlc3NQb29sID0gY29uZmlndXJh
dGlvbi5nZXQoKS5wcm9jZXNzUG9vbDsKQEAgLTE2MzUsNiArMTYzNyw4IEBAIFRFU1QoU2Vydmlj
ZVdvcmtlcnMsIExvYWRBYm91dEJsYW5rQmVmb3IKICAgICBFWFBFQ1RfRVEoMnUsIGxhdW5jaFNl
cnZpY2VXb3JrZXJQcm9jZXNzKHVzZVNlcGFyYXRlU2VydmljZVdvcmtlclByb2Nlc3MsIGZpcnN0
TG9hZEFib3V0QmxhbmspKTsKIH0KIAorI2VuZGlmIC8vIEhBVkUoTkVUV09SS19GUkFNRVdPUksp
CisKIHZvaWQgd2FpdFVudGlsU2VydmljZVdvcmtlclByb2Nlc3NGb3JlZ3JvdW5kQWN0aXZpdHlT
dGF0ZShXS1dlYlZpZXcgKnBhZ2UsIGJvb2wgc2hvdWxkSGF2ZUFjdGl2aXR5KQogewogICAgIGRv
IHsKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5oCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5oCShyZXZpc2lvbiAy
NjI5MjApCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIuaAkod29ya2lu
ZyBjb3B5KQpAQCAtNTMsNiArNTMsOCBAQCBwdWJsaWM6CiAgICAgTlNVUkxSZXF1ZXN0ICpyZXF1
ZXN0KGNvbnN0IFN0cmluZyYgcGF0aCA9ICIvIl9zdHIpIGNvbnN0OwogICAgIHNpemVfdCB0b3Rh
bFJlcXVlc3RzKCkgY29uc3Q7CiAKKyAgICBzdGF0aWMgdm9pZCByZXNwb25kV2l0aENoYWxsZW5n
ZVRoZW5PSyhDb25uZWN0aW9uKTsKKyAgICAKIHByaXZhdGU6CiAgICAgc3RhdGljIFJldGFpblB0
cjxud19wYXJhbWV0ZXJzX3Q+IGxpc3RlbmVyUGFyYW1ldGVycyhQcm90b2NvbCwgQ2VydGlmaWNh
dGVWZXJpZmllciYmKTsKICAgICBzdGF0aWMgdm9pZCByZXNwb25kVG9SZXF1ZXN0cyhDb25uZWN0
aW9uLCBSZWZQdHI8UmVxdWVzdERhdGE+KTsKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29j
b2EvSFRUUFNlcnZlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL2NvY29h
L0hUVFBTZXJ2ZXIubW0JKHJldmlzaW9uIDI2MjkyMCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkv
Y29jb2EvSFRUUFNlcnZlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTE1LDYgKzExNSwyNiBAQCAg
ICAgLCBtX3Byb3RvY29sKHByb3RvY29sKQogCiBIVFRQU2VydmVyOjp+SFRUUFNlcnZlcigpID0g
ZGVmYXVsdDsKIAordm9pZCBIVFRQU2VydmVyOjpyZXNwb25kV2l0aENoYWxsZW5nZVRoZW5PSyhD
b25uZWN0aW9uIGNvbm5lY3Rpb24pCit7CisgICAgY29ubmVjdGlvbi5yZWNlaXZlSFRUUFJlcXVl
c3QoW2Nvbm5lY3Rpb25dIChWZWN0b3I8Y2hhcj4mJikgeworICAgICAgICBjb25zdCBjaGFyKiBj
aGFsbGVuZ2VIZWFkZXIgPQorICAgICAgICAiSFRUUC8xLjEgNDAxIFVuYXV0aG9yaXplZFxyXG4i
CisgICAgICAgICJEYXRlOiBTYXQsIDIzIE1hciAyMDE5IDA2OjI5OjAxIEdNVFxyXG4iCisgICAg
ICAgICJDb250ZW50LUxlbmd0aDogMFxyXG4iCisgICAgICAgICJXV1ctQXV0aGVudGljYXRlOiBC
YXNpYyByZWFsbT1cInRlc3RyZWFsbVwiXHJcblxyXG4iOworICAgICAgICBjb25uZWN0aW9uLnNl
bmQoY2hhbGxlbmdlSGVhZGVyLCBbY29ubmVjdGlvbl0geworICAgICAgICAgICAgY29ubmVjdGlv
bi5yZWNlaXZlSFRUUFJlcXVlc3QoW2Nvbm5lY3Rpb25dIChWZWN0b3I8Y2hhcj4mJikgeworICAg
ICAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZCgKKyAgICAgICAgICAgICAgICAgICAgIkhUVFAv
MS4xIDIwMCBPS1xyXG4iCisgICAgICAgICAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogMTNc
clxuXHJcbiIKKyAgICAgICAgICAgICAgICAgICAgIkhlbGxvLCBXb3JsZCEiCisgICAgICAgICAg
ICAgICAgKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICB9KTsKK30KKwogc2l6
ZV90IEhUVFBTZXJ2ZXI6OnRvdGFsUmVxdWVzdHMoKSBjb25zdAogewogICAgIGlmICghbV9yZXF1
ZXN0RGF0YSkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>401950</attachid>
            <date>2020-06-15 15:29:25 -0700</date>
            <delta_ts>2020-06-15 15:35:17 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213144-20200615152925.patch</filename>
            <type>text/plain</type>
            <size>1240</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2MzA2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDEzIEBACisyMDIwLTA2LTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBGb2xsb3ctdXAgZml4OiBNYWtlIEFQSSB0ZXN0cyB0b2xlcmFudCBvZiBv
dXIgcmVsYXRpdmVseSBuZXcgdXNlIG9mIFdlYlBhZ2VQcm94eTo6cHJlY29ubmVjdFRvCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMxNDQKKyAgICAg
ICAgPHJkYXI6Ly9wcm9ibGVtLzY0MzE2NzQzPgorCisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQg
Zml4LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNl
V29ya2VyQmFzaWMubW06IEd1YXJkIGRpZEZpbmlzaE5hdmlnYXRpb24gZGVjbGFyYXRpb24gd2l0
aCBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKS4KKwogMjAyMC0wNi0xNSAgQWxleCBDaHJpc3RlbnNl
biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByb3ZpZGUgYWx0ZXJuYXRp
dmVseS1uYW1lZCBTUEkgZm9yIHVzZXIgc3R5bGUgc2hlZXRzIGFuZCBzY3JpcHRzCkluZGV4OiBU
b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5t
bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Nl
cnZpY2VXb3JrZXJCYXNpYy5tbQkocmV2aXNpb24gMjYzMDUzKQorKysgVG9vbHMvVGVzdFdlYktp
dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29ya2VyQmFzaWMubW0JKHdvcmtpbmcgY29w
eSkKQEAgLTUxLDcgKzUxLDEwIEBACiAjaW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAog
c3RhdGljIGJvb2wgZG9uZTsKKworI2lmIEhBVkUoTkVUV09SS19GUkFNRVdPUkspCiBzdGF0aWMg
Ym9vbCBkaWRGaW5pc2hOYXZpZ2F0aW9uOworI2VuZGlmCiAKIHN0YXRpYyBTdHJpbmcgZXhwZWN0
ZWRNZXNzYWdlOwogc3RhdGljIFN0cmluZyByZXRyaWV2ZWRTdHJpbmc7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>