<?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>215240</bug_id>
          
          <creation_ts>2020-08-06 14:16:00 -0700</creation_ts>
          <short_desc>r262456 broke sites that expect webkitDisplayingFullscreen to be true almost immediately</short_desc>
          <delta_ts>2022-11-23 18:12:16 -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>Media</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>
          
          <blocked>248296</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Eric Carlson">eric.carlson</reporter>
          <assigned_to name="Eric Carlson">eric.carlson</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>jer.noble</cc>
    
    <cc>peng.liu6</cc>
    
    <cc>philipj</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1678400</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-06 14:16:00 -0700</bug_when>
    <thetext>Some JavaScript libraries expect webkitDisplayingFullscreen to return true immediately after calling webkitEnterFullscreen.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678402</commentid>
    <comment_count>1</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-06 14:16:27 -0700</bug_when>
    <thetext>&lt;rdar://problem/66284042&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678444</commentid>
    <comment_count>2</comment_count>
      <attachid>406125</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-06 15:46:53 -0700</bug_when>
    <thetext>Created attachment 406125
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678446</commentid>
    <comment_count>3</comment_count>
      <attachid>406126</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-06 16:00:07 -0700</bug_when>
    <thetext>Created attachment 406126
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678531</commentid>
    <comment_count>4</comment_count>
      <attachid>406126</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2020-08-07 00:23:03 -0700</bug_when>
    <thetext>Comment on attachment 406126
Patch

Looks like a nice simplification but iOS sim is not happy.
Let&apos;s rerun the test to see whether these were flaky failures.

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

&gt; Source/WebCore/html/HTMLVideoElement.cpp:355
&gt; +    return isFullscreen();

We could inline it in the header file.

&gt; LayoutTests/media/presentationmodechanged-fired-once.html:22
&gt; +			}, 15000);

Indentation is not correct.

&gt; LayoutTests/media/presentationmodechanged-fired-once.html:53
&gt; +

Unneeded.

&gt; LayoutTests/media/video-presentation-mode.html:20
&gt; +                }, 15000);

This is hit now by the iOSsim bot.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678696</commentid>
    <comment_count>5</comment_count>
      <attachid>406126</attachid>
    <who name="Peng Liu">peng.liu6</who>
    <bug_when>2020-08-07 12:55:52 -0700</bug_when>
    <thetext>Comment on attachment 406126
Patch

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

&gt;&gt; Source/WebCore/html/HTMLVideoElement.cpp:355
&gt;&gt; +    return isFullscreen();
&gt; 
&gt; We could inline it in the header file.

Just realized a problem here. With this change, some layout tests may send requests to change presentation mode before the transition is done. Unfortunately, those requests will be ignore by the video element and then end with a test failure/timeout.

&gt; LayoutTests/media/presentationmodechanged-fired-once.html:20
&gt; +    		setTimeout( () =&gt; {

Nit. The space is not needed here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678905</commentid>
    <comment_count>6</comment_count>
      <attachid>406255</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-08 10:27:29 -0700</bug_when>
    <thetext>Created attachment 406255
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678907</commentid>
    <comment_count>7</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-08-08 11:10:40 -0700</bug_when>
    <thetext>Are we also doing the evangelism side of this to try to get the Akamai script fixed?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678910</commentid>
    <comment_count>8</comment_count>
      <attachid>406255</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-08-08 11:30:05 -0700</bug_when>
    <thetext>Comment on attachment 406255
Patch

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

&gt; Source/WebCore/page/Quirks.cpp:989
&gt; +#if PLATFORM(IOS_FAMILY)

I’d like to see a comment documenting a tiny bit about why we need the quirk and predicting/describing when we can remove it. Can likely be a short comment without tons of details, but should not require looking back at the ChangeLog.

&gt; Source/WebCore/page/Quirks.cpp:1000
&gt; +    return classNames.contains(&quot;akamai-html5&quot;) &amp;&amp; classNames.contains(&quot;akamai-media-element&quot;);

Could use _s here to make the AtomString construction slightly more efficient. Or use static const AtomString so we make the atom strings only once the first time this function is called.

&gt; Source/WebCore/page/Quirks.h:114
&gt; +    bool needsAkamaiMediaPlayerQuirk(const HTMLElement&amp;) const;

Why not have this function take an HTMLVideoElement instead of an HTMLElement? The is&lt;HTMLVideoElement&gt; check seems wasteful.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1678999</commentid>
    <comment_count>9</comment_count>
      <attachid>406278</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-09 19:03:51 -0700</bug_when>
    <thetext>Created attachment 406278
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1679074</commentid>
    <comment_count>10</comment_count>
      <attachid>406301</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-10 09:37:23 -0700</bug_when>
    <thetext>Created attachment 406301
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1679111</commentid>
    <comment_count>11</comment_count>
      <attachid>406255</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2020-08-10 10:41:14 -0700</bug_when>
    <thetext>Comment on attachment 406255
Patch

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

Thanks for the review!

&gt;&gt; Source/WebCore/page/Quirks.cpp:989
&gt;&gt; +#if PLATFORM(IOS_FAMILY)
&gt; 
&gt; I’d like to see a comment documenting a tiny bit about why we need the quirk and predicting/describing when we can remove it. Can likely be a short comment without tons of details, but should not require looking back at the ChangeLog.

Fixed.

&gt;&gt; Source/WebCore/page/Quirks.cpp:1000
&gt;&gt; +    return classNames.contains(&quot;akamai-html5&quot;) &amp;&amp; classNames.contains(&quot;akamai-media-element&quot;);
&gt; 
&gt; Could use _s here to make the AtomString construction slightly more efficient. Or use static const AtomString so we make the atom strings only once the first time this function is called.

Great point, changed to use const AtomStrings.

&gt;&gt; Source/WebCore/page/Quirks.h:114
&gt;&gt; +    bool needsAkamaiMediaPlayerQuirk(const HTMLElement&amp;) const;
&gt; 
&gt; Why not have this function take an HTMLVideoElement instead of an HTMLElement? The is&lt;HTMLVideoElement&gt; check seems wasteful.

Fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1679114</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-08-10 10:49:06 -0700</bug_when>
    <thetext>Committed r265437: &lt;https://trac.webkit.org/changeset/265437&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 406301.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1700833</commentid>
    <comment_count>13</comment_count>
    <who name="Peng Liu">peng.liu6</who>
    <bug_when>2020-10-22 14:28:55 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1700834</commentid>
    <comment_count>14</comment_count>
      <attachid>412131</attachid>
    <who name="Peng Liu">peng.liu6</who>
    <bug_when>2020-10-22 14:28:57 -0700</bug_when>
    <thetext>Created attachment 412131
A follow-up patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1700839</commentid>
    <comment_count>15</comment_count>
    <who name="Peng Liu">peng.liu6</who>
    <bug_when>2020-10-22 14:35:50 -0700</bug_when>
    <thetext>Will file a new bug to land the follow-up patch. Closing this bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>406125</attachid>
            <date>2020-08-06 15:46:53 -0700</date>
            <delta_ts>2020-08-06 16:00:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215240-20200806154653.patch</filename>
            <type>text/plain</type>
            <size>12706</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2ZTI3MGM2NTgwYjlh
NjI4MDAzZjFhMjZlMDkwZDUyOGZjODIwZi4uZGE4MjJkMjM5ODg1NDM5OTVmNDk5Nzc1YzM0MDZj
YTcwZDRmMDkyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA4LTA2ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIHIyNjI0NTYgYnJv
a2Ugc2l0ZXMgdGhhdCBleHBlY3Qgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gdG8gYmUgdHJ1
ZSBhbG1vc3QgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxNTI0MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYyODQwNDI+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogbWVk
aWEvd2Via2l0LWRpc3BsYXlpbmctZnVsbHNjcmVlbi10aW1pbmcuaHRtbAorCisgICAgICAgICog
aHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0Vs
ZW1lbnQ6OndlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuKTogT25seSBjb25zaWRlciBpc0Z1bGxz
Y3JlZW4oKS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6OmZ1bGxzY3JlZW5N
b2RlQ2hhbmdlZCk6IENsZWFyIG1faXNDaGFuZ2luZ1ByZXNlbnRhdGlvbk1vZGUKKyAgICAgICAg
YmVjYXVzZSBgcHJlc2VudGF0aW9uTW9kZWAgaXMgY2FsY3VsYXRlZCBmcm9tIGBmdWxsc2NyZWVu
TW9kZWAuCisKIDIwMjAtMDgtMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog
ICAgICAgICBSRUdSRVNTSU9OIChyMjY1MjY2KSBEdW1wUmVuZGVyVHJlZSBjcmFzaCBhdCBXZWJL
aXRBdWRpb0xpc3RlbmVyOjpkb3BwbGVyRmFjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlk
ZW9FbGVtZW50LmNwcAppbmRleCAzZWY4NzgyZjVmZDc0Yzg4YjlkNzAxYmExZGZiMGRhYWViMDQ5
MDM5Li43N2VjMzk2ODYzZDM2NzllMzk1M2EyZmY0NWJhYjFjZTYyOTM5MTM4IDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHAKQEAgLTM1Miw5ICszNTIsNyBAQCBib29s
IEhUTUxWaWRlb0VsZW1lbnQ6OndlYmtpdFN1cHBvcnRzRnVsbHNjcmVlbigpCiAKIGJvb2wgSFRN
TFZpZGVvRWxlbWVudDo6d2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4oKQogewotICAgIC8vIFRo
aXMgZnVuY3Rpb24gc3RhcnRzIHRvIHJldHVybiB0cnVlIGFmdGVyIHRoZSB2aWRlbyBlbGVtZW50
IGhhcyBlbnRlcmVkCi0gICAgLy8gZnVsbHNjcmVlbi9waWN0dXJlLWluLXBpY3R1cmUgdW50aWwg
aXQgaGFzIGV4aXRlZCBmdWxsc2NyZWVuL3BpY3R1cmUtaW4tcGljdHVyZQotICAgIHJldHVybiAo
aXNGdWxsc2NyZWVuKCkgJiYgIXdhaXRpbmdUb0VudGVyRnVsbHNjcmVlbigpKSB8fCAoIWlzRnVs
bHNjcmVlbigpICYmIG1faXNDaGFuZ2luZ1ByZXNlbnRhdGlvbk1vZGUpOworICAgIHJldHVybiBp
c0Z1bGxzY3JlZW4oKTsKIH0KIAogdm9pZCBIVE1MVmlkZW9FbGVtZW50OjphbmNlc3RvcldpbGxF
bnRlckZ1bGxzY3JlZW4oKQpAQCAtNTA3LDYgKzUwNSw4IEBAIGF1dG8gSFRNTFZpZGVvRWxlbWVu
dDo6d2Via2l0UHJlc2VudGF0aW9uTW9kZSgpIGNvbnN0IC0+IFZpZGVvUHJlc2VudGF0aW9uTW9k
ZQogCiB2b2lkIEhUTUxWaWRlb0VsZW1lbnQ6OmZ1bGxzY3JlZW5Nb2RlQ2hhbmdlZChWaWRlb0Z1
bGxzY3JlZW5Nb2RlIG1vZGUpCiB7CisgICAgbV9pc0NoYW5naW5nUHJlc2VudGF0aW9uTW9kZSA9
IGZhbHNlOworCiAgICAgaWYgKG1vZGUgIT0gZnVsbHNjcmVlbk1vZGUoKSkgewogICAgICAgICBJ
TkZPX0xPRyhMT0dJREVOVElGSUVSLCAiY2hhbmdlZCBmcm9tICIsIGZ1bGxzY3JlZW5Nb2RlKCks
ICIsIHRvICIsIG1vZGUpOwogICAgICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS53ZWJr
aXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZEV2ZW50KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZmY2YjBlYjJiNmM0MTYy
YzQyYWQwZjE4MWI0ODNhMzI5NjcwZjExLi41MGRhYjc3YWFhYmUwY2M1YWIzYTk0OTI4ODRjODhl
ZTEyMzZmOWJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMDgtMDYgIEVyaWMgQ2FybHNv
biAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgcjI2MjQ1NiBicm9rZSBzaXRl
cyB0aGF0IGV4cGVjdCB3ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbiB0byBiZSB0cnVlIGFsbW9z
dCBpbW1lZGlhdGVseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjE1MjQwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjI4NDA0Mj4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL2NvbnRyb2xz
L2FpcnBsYXktY29udHJvbHMuaHRtbDogRm9yY2UgZmFpbHVyZSBhZnRlciAxNSBzZWNvbmRzIHNv
IHdlIGdldCBzb21lCisgICAgICAgIHJlc3VsdHMgaWYgdGhlIHRlc3QgdGltZXMgb3V0LgorICAg
ICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL21lZGlh
LWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS5odG1sOgor
ICAgICAgICBEaXR0bywgcGx1cyByZXN0cnVjdHVyZSB0aGUgdGVzdCBzbyBpdCBjYW4gYmUgcnVu
IG1hbnVhbGx5LgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGFjYXJk
LXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LXBpcC5odG1sOiBGb3JjZSBmYWlsdXJlIGFmdGVyIDE1
IHNlY29uZHMuCisgICAgICAgICogbWVkaWEvcHJlc2VudGF0aW9ubW9kZWNoYW5nZWQtZmlyZWQt
b25jZS5odG1sOiBEaXR0by4KKyAgICAgICAgKiBtZWRpYS92aWRlby1wcmVzZW50YXRpb24tbW9k
ZS5odG1sOiBEaXR0by4KKyAgICAgICAgKiBtZWRpYS93ZWJraXQtZGlzcGxheWluZy1mdWxsc2Ny
ZWVuLXRpbWluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3dlYmtpdC1k
aXNwbGF5aW5nLWZ1bGxzY3JlZW4tdGltaW5nLmh0bWw6IEFkZGVkLgorCiAyMDIwLTA4LTA1ICBI
ZWN0b3IgTG9wZXogIDxoZWN0b3JfaV9sb3BlekBhcHBsZS5jb20+CiAKICAgICAgICAgWyBtYWNP
UyAgaU9TIHdrMiBSZWxlYXNlIF0gZWRpdGluZy9zZWxlY3Rpb24vbmF2aWdhdGlvbi1jbGVhcnMt
ZWRpdG9yLXN0YXRlLmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9tZWRpYS9jb250cm9scy9haXJwbGF5LWNvbnRyb2xzLmh0bWwgYi9MYXlvdXRUZXN0cy9t
ZWRpYS9jb250cm9scy9haXJwbGF5LWNvbnRyb2xzLmh0bWwKaW5kZXggZmU1MDFkZjU0YWIxODU3
NjY0OGI3ZDJiMDQyYTkzZjJmOTJmYmMxMS4uZGYzZmNjZTVjMTg2ZTc4ODg4MmI0Yjg5NjVjN2Jj
MGVlZTAzZDI5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMvYWlycGxh
eS1jb250cm9scy5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL2NvbnRyb2xzL2FpcnBsYXkt
Y29udHJvbHMuaHRtbApAQCAtMjAsNiArMjAsMTAgQEAKIAogICAgICAgICAgICAgZnVuY3Rpb24g
c3RhcnQoKSAKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KCAoKSA9
PiB7CisgICAgICAgICAgICAgICAgICAgIGZhaWxUZXN0KCJGQUlMOiB0ZXN0IGRpZCBub3QgZW5k
IHF1aWNrbHkgZW5vdWdoIik7CisgICAgICAgICAgICAgICAgfSwgMTUwMDApOworCiAgICAgICAg
ICAgICAgICAgdGVzdGVyLnN0YXJ0TmV3U2VjdGlvbigiVGVzdCBpbml0aWFsIHN0YXRlIik7CiAK
ICAgICAgICAgICAgICAgICB0ZXN0ZXIudGVzdCgiV2UgYXJlIHVzaW5nIHRoZSBhcHBsZSBpZGlv
bSIpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv
bWVkaWEtY29udHJvbGxlci9tZWRpYS1jb250cm9sbGVyLWlubGluZS10by1mdWxsc2NyZWVuLXRv
LXBpcC10by1pbmxpbmUuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250
cm9scy9tZWRpYS1jb250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3Jl
ZW4tdG8tcGlwLXRvLWlubGluZS5odG1sCmluZGV4IDRkNjE3NjZmZDhhMWVlYzY1MTJhMWQ1NDc1
ODhlZjUwNWE3Njc1NWYuLmM4NmIzZDZiZjliZTIyZjE3MmE0ZGQyMWFkYmRhZTQyZDQxZTNkZGYg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRp
YS1jb250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlw
LXRvLWlubGluZS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250
cm9scy9tZWRpYS1jb250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3Jl
ZW4tdG8tcGlwLXRvLWlubGluZS5odG1sCkBAIC05LDQ1ICs5LDQ0IEBAIHdpbmRvdy5qc1Rlc3RJ
c0FzeW5jID0gdHJ1ZTsKIAogZGVzY3JpcHRpb24oIlRlc3RpbmcgdGhhdCBlbnRlcmluZyBmdWxs
c2NyZWVuLCB0aGVuIGdvaW5nIGludG8gcGljdHVyZS1pbi1waWN0dXJlIGFuZCB0aGVuIGdvaW5n
IGJhY2sgdG8gaW5saW5lIHByZXNlbnRzIGlubGluZSBjb250cm9scy4iKTsKIAorY29uc3QgbWVk
aWEgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJ2aWRlbyIpOworbGV0IHNoYWRvd1Jvb3Q7CisK
IGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgc2hhZG93Um9vdCA9IHdpbmRvdy5pbnRlcm5h
bHMuc2hhZG93Um9vdChtZWRpYSk7CiAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldEFsbG93c1Bp
Y3R1cmVJblBpY3R1cmVNZWRpYVBsYXliYWNrKHRydWUpOwogICAgIGludGVybmFscy5zZXRNb2Nr
VmlkZW9QcmVzZW50YXRpb25Nb2RlRW5hYmxlZCh0cnVlKTsKIH0KIAotY29uc3QgbWVkaWEgPSBk
b2N1bWVudC5xdWVyeVNlbGVjdG9yKCJ2aWRlbyIpOwotY29uc3Qgc2hhZG93Um9vdCA9IHdpbmRv
dy5pbnRlcm5hbHMuc2hhZG93Um9vdChtZWRpYSk7Ci0KIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIo
InBsYXkiLCAoKSA9PiB7CiAgICAgZGVidWcoIiIpOwotICAgIHNob3VsZEJlVHJ1ZSgic2hhZG93
Um9vdC5xdWVyeVNlbGVjdG9yKCcubWVkaWEtY29udHJvbHMnKS5jbGFzc0xpc3QuY29udGFpbnMo
J2lubGluZScpIik7CisgICAgY2hlY2tNZWRpYUNvbnRyb2xzU3RhdGUoJ2lubGluZScpOwogICAg
IGRlYnVnKCJNZWRpYSBzdGFydGVkIHBsYXlpbmcsIHdlIHBhdXNlIGl0IGFuZCBlbnRlciBmdWxs
c2NyZWVuIGJ5IGNsaWNraW5nIG9uIHRoZSBtYXRjaGluZyBidXR0b24uIik7CiAKICAgICBtZWRp
YS5wYXVzZSgpOwotICAgIHdpbmRvdy5yZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4gY2xpY2tP
bkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24uZnVsbHNjcmVlbiIpKSk7
CisgICAgd2luZG93LnJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBjbGlja09uTWVkaWFDb250
cm9sc0VsZW1lbnQoImJ1dHRvbi5mdWxsc2NyZWVuIikpOwogfSk7CiAKLWxldCBwcmV2aW91c1By
ZXNlbnRhdGlvbk1vZGUgPSBtZWRpYS53ZWJraXRQcmVzZW50YXRpb25Nb2RlOworbGV0IHByZXZp
b3VzUHJlc2VudGF0aW9uTW9kZSA9ICJpbmxpbmUiOworCiBtZWRpYS5hZGRFdmVudExpc3RlbmVy
KCJ3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCIsICgpID0+IHsKKwogICAgIGlmIChwcmV2
aW91c1ByZXNlbnRhdGlvbk1vZGUgPT09IG1lZGlhLndlYmtpdFByZXNlbnRhdGlvbk1vZGUpCiAg
ICAgICAgIHJldHVybjsKIAogICAgIGRlYnVnKCIiKTsKICAgICBkZWJ1ZyhgTWVkaWEgcmVjZWl2
ZWQgYSB3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCBldmVudCwgbWVkaWEud2Via2l0UHJl
c2VudGF0aW9uTW9kZSA9ICR7bWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZX0uYCk7CiAKLSAg
ICBsZXQgZGlzcGxheWluZ0Z1bGxzY3JlZW4gPSAidHJ1ZSI7Ci0gICAgaWYgKG1lZGlhLndlYmtp
dFByZXNlbnRhdGlvbk1vZGUgPT0gImlubGluZSIpCi0gICAgICAgIGRpc3BsYXlpbmdGdWxsc2Ny
ZWVuID0gImZhbHNlIjsKLQotICAgIHNob3VsZEJlY29tZUVxdWFsKCJtZWRpYS53ZWJraXREaXNw
bGF5aW5nRnVsbHNjcmVlbiIsIGRpc3BsYXlpbmdGdWxsc2NyZWVuLCAoKSA9PiB7CisgICAgc2hv
dWxkQmVjb21lRXF1YWwoIm1lZGlhLndlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuIiwgYCR7bWVk
aWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSAhPSAiaW5saW5lIn1gLCAoKSA9PiB7CiAgICAgICAg
IHByZXZpb3VzUHJlc2VudGF0aW9uTW9kZSA9IG1lZGlhLndlYmtpdFByZXNlbnRhdGlvbk1vZGU7
CiAgICAgICAgIHN3aXRjaCAobWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSkgewogICAgICAg
ICBjYXNlICJmdWxsc2NyZWVuIjoKICAgICAgICAgICAgIHdpbmRvdy5yZXF1ZXN0QW5pbWF0aW9u
RnJhbWUoKCkgPT4gewotICAgICAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgic2hhZG93Um9vdC5x
dWVyeVNlbGVjdG9yKCcubWVkaWEtY29udHJvbHMnKS5jbGFzc0xpc3QuY29udGFpbnMoJ2Z1bGxz
Y3JlZW4nKSIpOworICAgICAgICAgICAgICAgIGNoZWNrTWVkaWFDb250cm9sc1N0YXRlKCdmdWxs
c2NyZWVuJyk7CiAKICAgICAgICAgICAgICAgICBkZWJ1ZygiIik7CiAgICAgICAgICAgICAgICAg
ZGVidWcoIldlIGVudGVyIHBpY3R1cmUtaW4tcGljdHVyZSBieSBjbGlja2luZyBvbiB0aGUgbWF0
Y2hpbmcgYnV0dG9uLiIpOwotICAgICAgICAgICAgICAgIGNsaWNrT25FbGVtZW50KHNoYWRvd1Jv
b3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLnBpcCIpKTsKKyAgICAgICAgICAgICAgICBjbGlja09u
TWVkaWFDb250cm9sc0VsZW1lbnQoImJ1dHRvbi5waXAiKTsKICAgICAgICAgICAgIH0pOwogICAg
ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgInBpY3R1cmUtaW4tcGljdHVyZSI6CkBAIC01
Nyw3ICs1Niw3IEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoIndlYmtpdHByZXNlbnRhdGlvbm1v
ZGVjaGFuZ2VkIiwgKCkgPT4gewogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgImlu
bGluZSI6CiAgICAgICAgICAgICB3aW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IHsK
LSAgICAgICAgICAgICAgICBzaG91bGRCZVRydWUoInNoYWRvd1Jvb3QucXVlcnlTZWxlY3Rvcign
Lm1lZGlhLWNvbnRyb2xzJykuY2xhc3NMaXN0LmNvbnRhaW5zKCdpbmxpbmUnKSIpOworICAgICAg
ICAgICAgICAgIGNoZWNrTWVkaWFDb250cm9sc1N0YXRlKCdpbmxpbmUnKTsKIAogICAgICAgICAg
ICAgICAgIGRlYnVnKCIiKTsKICAgICAgICAgICAgICAgICBtZWRpYS5yZW1vdmUoKTsKQEAgLTY4
LDE0ICs2NywzMiBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJ3ZWJraXRwcmVzZW50YXRpb25t
b2RlY2hhbmdlZCIsICgpID0+IHsKICAgICB9KTsKIH0pOwogCi1mdW5jdGlvbiBjbGlja09uRWxl
bWVudChlbGVtZW50KQorZnVuY3Rpb24gY2hlY2tNZWRpYUNvbnRyb2xzU3RhdGUoc3RhdGUpCiB7
CisgICAgaWYgKCFzaGFkb3dSb290KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBzaG91
bGRCZVRydWUoYHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignLm1lZGlhLWNvbnRyb2xzJykuY2xh
c3NMaXN0LmNvbnRhaW5zKCcke3N0YXRlfScpYCk7Cit9CisKK2Z1bmN0aW9uIGNsaWNrT25NZWRp
YUNvbnRyb2xzRWxlbWVudChzZWxlY3RvcikKK3sKKyAgICBpZiAoIXNoYWRvd1Jvb3QpCisgICAg
ICAgIHJldHVybjsKKworICAgIGNvbnN0IGVsZW1lbnQgPSBzaGFkb3dSb290LnF1ZXJ5U2VsZWN0
b3Ioc2VsZWN0b3IpOwogICAgIGNvbnN0IGJvdW5kcyA9IGVsZW1lbnQuZ2V0Qm91bmRpbmdDbGll
bnRSZWN0KCk7CiAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oYm91bmRzLmxlZnQgKyAxLCBi
b3VuZHMudG9wICsgMSk7CiAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CiAgICAgZXZlbnRT
ZW5kZXIubW91c2VVcCgpOwogfQogCitzZXRUaW1lb3V0KCAoKSA9PiB7CisgICAgZGVidWcoIkZB
SUw6IHRlc3QgZGlkIG5vdCBlbmQgcXVpY2tseSBlbm91Z2giKTsKKyAgICBtZWRpYS5yZW1vdmUo
KTsKKyAgICBmaW5pc2hKU1Rlc3QoKTsKK30sIDE1MDAwKTsKKwogPC9zY3JpcHQ+CiA8c2NyaXB0
IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CiA8L2Jv
ZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv
cGxhY2FyZC1zdXBwb3J0L3BsYWNhcmQtc3VwcG9ydC1waXAuaHRtbCBiL0xheW91dFRlc3RzL21l
ZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0
LXBpcC5odG1sCmluZGV4IDMyMjZmYzg2MjY0Zjk5ZTZkODk1MjExZmUzY2E3ZjcyZGFlNTc5Y2Yu
LmEwM2Y5MWQxNDcyNWYwZDcwYWY0MjFkOGVhOWIwMWJiMDAwNTY2NzMgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxh
Y2FyZC1zdXBwb3J0LXBpcC5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp
YS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LXBpcC5odG1sCkBAIC02
OCw2ICs2OCwxMiBAQCBmdW5jdGlvbiB0b2dnbGVQaVAoKQogICAgIG1lZGlhLndlYmtpdFNldFBy
ZXNlbnRhdGlvbk1vZGUobWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSA9PSAiaW5saW5lIiA/
ICJwaWN0dXJlLWluLXBpY3R1cmUiIDogImlubGluZSIpOwogfQogCitzZXRUaW1lb3V0KCAoKSA9
PiB7CisgICAgZGVidWcoIkZBSUw6IHRlc3QgZGlkIG5vdCBlbmQgcXVpY2tseSBlbm91Z2giKTsK
KwltZWRpYS5yZW1vdmUoKTsKKwlmaW5pc2hKU1Rlc3QoKTsKK30sIDE1MDAwKTsKKwogPC9zY3Jp
cHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9z
Y3JpcHQ+CiA8L2JvZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9wcmVzZW50YXRp
b25tb2RlY2hhbmdlZC1maXJlZC1vbmNlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9wcmVzZW50
YXRpb25tb2RlY2hhbmdlZC1maXJlZC1vbmNlLmh0bWwKaW5kZXggNTM4YmQxMjdiYzkxYTk5OTBh
NTA3YzkyNGYzY2JiNTQzMWFhNDdkNC4uMzhmYjVmYmE2OGJmMzFiOTNkYTE2NmEzOWExMDA5ZGNl
MTkxOGM0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvcHJlc2VudGF0aW9ubW9kZWNo
YW5nZWQtZmlyZWQtb25jZS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3ByZXNlbnRhdGlv
bm1vZGVjaGFuZ2VkLWZpcmVkLW9uY2UuaHRtbApAQCAtMTYsNiArMTYsMTAgQEAKICAgICAgICAg
ICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKICAgICAgICAgICAgIHJ1bigndmlkZW8uc3JjID0gZmlu
ZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90ZXN0IiknKTsKICAgICAgICAgICAgIHdhaXRG
b3JFdmVudE9uY2UoJ2NhbnBsYXl0aHJvdWdoJywgY2FuUGxheVRocm91Z2gpOworCisgICAgCQlz
ZXRUaW1lb3V0KCAoKSA9PiB7CisJCQkJZmFpbFRlc3QoIkZBSUw6IHRlc3QgZGlkIG5vdCBlbmQg
cXVpY2tseSBlbm91Z2giKTsKKwkJCX0sIDE1MDAwKTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1
bmN0aW9uIGNhblBsYXlUaHJvdWdoKCkKQEAgLTQ2LDYgKzUwLDcgQEAKICAgICAgICAgICAgICAg
ICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKwogICAgIDwvc2NyaXB0Pgog
PC9oZWFkPgogPGJvZHkgb25sb2FkPSJnbygpIj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21l
ZGlhL3ZpZGVvLXByZXNlbnRhdGlvbi1tb2RlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRl
by1wcmVzZW50YXRpb24tbW9kZS5odG1sCmluZGV4IDMwNTZkMTVlMWE5YzJkMWNhZmNiMWUwZTI4
Y2ZhNGI3Yjk3NzY0ZDguLjRkNTM1YWMwNWIwNjhmNzU0YzI0MGQwZTAzODZiNzhjYmZiZmE5ZDcg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXByZXNlbnRhdGlvbi1tb2RlLmh0
bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcHJlc2VudGF0aW9uLW1vZGUuaHRtbApA
QCAtMTUsNiArMTUsMTAgQEAKICAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnRPbmNlKCJjYW5w
bGF5dGhyb3VnaCIsIGNhbnBsYXl0aHJvdWdoKTsKICAgICAgICAgICAgICAgICB2aWRlby5zcmMg
PSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJjb250ZW50L3Rlc3QiKTsKIAorICAgICAgICAgICAg
ICAgIHNldFRpbWVvdXQoICgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgZmFpbFRlc3QoIkZB
SUw6IHRlc3QgZGlkIG5vdCBlbmQgcXVpY2tseSBlbm91Z2giKTsKKyAgICAgICAgICAgICAgICB9
LCAxNTAwMCk7CisKICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwogICAgICAgICAg
ICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS93ZWJraXQtZGlzcGxheWluZy1m
dWxsc2NyZWVuLXRpbWluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS93ZWJraXQt
ZGlzcGxheWluZy1mdWxsc2NyZWVuLXRpbWluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx
MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmNh
NzgwNjAzNmNiYmQ0MmFkNzYxZTdjMjMwM2VhZDczZDE1ODdhYQotLS0gL2Rldi9udWxsCisrKyBi
L0xheW91dFRlc3RzL21lZGlhL3dlYmtpdC1kaXNwbGF5aW5nLWZ1bGxzY3JlZW4tdGltaW5nLWV4
cGVjdGVkLnR4dApAQCAtMCwwICsxLDggQEAKK1Rlc3QgdGhhdCAid2Via2l0RGlzcGxheWluZ0Z1
bGxzY3JlZW4iIHJldHVybnMgdHJ1ZSBzaG9ydGx5IGFmdGVyIHJlcXVlc3RpbmcgZnVsbHNjcmVl
bi4KKworUlVOKHZpZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgImNvbnRlbnQvdGVz
dCIpKQorRVZFTlQoY2FucGxheXRocm91Z2gpCitSVU4odmlkZW8ud2Via2l0RW50ZXJGdWxsc2Ny
ZWVuKCkpCitFWFBFQ1RFRCAodmlkZW8ud2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gPT0gJ3Ry
dWUnKSBPSworRU5EIE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvd2Vi
a2l0LWRpc3BsYXlpbmctZnVsbHNjcmVlbi10aW1pbmcuaHRtbCBiL0xheW91dFRlc3RzL21lZGlh
L3dlYmtpdC1kaXNwbGF5aW5nLWZ1bGxzY3JlZW4tdGltaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAx
MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGJm
OWFjMDQ0MjVmNTQ5Mzk0NDhiZDllZDkwZDM4MDQ2MWE0YTkwMQotLS0gL2Rldi9udWxsCisrKyBi
L0xheW91dFRlc3RzL21lZGlhL3dlYmtpdC1kaXNwbGF5aW5nLWZ1bGxzY3JlZW4tdGltaW5nLmh0
bWwKQEAgLTAsMCArMSwyNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAg
IDxzY3JpcHQgc3JjPSJ2aWRlby10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0i
bWVkaWEtZmlsZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgd2luZG93LmFk
ZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBhc3luYyBldmVudCA9PiB7CisKKyAgICAgICAgICAgIGZp
bmRNZWRpYUVsZW1lbnQoKTsKKyAgICAgICAgICAgIHJ1bigndmlkZW8uc3JjID0gZmluZE1lZGlh
RmlsZSgidmlkZW8iLCAiY29udGVudC90ZXN0IiknKTsKKyAgICAgICAgICAgIGF3YWl0IHdhaXRG
b3IodmlkZW8sICdjYW5wbGF5dGhyb3VnaCcpOworCisgICAgICAgICAgICBzZXRUaW1lb3V0KCAo
KSA9PiB7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby53ZWJraXREaXNwbGF5
aW5nRnVsbHNjcmVlbiIsIHRydWUpOworICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAg
ICAgICAgIH0sIDIwMCk7CisKKyAgICAgICAgICAgIHJ1bldpdGhLZXlEb3duKCJ2aWRlby53ZWJr
aXRFbnRlckZ1bGxzY3JlZW4oKSIpOworICAgICAgICB9KTsKKworICAgIDwvc2NyaXB0PgorPC9o
ZWFkPgorPGJvZHk+CisgICAgPGRpdj5UZXN0IHRoYXQgIndlYmtpdERpc3BsYXlpbmdGdWxsc2Ny
ZWVuIiByZXR1cm5zIHRydWUgc2hvcnRseSBhZnRlciByZXF1ZXN0aW5nIGZ1bGxzY3JlZW4uPC9k
aXY+CisgICAgPHZpZGVvIGNvbnRyb2xzPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>406126</attachid>
            <date>2020-08-06 16:00:07 -0700</date>
            <delta_ts>2020-08-08 10:27:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215240-20200806160006.patch</filename>
            <type>text/plain</type>
            <size>13378</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2ZTI3MGM2NTgwYjlh
NjI4MDAzZjFhMjZlMDkwZDUyOGZjODIwZi4uZGE4MjJkMjM5ODg1NDM5OTVmNDk5Nzc1YzM0MDZj
YTcwZDRmMDkyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA4LTA2ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIHIyNjI0NTYgYnJv
a2Ugc2l0ZXMgdGhhdCBleHBlY3Qgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gdG8gYmUgdHJ1
ZSBhbG1vc3QgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxNTI0MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYyODQwNDI+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogbWVk
aWEvd2Via2l0LWRpc3BsYXlpbmctZnVsbHNjcmVlbi10aW1pbmcuaHRtbAorCisgICAgICAgICog
aHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0Vs
ZW1lbnQ6OndlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuKTogT25seSBjb25zaWRlciBpc0Z1bGxz
Y3JlZW4oKS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6OmZ1bGxzY3JlZW5N
b2RlQ2hhbmdlZCk6IENsZWFyIG1faXNDaGFuZ2luZ1ByZXNlbnRhdGlvbk1vZGUKKyAgICAgICAg
YmVjYXVzZSBgcHJlc2VudGF0aW9uTW9kZWAgaXMgY2FsY3VsYXRlZCBmcm9tIGBmdWxsc2NyZWVu
TW9kZWAuCisKIDIwMjAtMDgtMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog
ICAgICAgICBSRUdSRVNTSU9OIChyMjY1MjY2KSBEdW1wUmVuZGVyVHJlZSBjcmFzaCBhdCBXZWJL
aXRBdWRpb0xpc3RlbmVyOjpkb3BwbGVyRmFjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlk
ZW9FbGVtZW50LmNwcAppbmRleCAzZWY4NzgyZjVmZDc0Yzg4YjlkNzAxYmExZGZiMGRhYWViMDQ5
MDM5Li43N2VjMzk2ODYzZDM2NzllMzk1M2EyZmY0NWJhYjFjZTYyOTM5MTM4IDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHAKQEAgLTM1Miw5ICszNTIsNyBAQCBib29s
IEhUTUxWaWRlb0VsZW1lbnQ6OndlYmtpdFN1cHBvcnRzRnVsbHNjcmVlbigpCiAKIGJvb2wgSFRN
TFZpZGVvRWxlbWVudDo6d2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4oKQogewotICAgIC8vIFRo
aXMgZnVuY3Rpb24gc3RhcnRzIHRvIHJldHVybiB0cnVlIGFmdGVyIHRoZSB2aWRlbyBlbGVtZW50
IGhhcyBlbnRlcmVkCi0gICAgLy8gZnVsbHNjcmVlbi9waWN0dXJlLWluLXBpY3R1cmUgdW50aWwg
aXQgaGFzIGV4aXRlZCBmdWxsc2NyZWVuL3BpY3R1cmUtaW4tcGljdHVyZQotICAgIHJldHVybiAo
aXNGdWxsc2NyZWVuKCkgJiYgIXdhaXRpbmdUb0VudGVyRnVsbHNjcmVlbigpKSB8fCAoIWlzRnVs
bHNjcmVlbigpICYmIG1faXNDaGFuZ2luZ1ByZXNlbnRhdGlvbk1vZGUpOworICAgIHJldHVybiBp
c0Z1bGxzY3JlZW4oKTsKIH0KIAogdm9pZCBIVE1MVmlkZW9FbGVtZW50OjphbmNlc3RvcldpbGxF
bnRlckZ1bGxzY3JlZW4oKQpAQCAtNTA3LDYgKzUwNSw4IEBAIGF1dG8gSFRNTFZpZGVvRWxlbWVu
dDo6d2Via2l0UHJlc2VudGF0aW9uTW9kZSgpIGNvbnN0IC0+IFZpZGVvUHJlc2VudGF0aW9uTW9k
ZQogCiB2b2lkIEhUTUxWaWRlb0VsZW1lbnQ6OmZ1bGxzY3JlZW5Nb2RlQ2hhbmdlZChWaWRlb0Z1
bGxzY3JlZW5Nb2RlIG1vZGUpCiB7CisgICAgbV9pc0NoYW5naW5nUHJlc2VudGF0aW9uTW9kZSA9
IGZhbHNlOworCiAgICAgaWYgKG1vZGUgIT0gZnVsbHNjcmVlbk1vZGUoKSkgewogICAgICAgICBJ
TkZPX0xPRyhMT0dJREVOVElGSUVSLCAiY2hhbmdlZCBmcm9tICIsIGZ1bGxzY3JlZW5Nb2RlKCks
ICIsIHRvICIsIG1vZGUpOwogICAgICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS53ZWJr
aXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZEV2ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlk
ZW9FbGVtZW50LmgKaW5kZXggN2ZhNmY1OTA4YTNkZmRhY2ZjNjEwNWQ4OWY4MGVmNmI1OGNiNWFl
My4uOWJhNWEzZGNhMGUyMTRhMjE3MjAwMTc4NjdmN2ZlYTgwNGU2NGE4YSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNv
cmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmgKQEAgLTEzMyw5ICsxMzMsOSBAQCBwcml2YXRlOgog
CiAgICAgdW5zaWduZWQgbV9sYXN0UmVwb3J0ZWRWaWRlb1dpZHRoIHsgMCB9OwogICAgIHVuc2ln
bmVkIG1fbGFzdFJlcG9ydGVkVmlkZW9IZWlnaHQgeyAwIH07Ci0gICAgYm9vbCBtX2lzQ2hhbmdp
bmdQcmVzZW50YXRpb25Nb2RlIHsgZmFsc2UgfTsKIAogI2lmIEVOQUJMRShWSURFT19QUkVTRU5U
QVRJT05fTU9ERSkKKyAgICBib29sIG1faXNDaGFuZ2luZ1ByZXNlbnRhdGlvbk1vZGUgeyBmYWxz
ZSB9OwogICAgIGJvb2wgbV9pc0VudGVyaW5nT3JFeGl0aW5nUGljdHVyZUluUGljdHVyZSB7IGZh
bHNlIH07CiAgICAgYm9vbCBtX2lzV2FpdGluZ0ZvclBpY3R1cmVJblBpY3R1cmVXaW5kb3dGcmFt
ZSB7IGZhbHNlIH07CiAjZW5kaWYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZmY2YjBlYjJiNmM0MTYyYzQyYWQwZjE4MWI0
ODNhMzI5NjcwZjExLi41MGRhYjc3YWFhYmUwY2M1YWIzYTk0OTI4ODRjODhlZTEyMzZmOWJmIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMDgtMDYgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2Fy
bHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgcjI2MjQ1NiBicm9rZSBzaXRlcyB0aGF0IGV4cGVj
dCB3ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbiB0byBiZSB0cnVlIGFsbW9zdCBpbW1lZGlhdGVs
eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1MjQw
CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjI4NDA0Mj4KKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL2NvbnRyb2xzL2FpcnBsYXktY29u
dHJvbHMuaHRtbDogRm9yY2UgZmFpbHVyZSBhZnRlciAxNSBzZWNvbmRzIHNvIHdlIGdldCBzb21l
CisgICAgICAgIHJlc3VsdHMgaWYgdGhlIHRlc3QgdGltZXMgb3V0LgorICAgICAgICAqIG1lZGlh
L21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXIt
aW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS5odG1sOgorICAgICAgICBEaXR0
bywgcGx1cyByZXN0cnVjdHVyZSB0aGUgdGVzdCBzbyBpdCBjYW4gYmUgcnVuIG1hbnVhbGx5Lgor
ICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxh
Y2FyZC1zdXBwb3J0LXBpcC5odG1sOiBGb3JjZSBmYWlsdXJlIGFmdGVyIDE1IHNlY29uZHMuCisg
ICAgICAgICogbWVkaWEvcHJlc2VudGF0aW9ubW9kZWNoYW5nZWQtZmlyZWQtb25jZS5odG1sOiBE
aXR0by4KKyAgICAgICAgKiBtZWRpYS92aWRlby1wcmVzZW50YXRpb24tbW9kZS5odG1sOiBEaXR0
by4KKyAgICAgICAgKiBtZWRpYS93ZWJraXQtZGlzcGxheWluZy1mdWxsc2NyZWVuLXRpbWluZy1l
eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3dlYmtpdC1kaXNwbGF5aW5nLWZ1
bGxzY3JlZW4tdGltaW5nLmh0bWw6IEFkZGVkLgorCiAyMDIwLTA4LTA1ICBIZWN0b3IgTG9wZXog
IDxoZWN0b3JfaV9sb3BlekBhcHBsZS5jb20+CiAKICAgICAgICAgWyBtYWNPUyAgaU9TIHdrMiBS
ZWxlYXNlIF0gZWRpdGluZy9zZWxlY3Rpb24vbmF2aWdhdGlvbi1jbGVhcnMtZWRpdG9yLXN0YXRl
Lmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9j
b250cm9scy9haXJwbGF5LWNvbnRyb2xzLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9jb250cm9s
cy9haXJwbGF5LWNvbnRyb2xzLmh0bWwKaW5kZXggZmU1MDFkZjU0YWIxODU3NjY0OGI3ZDJiMDQy
YTkzZjJmOTJmYmMxMS4uZGYzZmNjZTVjMTg2ZTc4ODg4MmI0Yjg5NjVjN2JjMGVlZTAzZDI5YSAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMvYWlycGxheS1jb250cm9scy5o
dG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL2NvbnRyb2xzL2FpcnBsYXktY29udHJvbHMuaHRt
bApAQCAtMjAsNiArMjAsMTAgQEAKIAogICAgICAgICAgICAgZnVuY3Rpb24gc3RhcnQoKSAKICAg
ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KCAoKSA9PiB7CisgICAgICAg
ICAgICAgICAgICAgIGZhaWxUZXN0KCJGQUlMOiB0ZXN0IGRpZCBub3QgZW5kIHF1aWNrbHkgZW5v
dWdoIik7CisgICAgICAgICAgICAgICAgfSwgMTUwMDApOworCiAgICAgICAgICAgICAgICAgdGVz
dGVyLnN0YXJ0TmV3U2VjdGlvbigiVGVzdCBpbml0aWFsIHN0YXRlIik7CiAKICAgICAgICAgICAg
ICAgICB0ZXN0ZXIudGVzdCgiV2UgYXJlIHVzaW5nIHRoZSBhcHBsZSBpZGlvbSIpCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEtY29udHJv
bGxlci9tZWRpYS1jb250cm9sbGVyLWlubGluZS10by1mdWxsc2NyZWVuLXRvLXBpcC10by1pbmxp
bmUuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1j
b250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRv
LWlubGluZS5odG1sCmluZGV4IDRkNjE3NjZmZDhhMWVlYzY1MTJhMWQ1NDc1ODhlZjUwNWE3Njc1
NWYuLmM4NmIzZDZiZjliZTIyZjE3MmE0ZGQyMWFkYmRhZTQyZDQxZTNkZGYgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVy
L21lZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS5o
dG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1j
b250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRv
LWlubGluZS5odG1sCkBAIC05LDQ1ICs5LDQ0IEBAIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1
ZTsKIAogZGVzY3JpcHRpb24oIlRlc3RpbmcgdGhhdCBlbnRlcmluZyBmdWxsc2NyZWVuLCB0aGVu
IGdvaW5nIGludG8gcGljdHVyZS1pbi1waWN0dXJlIGFuZCB0aGVuIGdvaW5nIGJhY2sgdG8gaW5s
aW5lIHByZXNlbnRzIGlubGluZSBjb250cm9scy4iKTsKIAorY29uc3QgbWVkaWEgPSBkb2N1bWVu
dC5xdWVyeVNlbGVjdG9yKCJ2aWRlbyIpOworbGV0IHNoYWRvd1Jvb3Q7CisKIGlmICh3aW5kb3cu
aW50ZXJuYWxzKSB7CisgICAgc2hhZG93Um9vdCA9IHdpbmRvdy5pbnRlcm5hbHMuc2hhZG93Um9v
dChtZWRpYSk7CiAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldEFsbG93c1BpY3R1cmVJblBpY3R1
cmVNZWRpYVBsYXliYWNrKHRydWUpOwogICAgIGludGVybmFscy5zZXRNb2NrVmlkZW9QcmVzZW50
YXRpb25Nb2RlRW5hYmxlZCh0cnVlKTsKIH0KIAotY29uc3QgbWVkaWEgPSBkb2N1bWVudC5xdWVy
eVNlbGVjdG9yKCJ2aWRlbyIpOwotY29uc3Qgc2hhZG93Um9vdCA9IHdpbmRvdy5pbnRlcm5hbHMu
c2hhZG93Um9vdChtZWRpYSk7Ci0KIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9
PiB7CiAgICAgZGVidWcoIiIpOwotICAgIHNob3VsZEJlVHJ1ZSgic2hhZG93Um9vdC5xdWVyeVNl
bGVjdG9yKCcubWVkaWEtY29udHJvbHMnKS5jbGFzc0xpc3QuY29udGFpbnMoJ2lubGluZScpIik7
CisgICAgY2hlY2tNZWRpYUNvbnRyb2xzU3RhdGUoJ2lubGluZScpOwogICAgIGRlYnVnKCJNZWRp
YSBzdGFydGVkIHBsYXlpbmcsIHdlIHBhdXNlIGl0IGFuZCBlbnRlciBmdWxsc2NyZWVuIGJ5IGNs
aWNraW5nIG9uIHRoZSBtYXRjaGluZyBidXR0b24uIik7CiAKICAgICBtZWRpYS5wYXVzZSgpOwot
ICAgIHdpbmRvdy5yZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4gY2xpY2tPbkVsZW1lbnQoc2hh
ZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24uZnVsbHNjcmVlbiIpKSk7CisgICAgd2luZG93
LnJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBjbGlja09uTWVkaWFDb250cm9sc0VsZW1lbnQo
ImJ1dHRvbi5mdWxsc2NyZWVuIikpOwogfSk7CiAKLWxldCBwcmV2aW91c1ByZXNlbnRhdGlvbk1v
ZGUgPSBtZWRpYS53ZWJraXRQcmVzZW50YXRpb25Nb2RlOworbGV0IHByZXZpb3VzUHJlc2VudGF0
aW9uTW9kZSA9ICJpbmxpbmUiOworCiBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJ3ZWJraXRwcmVz
ZW50YXRpb25tb2RlY2hhbmdlZCIsICgpID0+IHsKKwogICAgIGlmIChwcmV2aW91c1ByZXNlbnRh
dGlvbk1vZGUgPT09IG1lZGlhLndlYmtpdFByZXNlbnRhdGlvbk1vZGUpCiAgICAgICAgIHJldHVy
bjsKIAogICAgIGRlYnVnKCIiKTsKICAgICBkZWJ1ZyhgTWVkaWEgcmVjZWl2ZWQgYSB3ZWJraXRw
cmVzZW50YXRpb25tb2RlY2hhbmdlZCBldmVudCwgbWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9k
ZSA9ICR7bWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZX0uYCk7CiAKLSAgICBsZXQgZGlzcGxh
eWluZ0Z1bGxzY3JlZW4gPSAidHJ1ZSI7Ci0gICAgaWYgKG1lZGlhLndlYmtpdFByZXNlbnRhdGlv
bk1vZGUgPT0gImlubGluZSIpCi0gICAgICAgIGRpc3BsYXlpbmdGdWxsc2NyZWVuID0gImZhbHNl
IjsKLQotICAgIHNob3VsZEJlY29tZUVxdWFsKCJtZWRpYS53ZWJraXREaXNwbGF5aW5nRnVsbHNj
cmVlbiIsIGRpc3BsYXlpbmdGdWxsc2NyZWVuLCAoKSA9PiB7CisgICAgc2hvdWxkQmVjb21lRXF1
YWwoIm1lZGlhLndlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuIiwgYCR7bWVkaWEud2Via2l0UHJl
c2VudGF0aW9uTW9kZSAhPSAiaW5saW5lIn1gLCAoKSA9PiB7CiAgICAgICAgIHByZXZpb3VzUHJl
c2VudGF0aW9uTW9kZSA9IG1lZGlhLndlYmtpdFByZXNlbnRhdGlvbk1vZGU7CiAgICAgICAgIHN3
aXRjaCAobWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSkgewogICAgICAgICBjYXNlICJmdWxs
c2NyZWVuIjoKICAgICAgICAgICAgIHdpbmRvdy5yZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4g
ewotICAgICAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgic2hhZG93Um9vdC5xdWVyeVNlbGVjdG9y
KCcubWVkaWEtY29udHJvbHMnKS5jbGFzc0xpc3QuY29udGFpbnMoJ2Z1bGxzY3JlZW4nKSIpOwor
ICAgICAgICAgICAgICAgIGNoZWNrTWVkaWFDb250cm9sc1N0YXRlKCdmdWxsc2NyZWVuJyk7CiAK
ICAgICAgICAgICAgICAgICBkZWJ1ZygiIik7CiAgICAgICAgICAgICAgICAgZGVidWcoIldlIGVu
dGVyIHBpY3R1cmUtaW4tcGljdHVyZSBieSBjbGlja2luZyBvbiB0aGUgbWF0Y2hpbmcgYnV0dG9u
LiIpOwotICAgICAgICAgICAgICAgIGNsaWNrT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxl
Y3RvcigiYnV0dG9uLnBpcCIpKTsKKyAgICAgICAgICAgICAgICBjbGlja09uTWVkaWFDb250cm9s
c0VsZW1lbnQoImJ1dHRvbi5waXAiKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgYnJl
YWs7CiAgICAgICAgIGNhc2UgInBpY3R1cmUtaW4tcGljdHVyZSI6CkBAIC01Nyw3ICs1Niw3IEBA
IG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoIndlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkIiwg
KCkgPT4gewogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgImlubGluZSI6CiAgICAg
ICAgICAgICB3aW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IHsKLSAgICAgICAgICAg
ICAgICBzaG91bGRCZVRydWUoInNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignLm1lZGlhLWNvbnRy
b2xzJykuY2xhc3NMaXN0LmNvbnRhaW5zKCdpbmxpbmUnKSIpOworICAgICAgICAgICAgICAgIGNo
ZWNrTWVkaWFDb250cm9sc1N0YXRlKCdpbmxpbmUnKTsKIAogICAgICAgICAgICAgICAgIGRlYnVn
KCIiKTsKICAgICAgICAgICAgICAgICBtZWRpYS5yZW1vdmUoKTsKQEAgLTY4LDE0ICs2NywzMiBA
QCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJ3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCIs
ICgpID0+IHsKICAgICB9KTsKIH0pOwogCi1mdW5jdGlvbiBjbGlja09uRWxlbWVudChlbGVtZW50
KQorZnVuY3Rpb24gY2hlY2tNZWRpYUNvbnRyb2xzU3RhdGUoc3RhdGUpCiB7CisgICAgaWYgKCFz
aGFkb3dSb290KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBzaG91bGRCZVRydWUoYHNo
YWRvd1Jvb3QucXVlcnlTZWxlY3RvcignLm1lZGlhLWNvbnRyb2xzJykuY2xhc3NMaXN0LmNvbnRh
aW5zKCcke3N0YXRlfScpYCk7Cit9CisKK2Z1bmN0aW9uIGNsaWNrT25NZWRpYUNvbnRyb2xzRWxl
bWVudChzZWxlY3RvcikKK3sKKyAgICBpZiAoIXNoYWRvd1Jvb3QpCisgICAgICAgIHJldHVybjsK
KworICAgIGNvbnN0IGVsZW1lbnQgPSBzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3Ioc2VsZWN0b3Ip
OwogICAgIGNvbnN0IGJvdW5kcyA9IGVsZW1lbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CiAg
ICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oYm91bmRzLmxlZnQgKyAxLCBib3VuZHMudG9wICsg
MSk7CiAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CiAgICAgZXZlbnRTZW5kZXIubW91c2VV
cCgpOwogfQogCitzZXRUaW1lb3V0KCAoKSA9PiB7CisgICAgZGVidWcoIkZBSUw6IHRlc3QgZGlk
IG5vdCBlbmQgcXVpY2tseSBlbm91Z2giKTsKKyAgICBtZWRpYS5yZW1vdmUoKTsKKyAgICBmaW5p
c2hKU1Rlc3QoKTsKK30sIDE1MDAwKTsKKwogPC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4v
Li4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CiA8L2JvZHk+CmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvcGxhY2FyZC1zdXBw
b3J0L3BsYWNhcmQtc3VwcG9ydC1waXAuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1t
ZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LXBpcC5odG1sCmlu
ZGV4IDMyMjZmYzg2MjY0Zjk5ZTZkODk1MjExZmUzY2E3ZjcyZGFlNTc5Y2YuLmEwM2Y5MWQxNDcy
NWYwZDcwYWY0MjFkOGVhOWIwMWJiMDAwNTY2NzMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21l
ZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0
LXBpcC5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9w
bGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LXBpcC5odG1sCkBAIC02OCw2ICs2OCwxMiBA
QCBmdW5jdGlvbiB0b2dnbGVQaVAoKQogICAgIG1lZGlhLndlYmtpdFNldFByZXNlbnRhdGlvbk1v
ZGUobWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSA9PSAiaW5saW5lIiA/ICJwaWN0dXJlLWlu
LXBpY3R1cmUiIDogImlubGluZSIpOwogfQogCitzZXRUaW1lb3V0KCAoKSA9PiB7CisgICAgZGVi
dWcoIkZBSUw6IHRlc3QgZGlkIG5vdCBlbmQgcXVpY2tseSBlbm91Z2giKTsKKwltZWRpYS5yZW1v
dmUoKTsKKwlmaW5pc2hKU1Rlc3QoKTsKK30sIDE1MDAwKTsKKwogPC9zY3JpcHQ+CiA8c2NyaXB0
IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CiA8L2Jv
ZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9wcmVzZW50YXRpb25tb2RlY2hhbmdl
ZC1maXJlZC1vbmNlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9wcmVzZW50YXRpb25tb2RlY2hh
bmdlZC1maXJlZC1vbmNlLmh0bWwKaW5kZXggNTM4YmQxMjdiYzkxYTk5OTBhNTA3YzkyNGYzY2Ji
NTQzMWFhNDdkNC4uMzhmYjVmYmE2OGJmMzFiOTNkYTE2NmEzOWExMDA5ZGNlMTkxOGM0MCAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvcHJlc2VudGF0aW9ubW9kZWNoYW5nZWQtZmlyZWQt
b25jZS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3ByZXNlbnRhdGlvbm1vZGVjaGFuZ2Vk
LWZpcmVkLW9uY2UuaHRtbApAQCAtMTYsNiArMTYsMTAgQEAKICAgICAgICAgICAgIGZpbmRNZWRp
YUVsZW1lbnQoKTsKICAgICAgICAgICAgIHJ1bigndmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgi
dmlkZW8iLCAiY29udGVudC90ZXN0IiknKTsKICAgICAgICAgICAgIHdhaXRGb3JFdmVudE9uY2Uo
J2NhbnBsYXl0aHJvdWdoJywgY2FuUGxheVRocm91Z2gpOworCisgICAgCQlzZXRUaW1lb3V0KCAo
KSA9PiB7CisJCQkJZmFpbFRlc3QoIkZBSUw6IHRlc3QgZGlkIG5vdCBlbmQgcXVpY2tseSBlbm91
Z2giKTsKKwkJCX0sIDE1MDAwKTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIGNhblBs
YXlUaHJvdWdoKCkKQEAgLTQ2LDYgKzUwLDcgQEAKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7
CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKwogICAgIDwvc2NyaXB0PgogPC9oZWFkPgogPGJv
ZHkgb25sb2FkPSJnbygpIj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBy
ZXNlbnRhdGlvbi1tb2RlLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wcmVzZW50YXRp
b24tbW9kZS5odG1sCmluZGV4IDMwNTZkMTVlMWE5YzJkMWNhZmNiMWUwZTI4Y2ZhNGI3Yjk3NzY0
ZDguLjRkNTM1YWMwNWIwNjhmNzU0YzI0MGQwZTAzODZiNzhjYmZiZmE5ZDcgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXByZXNlbnRhdGlvbi1tb2RlLmh0bWwKKysrIGIvTGF5
b3V0VGVzdHMvbWVkaWEvdmlkZW8tcHJlc2VudGF0aW9uLW1vZGUuaHRtbApAQCAtMTUsNiArMTUs
MTAgQEAKICAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnRPbmNlKCJjYW5wbGF5dGhyb3VnaCIs
IGNhbnBsYXl0aHJvdWdoKTsKICAgICAgICAgICAgICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFG
aWxlKCJ2aWRlbyIsICJjb250ZW50L3Rlc3QiKTsKIAorICAgICAgICAgICAgICAgIHNldFRpbWVv
dXQoICgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgZmFpbFRlc3QoIkZBSUw6IHRlc3QgZGlk
IG5vdCBlbmQgcXVpY2tseSBlbm91Z2giKTsKKyAgICAgICAgICAgICAgICB9LCAxNTAwMCk7CisK
ICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwogICAgICAgICAgICAgfQogCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS93ZWJraXQtZGlzcGxheWluZy1mdWxsc2NyZWVuLXRp
bWluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS93ZWJraXQtZGlzcGxheWluZy1m
dWxsc2NyZWVuLXRpbWluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmNhNzgwNjAzNmNiYmQ0
MmFkNzYxZTdjMjMwM2VhZDczZDE1ODdhYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L21lZGlhL3dlYmtpdC1kaXNwbGF5aW5nLWZ1bGxzY3JlZW4tdGltaW5nLWV4cGVjdGVkLnR4dApA
QCAtMCwwICsxLDggQEAKK1Rlc3QgdGhhdCAid2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4iIHJl
dHVybnMgdHJ1ZSBzaG9ydGx5IGFmdGVyIHJlcXVlc3RpbmcgZnVsbHNjcmVlbi4KKworUlVOKHZp
ZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgImNvbnRlbnQvdGVzdCIpKQorRVZFTlQo
Y2FucGxheXRocm91Z2gpCitSVU4odmlkZW8ud2Via2l0RW50ZXJGdWxsc2NyZWVuKCkpCitFWFBF
Q1RFRCAodmlkZW8ud2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gPT0gJ3RydWUnKSBPSworRU5E
IE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvd2Via2l0LWRpc3BsYXlp
bmctZnVsbHNjcmVlbi10aW1pbmcuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3dlYmtpdC1kaXNw
bGF5aW5nLWZ1bGxzY3JlZW4tdGltaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGJmOWFjMDQ0MjVmNTQ5
Mzk0NDhiZDllZDkwZDM4MDQ2MWE0YTkwMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L21lZGlhL3dlYmtpdC1kaXNwbGF5aW5nLWZ1bGxzY3JlZW4tdGltaW5nLmh0bWwKQEAgLTAsMCAr
MSwyNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQgc3Jj
PSJ2aWRlby10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0ibWVkaWEtZmlsZS5q
cyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu
ZXIoJ2xvYWQnLCBhc3luYyBldmVudCA9PiB7CisKKyAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1l
bnQoKTsKKyAgICAgICAgICAgIHJ1bigndmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8i
LCAiY29udGVudC90ZXN0IiknKTsKKyAgICAgICAgICAgIGF3YWl0IHdhaXRGb3IodmlkZW8sICdj
YW5wbGF5dGhyb3VnaCcpOworCisgICAgICAgICAgICBzZXRUaW1lb3V0KCAoKSA9PiB7CisgICAg
ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby53ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVl
biIsIHRydWUpOworICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgIH0sIDIw
MCk7CisKKyAgICAgICAgICAgIHJ1bldpdGhLZXlEb3duKCJ2aWRlby53ZWJraXRFbnRlckZ1bGxz
Y3JlZW4oKSIpOworICAgICAgICB9KTsKKworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+
CisgICAgPGRpdj5UZXN0IHRoYXQgIndlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuIiByZXR1cm5z
IHRydWUgc2hvcnRseSBhZnRlciByZXF1ZXN0aW5nIGZ1bGxzY3JlZW4uPC9kaXY+CisgICAgPHZp
ZGVvIGNvbnRyb2xzPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>406255</attachid>
            <date>2020-08-08 10:27:29 -0700</date>
            <delta_ts>2020-08-09 19:03:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215240-20200808102729.patch</filename>
            <type>text/plain</type>
            <size>3980</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2ZTI3MGM2NTgwYjlh
NjI4MDAzZjFhMjZlMDkwZDUyOGZjODIwZi4uMGQ2MTJmZjliNWUxMDg4ZDMyMzI1N2I3M2M2ZWQ5
YzA3NjQ2ZGM4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA4LTA4ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIHIyNjI0NTYgYnJv
a2Ugc2l0ZXMgdGhhdCBleHBlY3Qgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gdG8gYmUgdHJ1
ZSBhbG1vc3QgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxNTI0MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYyODQwNDI+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgcXVp
cmsgZm9yIHNpdGVzIHRoYXQgdXNlIHRoZSBBa2FtYWkgTWVkaWEgUGxheWVyLCB3aGljaCBiZWdp
bnMgcG9sbGluZworICAgICAgICBgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW5gIGV2ZXJ5IDEw
MG1zIGltbWVkaWF0ZWx5IGFmdGVyIGVudGVyaW5nIHZpZGVvIGZ1bGxzY3JlZW4KKyAgICAgICAg
bW9kZSBhbmQgZXhpdHMgZnVsbHNjcmVlbiBhcyBzb29uIGFzIGl0IHJldHVybnMgZmFsc2UuIHIy
NjI0NTYgY2hhbmdlZCB0aGUgSFRNTE1lZGlhUGxheWVyCisgICAgICAgIHN0YXRlIG1hY2hpbmUg
c28gYHdlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuYCBkb2Vzbid0IHJldHVybiBgdHJ1ZWAgdW50
aWwgdGhlIGZ1bGxzY3JlZW4KKyAgICAgICAgd2luZG93IGhhcyBiZWVuIG9wZW5lZCBpbiB0aGUg
VUkgcHJvY2Vzcy4gVGhpcyB3YXMgZG9uZSB0byBmaXggYnVncyB0cmlnZ2VyZWQgYnkKKyAgICAg
ICAgcmFwaWRseSBlbnRlcmluZyBhbmQgZXhpdGluZyBmdWxsc2NyZWVuIGFuZCBQaVAgYW5kIG1h
a2Ugb3VyIG93biBmdWxsc2NyZWVuL1BpUCB0ZXN0cworICAgICAgICBsZXNzIGZsYWtleSwgc28g
aW5zdGVhZCBvZiByZXZlcnRpbmcgdGhlIGNoYW5nZSB1bml2ZXJzYWxseSBkbyBpdCBhcyBhIHF1
aXJrIGZvciBzaXRlcworICAgICAgICB1c2luZyB0aGUgQWthbWFpIE1lZGlhIFBsYXllci4KKwor
ICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI
VE1MVmlkZW9FbGVtZW50Ojp3ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbik6CisgICAgICAgICog
cGFnZS9RdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtzOjpuZWVkc0FrYW1haU1l
ZGlhUGxheWVyUXVpcmsgY29uc3QpOgorICAgICAgICAqIHBhZ2UvUXVpcmtzLmg6CisKIDIwMjAt
MDgtMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT
SU9OIChyMjY1MjY2KSBEdW1wUmVuZGVyVHJlZSBjcmFzaCBhdCBXZWJLaXRBdWRpb0xpc3RlbmVy
Ojpkb3BwbGVyRmFjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRl
b0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcApp
bmRleCAzZWY4NzgyZjVmZDc0Yzg4YjlkNzAxYmExZGZiMGRhYWViMDQ5MDM5Li5jNzYyYzE2MmQ5
NzA5YjMxMWZlYTAzNDI5MjkzYjFlNzFmNTc4YWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN
TFZpZGVvRWxlbWVudC5jcHAKQEAgLTM1Miw2ICszNTIsOSBAQCBib29sIEhUTUxWaWRlb0VsZW1l
bnQ6OndlYmtpdFN1cHBvcnRzRnVsbHNjcmVlbigpCiAKIGJvb2wgSFRNTFZpZGVvRWxlbWVudDo6
d2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4oKQogeworICAgIGlmIChkb2N1bWVudCgpLnF1aXJr
cygpLm5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWlyaygqdGhpcykpCisgICAgICAgIHJldHVybiBp
c0Z1bGxzY3JlZW4oKSB8fCBtX2lzQ2hhbmdpbmdQcmVzZW50YXRpb25Nb2RlOworCiAgICAgLy8g
VGhpcyBmdW5jdGlvbiBzdGFydHMgdG8gcmV0dXJuIHRydWUgYWZ0ZXIgdGhlIHZpZGVvIGVsZW1l
bnQgaGFzIGVudGVyZWQKICAgICAvLyBmdWxsc2NyZWVuL3BpY3R1cmUtaW4tcGljdHVyZSB1bnRp
bCBpdCBoYXMgZXhpdGVkIGZ1bGxzY3JlZW4vcGljdHVyZS1pbi1waWN0dXJlCiAgICAgcmV0dXJu
IChpc0Z1bGxzY3JlZW4oKSAmJiAhd2FpdGluZ1RvRW50ZXJGdWxsc2NyZWVuKCkpIHx8ICghaXNG
dWxsc2NyZWVuKCkgJiYgbV9pc0NoYW5naW5nUHJlc2VudGF0aW9uTW9kZSk7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1
aXJrcy5jcHAKaW5kZXggYzM3MjE5NjgyNDNkMTU3ODI2MGVhYzhlMjNiYmRjYWE1MzViOGE2OS4u
NTBkZTRhOWFiNDJjYTA5ZDA4NWM2N2ZiNGIxNzA0YjNiZTFhNjIxNSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVp
cmtzLmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIkhUTUxEaXZFbGVtZW50LmgiCiAj
aW5jbHVkZSAiSFRNTE1ldGFFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE9iamVjdEVsZW1lbnQu
aCIKKyNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50LmgiCiAjaW5jbHVkZSAiSlNFdmVudExpc3Rl
bmVyLmgiCiAjaW5jbHVkZSAiTGF5b3V0VW5pdC5oIgogI2luY2x1ZGUgIk5hbWVkTm9kZU1hcC5o
IgpAQCAtOTgzLDUgKzk4NCwyNCBAQCBib29sIFF1aXJrczo6bmVlZHNIRFJQaXhlbERlcHRoUXVp
cmsoKSBjb25zdAogICAgIHJldHVybiAqbV9uZWVkc0hEUlBpeGVsRGVwdGhRdWlyazsKIH0KIAor
Ym9vbCBRdWlya3M6Om5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWlyayhjb25zdCBIVE1MRWxlbWVu
dCYgZWxlbWVudCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIGlmICgh
bmVlZHNRdWlya3MoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFpczxIVE1M
VmlkZW9FbGVtZW50PihlbGVtZW50KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYg
KCFlbGVtZW50Lmhhc0NsYXNzKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGF1dG8m
IGNsYXNzTmFtZXMgPSBlbGVtZW50LmNsYXNzTmFtZXMoKTsKKyAgICByZXR1cm4gY2xhc3NOYW1l
cy5jb250YWlucygiYWthbWFpLWh0bWw1IikgJiYgY2xhc3NOYW1lcy5jb250YWlucygiYWthbWFp
LW1lZGlhLWVsZW1lbnQiKTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKGVsZW1lbnQpOworICAg
IHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL1F1aXJrcy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaAppbmRleCA0YmNj
MjBkNWQxYjdkMmE4ZTBlOTAyYzYwYjVkNGMyZTRkMzQ3ZmJkLi4yOWY4YWU2NGQ2MzhkOTBhNzZm
ZTAwNjdhNDI1MzY5OWJhMjdiNzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1
aXJrcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKQEAgLTExMCw2ICsxMTAs
OCBAQCBwdWJsaWM6CiAKICAgICBib29sIG5lZWRzVlA5RnVsbFJhbmdlRmxhZ1F1aXJrKCkgY29u
c3Q7CiAgICAgYm9vbCBuZWVkc0hEUlBpeGVsRGVwdGhRdWlyaygpIGNvbnN0OworICAgIAorICAg
IGJvb2wgbmVlZHNBa2FtYWlNZWRpYVBsYXllclF1aXJrKGNvbnN0IEhUTUxFbGVtZW50JikgY29u
c3Q7CiAKIHByaXZhdGU6CiAgICAgYm9vbCBuZWVkc1F1aXJrcygpIGNvbnN0Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>406278</attachid>
            <date>2020-08-09 19:03:51 -0700</date>
            <delta_ts>2020-08-10 09:37:21 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-215240-20200809190351.patch</filename>
            <type>text/plain</type>
            <size>4637</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2ZTI3MGM2NTgwYjlh
NjI4MDAzZjFhMjZlMDkwZDUyOGZjODIwZi4uOGZiOWIxOWRkMGE2YjIzZjU4ZTNhNGQxZDg4NzFj
MTg3YTk4ZDc3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA4LTA4ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIHIyNjI0NTYgYnJv
a2Ugc2l0ZXMgdGhhdCBleHBlY3Qgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gdG8gYmUgdHJ1
ZSBhbG1vc3QgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxNTI0MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYyODQwNDI+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWRkIGEgcXVpcmsg
Zm9yIHNpdGVzIHRoYXQgdXNlIHRoZSBBa2FtYWkgTWVkaWEgUGxheWVyLCB3aGljaCBiZWdpbnMg
cG9sbGluZworICAgICAgICBgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW5gIGV2ZXJ5IDEwMG1z
IGltbWVkaWF0ZWx5IGFmdGVyIGVudGVyaW5nIHZpZGVvIGZ1bGxzY3JlZW4KKyAgICAgICAgbW9k
ZSBhbmQgZXhpdHMgZnVsbHNjcmVlbiBhcyBzb29uIGFzIGl0IHJldHVybnMgZmFsc2UuIHIyNjI0
NTYgY2hhbmdlZCB0aGUgSFRNTE1lZGlhUGxheWVyCisgICAgICAgIHN0YXRlIG1hY2hpbmUgc28g
YHdlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuYCBkb2Vzbid0IHJldHVybiBgdHJ1ZWAgdW50aWwg
dGhlIGZ1bGxzY3JlZW4KKyAgICAgICAgd2luZG93IGhhcyBiZWVuIG9wZW5lZCBpbiB0aGUgVUkg
cHJvY2Vzcy4gVGhpcyB3YXMgZG9uZSB0byBmaXggYnVncyB0cmlnZ2VyZWQgYnkKKyAgICAgICAg
cmFwaWRseSBlbnRlcmluZyBhbmQgZXhpdGluZyBmdWxsc2NyZWVuIGFuZCBQaVAgYW5kIG1ha2Ug
b3VyIG93biBmdWxsc2NyZWVuL1BpUCB0ZXN0cworICAgICAgICBsZXNzIGZsYWtleSwgc28gaW5z
dGVhZCBvZiByZXZlcnRpbmcgdGhlIGNoYW5nZSB1bml2ZXJzYWxseSBkbyBpdCBhcyBhIHF1aXJr
IGZvciBzaXRlcworICAgICAgICB1c2luZyB0aGUgQWthbWFpIE1lZGlhIFBsYXllci4KKworICAg
ICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M
VmlkZW9FbGVtZW50Ojp3ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbik6CisgICAgICAgICogcGFn
ZS9RdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtzOjpuZWVkc0FrYW1haU1lZGlh
UGxheWVyUXVpcmsgY29uc3QpOgorICAgICAgICAqIHBhZ2UvUXVpcmtzLmg6CisKIDIwMjAtMDgt
MDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O
IChyMjY1MjY2KSBEdW1wUmVuZGVyVHJlZSBjcmFzaCBhdCBXZWJLaXRBdWRpb0xpc3RlbmVyOjpk
b3BwbGVyRmFjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0Vs
ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcAppbmRl
eCAzZWY4NzgyZjVmZDc0Yzg4YjlkNzAxYmExZGZiMGRhYWViMDQ5MDM5Li5jNzYyYzE2MmQ5NzA5
YjMxMWZlYTAzNDI5MjkzYjFlNzFmNTc4YWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o
dG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZp
ZGVvRWxlbWVudC5jcHAKQEAgLTM1Miw2ICszNTIsOSBAQCBib29sIEhUTUxWaWRlb0VsZW1lbnQ6
OndlYmtpdFN1cHBvcnRzRnVsbHNjcmVlbigpCiAKIGJvb2wgSFRNTFZpZGVvRWxlbWVudDo6d2Vi
a2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4oKQogeworICAgIGlmIChkb2N1bWVudCgpLnF1aXJrcygp
Lm5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWlyaygqdGhpcykpCisgICAgICAgIHJldHVybiBpc0Z1
bGxzY3JlZW4oKSB8fCBtX2lzQ2hhbmdpbmdQcmVzZW50YXRpb25Nb2RlOworCiAgICAgLy8gVGhp
cyBmdW5jdGlvbiBzdGFydHMgdG8gcmV0dXJuIHRydWUgYWZ0ZXIgdGhlIHZpZGVvIGVsZW1lbnQg
aGFzIGVudGVyZWQKICAgICAvLyBmdWxsc2NyZWVuL3BpY3R1cmUtaW4tcGljdHVyZSB1bnRpbCBp
dCBoYXMgZXhpdGVkIGZ1bGxzY3JlZW4vcGljdHVyZS1pbi1waWN0dXJlCiAgICAgcmV0dXJuIChp
c0Z1bGxzY3JlZW4oKSAmJiAhd2FpdGluZ1RvRW50ZXJGdWxsc2NyZWVuKCkpIHx8ICghaXNGdWxs
c2NyZWVuKCkgJiYgbV9pc0NoYW5naW5nUHJlc2VudGF0aW9uTW9kZSk7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJr
cy5jcHAKaW5kZXggYzM3MjE5NjgyNDNkMTU3ODI2MGVhYzhlMjNiYmRjYWE1MzViOGE2OS4uYzgz
ZWM5Y2E1NzRiNmNmOTQzODU2OTFjMmFjMmYyNzZhNWU5MjcwMSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtz
LmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIkhUTUxEaXZFbGVtZW50LmgiCiAjaW5j
bHVkZSAiSFRNTE1ldGFFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE9iamVjdEVsZW1lbnQuaCIK
KyNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50LmgiCiAjaW5jbHVkZSAiSlNFdmVudExpc3RlbmVy
LmgiCiAjaW5jbHVkZSAiTGF5b3V0VW5pdC5oIgogI2luY2x1ZGUgIk5hbWVkTm9kZU1hcC5oIgpA
QCAtOTgzLDUgKzk4NCwzMCBAQCBib29sIFF1aXJrczo6bmVlZHNIRFJQaXhlbERlcHRoUXVpcmso
KSBjb25zdAogICAgIHJldHVybiAqbV9uZWVkc0hEUlBpeGVsRGVwdGhRdWlyazsKIH0KIAorLy8g
RklYTUU6IHJlbW92ZSB0aGlzIG9uY2UgcmRhcjovLzY2NzM5NDUwIGhhcyBiZWVuIGZpeGVkLgor
Ym9vbCBRdWlya3M6Om5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWlyayhjb25zdCBIVE1MVmlkZW9F
bGVtZW50JiBlbGVtZW50KSBjb25zdAoreworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAg
Ly8gQWthbWFpIE1lZGlhIFBsYXllciBiZWdpbnMgcG9sbGluZyBgd2Via2l0RGlzcGxheWluZ0Z1
bGxzY3JlZW5gIGV2ZXJ5IDEwMG1zIGltbWVkaWF0ZWx5IGFmdGVyIGNhbGxpbmcKKyAgICAvLyBg
d2Via2l0RW50ZXJGdWxsc2NyZWVuYCBhbmQgZXhpdHMgZnVsbHNjcmVlbiBhcyBzb29uIGFzIGl0
IHJldHVybnMgZmFsc2UuIHIyNjI0NTYgY2hhbmdlZCB0aGUgSFRNTE1lZGlhUGxheWVyIHN0YXRl
CisgICAgLy8gbWFjaGluZSBzbyBgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW5gIGRvZXNuJ3Qg
cmV0dXJuIHRydWUgdW50aWwgdGhlIGZ1bGxzY3JlZW4gd2luZG93IGhhcyBiZWVuIG9wZW5lZCBp
biB0aGUKKyAgICAvLyBVSSBwcm9jZXNzLCB3aGljaCBjYXVzZXMgQWthbWFpIE1lZGlhIFBsYXll
ciB0byBmcmVxdWVudGx5IGV4aXQgZnVsbHNjcmVlbiBtb2RlIGltbWVkaWF0ZWx5LgorCisgICAg
c3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gYWthbWFpSFRNTDUoTUFLRV9TVEFU
SUNfU1RSSU5HX0lNUEwoImFrYW1haS1odG1sNSIpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95
ZWQ8Y29uc3QgU3RyaW5nPiBha2FtYWlNZWRpYUVsZW1lbnQoTUFLRV9TVEFUSUNfU1RSSU5HX0lN
UEwoImFrYW1haS1tZWRpYS1lbGVtZW50IikpOworCisgICAgaWYgKCFuZWVkc1F1aXJrcygpKQor
ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWVsZW1lbnQuaGFzQ2xhc3MoKSkKKyAg
ICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgYXV0byYgY2xhc3NOYW1lcyA9IGVsZW1lbnQuY2xh
c3NOYW1lcygpOworICAgIHJldHVybiBjbGFzc05hbWVzLmNvbnRhaW5zKGFrYW1haUhUTUw1KSAm
JiBjbGFzc05hbWVzLmNvbnRhaW5zKGFrYW1haU1lZGlhRWxlbWVudCk7CisjZWxzZQorICAgIFVO
VVNFRF9QQVJBTShlbGVtZW50KTsKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KIAogfQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaCBiL1NvdXJjZS9XZWJDb3Jl
L3BhZ2UvUXVpcmtzLmgKaW5kZXggNGJjYzIwZDVkMWI3ZDJhOGUwZTkwMmM2MGI1ZDRjMmU0ZDM0
N2ZiZC4uYWQyOTUzNDk4NDY5MjBkMjU4M2JkY2ZmMzkzZGMyYjYzZjM4NTY1MCAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl
L1F1aXJrcy5oCkBAIC0xMTAsNiArMTEwLDggQEAgcHVibGljOgogCiAgICAgYm9vbCBuZWVkc1ZQ
OUZ1bGxSYW5nZUZsYWdRdWlyaygpIGNvbnN0OwogICAgIGJvb2wgbmVlZHNIRFJQaXhlbERlcHRo
UXVpcmsoKSBjb25zdDsKKyAgICAKKyAgICBib29sIG5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWly
ayhjb25zdCBIVE1MVmlkZW9FbGVtZW50JikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgYm9vbCBu
ZWVkc1F1aXJrcygpIGNvbnN0Owo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>406301</attachid>
            <date>2020-08-10 09:37:23 -0700</date>
            <delta_ts>2020-08-10 10:49:06 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-215240-20200810093722.patch</filename>
            <type>text/plain</type>
            <size>4645</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2ZTI3MGM2NTgwYjlh
NjI4MDAzZjFhMjZlMDkwZDUyOGZjODIwZi4uOGZiOWIxOWRkMGE2YjIzZjU4ZTNhNGQxZDg4NzFj
MTg3YTk4ZDc3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA4LTA4ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIHIyNjI0NTYgYnJv
a2Ugc2l0ZXMgdGhhdCBleHBlY3Qgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gdG8gYmUgdHJ1
ZSBhbG1vc3QgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTIxNTI0MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYyODQwNDI+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWRkIGEgcXVpcmsg
Zm9yIHNpdGVzIHRoYXQgdXNlIHRoZSBBa2FtYWkgTWVkaWEgUGxheWVyLCB3aGljaCBiZWdpbnMg
cG9sbGluZworICAgICAgICBgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW5gIGV2ZXJ5IDEwMG1z
IGltbWVkaWF0ZWx5IGFmdGVyIGVudGVyaW5nIHZpZGVvIGZ1bGxzY3JlZW4KKyAgICAgICAgbW9k
ZSBhbmQgZXhpdHMgZnVsbHNjcmVlbiBhcyBzb29uIGFzIGl0IHJldHVybnMgZmFsc2UuIHIyNjI0
NTYgY2hhbmdlZCB0aGUgSFRNTE1lZGlhUGxheWVyCisgICAgICAgIHN0YXRlIG1hY2hpbmUgc28g
YHdlYmtpdERpc3BsYXlpbmdGdWxsc2NyZWVuYCBkb2Vzbid0IHJldHVybiBgdHJ1ZWAgdW50aWwg
dGhlIGZ1bGxzY3JlZW4KKyAgICAgICAgd2luZG93IGhhcyBiZWVuIG9wZW5lZCBpbiB0aGUgVUkg
cHJvY2Vzcy4gVGhpcyB3YXMgZG9uZSB0byBmaXggYnVncyB0cmlnZ2VyZWQgYnkKKyAgICAgICAg
cmFwaWRseSBlbnRlcmluZyBhbmQgZXhpdGluZyBmdWxsc2NyZWVuIGFuZCBQaVAgYW5kIG1ha2Ug
b3VyIG93biBmdWxsc2NyZWVuL1BpUCB0ZXN0cworICAgICAgICBsZXNzIGZsYWtleSwgc28gaW5z
dGVhZCBvZiByZXZlcnRpbmcgdGhlIGNoYW5nZSB1bml2ZXJzYWxseSBkbyBpdCBhcyBhIHF1aXJr
IGZvciBzaXRlcworICAgICAgICB1c2luZyB0aGUgQWthbWFpIE1lZGlhIFBsYXllci4KKworICAg
ICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M
VmlkZW9FbGVtZW50Ojp3ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbik6CisgICAgICAgICogcGFn
ZS9RdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtzOjpuZWVkc0FrYW1haU1lZGlh
UGxheWVyUXVpcmsgY29uc3QpOgorICAgICAgICAqIHBhZ2UvUXVpcmtzLmg6CisKIDIwMjAtMDgt
MDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O
IChyMjY1MjY2KSBEdW1wUmVuZGVyVHJlZSBjcmFzaCBhdCBXZWJLaXRBdWRpb0xpc3RlbmVyOjpk
b3BwbGVyRmFjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0Vs
ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcAppbmRl
eCAzZWY4NzgyZjVmZDc0Yzg4YjlkNzAxYmExZGZiMGRhYWViMDQ5MDM5Li5jNzYyYzE2MmQ5NzA5
YjMxMWZlYTAzNDI5MjkzYjFlNzFmNTc4YWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o
dG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZp
ZGVvRWxlbWVudC5jcHAKQEAgLTM1Miw2ICszNTIsOSBAQCBib29sIEhUTUxWaWRlb0VsZW1lbnQ6
OndlYmtpdFN1cHBvcnRzRnVsbHNjcmVlbigpCiAKIGJvb2wgSFRNTFZpZGVvRWxlbWVudDo6d2Vi
a2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4oKQogeworICAgIGlmIChkb2N1bWVudCgpLnF1aXJrcygp
Lm5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWlyaygqdGhpcykpCisgICAgICAgIHJldHVybiBpc0Z1
bGxzY3JlZW4oKSB8fCBtX2lzQ2hhbmdpbmdQcmVzZW50YXRpb25Nb2RlOworCiAgICAgLy8gVGhp
cyBmdW5jdGlvbiBzdGFydHMgdG8gcmV0dXJuIHRydWUgYWZ0ZXIgdGhlIHZpZGVvIGVsZW1lbnQg
aGFzIGVudGVyZWQKICAgICAvLyBmdWxsc2NyZWVuL3BpY3R1cmUtaW4tcGljdHVyZSB1bnRpbCBp
dCBoYXMgZXhpdGVkIGZ1bGxzY3JlZW4vcGljdHVyZS1pbi1waWN0dXJlCiAgICAgcmV0dXJuIChp
c0Z1bGxzY3JlZW4oKSAmJiAhd2FpdGluZ1RvRW50ZXJGdWxsc2NyZWVuKCkpIHx8ICghaXNGdWxs
c2NyZWVuKCkgJiYgbV9pc0NoYW5naW5nUHJlc2VudGF0aW9uTW9kZSk7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJr
cy5jcHAKaW5kZXggYzM3MjE5NjgyNDNkMTU3ODI2MGVhYzhlMjNiYmRjYWE1MzViOGE2OS4uY2Y2
YTk5ODc5NTM1NDUwNWFjNDkwNTYxYzcxZGE1NDczZjE3MzNhMCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtz
LmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIkhUTUxEaXZFbGVtZW50LmgiCiAjaW5j
bHVkZSAiSFRNTE1ldGFFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE9iamVjdEVsZW1lbnQuaCIK
KyNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50LmgiCiAjaW5jbHVkZSAiSlNFdmVudExpc3RlbmVy
LmgiCiAjaW5jbHVkZSAiTGF5b3V0VW5pdC5oIgogI2luY2x1ZGUgIk5hbWVkTm9kZU1hcC5oIgpA
QCAtOTgzLDUgKzk4NCwzMCBAQCBib29sIFF1aXJrczo6bmVlZHNIRFJQaXhlbERlcHRoUXVpcmso
KSBjb25zdAogICAgIHJldHVybiAqbV9uZWVkc0hEUlBpeGVsRGVwdGhRdWlyazsKIH0KIAorLy8g
RklYTUU6IHJlbW92ZSB0aGlzIG9uY2UgcmRhcjovLzY2NzM5NDUwIGhhcyBiZWVuIGZpeGVkLgor
Ym9vbCBRdWlya3M6Om5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWlyayhjb25zdCBIVE1MVmlkZW9F
bGVtZW50JiBlbGVtZW50KSBjb25zdAoreworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAg
Ly8gQWthbWFpIE1lZGlhIFBsYXllciBiZWdpbnMgcG9sbGluZyBgd2Via2l0RGlzcGxheWluZ0Z1
bGxzY3JlZW5gIGV2ZXJ5IDEwMG1zIGltbWVkaWF0ZWx5IGFmdGVyIGNhbGxpbmcKKyAgICAvLyBg
d2Via2l0RW50ZXJGdWxsc2NyZWVuYCBhbmQgZXhpdHMgZnVsbHNjcmVlbiBhcyBzb29uIGFzIGl0
IHJldHVybnMgZmFsc2UuIHIyNjI0NTYgY2hhbmdlZCB0aGUgSFRNTE1lZGlhUGxheWVyIHN0YXRl
CisgICAgLy8gbWFjaGluZSBzbyBgd2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW5gIGRvZXNuJ3Qg
cmV0dXJuIHRydWUgdW50aWwgdGhlIGZ1bGxzY3JlZW4gd2luZG93IGhhcyBiZWVuIG9wZW5lZCBp
biB0aGUKKyAgICAvLyBVSSBwcm9jZXNzLCB3aGljaCBjYXVzZXMgQWthbWFpIE1lZGlhIFBsYXll
ciB0byBmcmVxdWVudGx5IGV4aXQgZnVsbHNjcmVlbiBtb2RlIGltbWVkaWF0ZWx5LgorCisgICAg
c3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IGFrYW1haUhUTUw1KE1BS0Vf
U1RBVElDX1NUUklOR19JTVBMKCJha2FtYWktaHRtbDUiKSk7CisgICAgc3RhdGljIE5ldmVyRGVz
dHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IGFrYW1haU1lZGlhRWxlbWVudChNQUtFX1NUQVRJQ19T
VFJJTkdfSU1QTCgiYWthbWFpLW1lZGlhLWVsZW1lbnQiKSk7CisKKyAgICBpZiAoIW5lZWRzUXVp
cmtzKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghZWxlbWVudC5oYXNDbGFz
cygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBhdXRvJiBjbGFzc05hbWVzID0gZWxl
bWVudC5jbGFzc05hbWVzKCk7CisgICAgcmV0dXJuIGNsYXNzTmFtZXMuY29udGFpbnMoYWthbWFp
SFRNTDUpICYmIGNsYXNzTmFtZXMuY29udGFpbnMoYWthbWFpTWVkaWFFbGVtZW50KTsKKyNlbHNl
CisgICAgVU5VU0VEX1BBUkFNKGVsZW1lbnQpOworICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgor
fQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oIGIvU291cmNl
L1dlYkNvcmUvcGFnZS9RdWlya3MuaAppbmRleCA0YmNjMjBkNWQxYjdkMmE4ZTBlOTAyYzYwYjVk
NGMyZTRkMzQ3ZmJkLi5hZDI5NTM0OTg0NjkyMGQyNTgzYmRjZmYzOTNkYzJiNjNmMzg1NjUwIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BhZ2UvUXVpcmtzLmgKQEAgLTExMCw2ICsxMTAsOCBAQCBwdWJsaWM6CiAKICAgICBib29s
IG5lZWRzVlA5RnVsbFJhbmdlRmxhZ1F1aXJrKCkgY29uc3Q7CiAgICAgYm9vbCBuZWVkc0hEUlBp
eGVsRGVwdGhRdWlyaygpIGNvbnN0OworICAgIAorICAgIGJvb2wgbmVlZHNBa2FtYWlNZWRpYVBs
YXllclF1aXJrKGNvbnN0IEhUTUxWaWRlb0VsZW1lbnQmKSBjb25zdDsKIAogcHJpdmF0ZToKICAg
ICBib29sIG5lZWRzUXVpcmtzKCkgY29uc3Q7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>412131</attachid>
            <date>2020-10-22 14:28:57 -0700</date>
            <delta_ts>2020-10-22 14:44:04 -0700</delta_ts>
            <desc>A follow-up patch</desc>
            <filename>bug-215240-20201022142856.patch</filename>
            <type>text/plain</type>
            <size>2194</size>
            <attacher name="Peng Liu">peng.liu6</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4ODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdlMTEyMWU1ZjI3NGEw
Yzc5M2Y2MDUyZGJhZGI2NTMyZTYzNDRkOC4uNWYwYzFjNjIyMTk2N2I4ZTdlNmZmNDI4Nzk0ZTdh
ZmM1ZGIyMDRjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEwLTIyICBQZW5n
IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgcjI2MjQ1NiBicm9rZSBzaXRl
cyB0aGF0IGV4cGVjdCB3ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbiB0byBiZSB0cnVlIGFsbW9z
dCBpbW1lZGlhdGVseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjE1MjQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgQSBmb2xsb3ctdXAgcGF0Y2ggb2YgcjI2NTQzNyB0byBlbmFibGUgdGhlIHF1aXJrIHdo
ZW4gdGhlIGNsYXNzIG5hbWVzIGNvbnRhaW4KKyAgICAgICAgYGFtcC1odG1sNWAgYW5kIGBhbXAt
bWVkaWEtZWxlbWVudGAuCisKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpRdWlya3M6Om5lZWRzQWthbWFpTWVkaWFQbGF5ZXJRdWlyayBjb25zdCk6CisKIDIw
MjAtMTAtMjIgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAgICAgICAg
IFtpT1NdIFByZXZlbnQgcHJlc2VudGF0aW9uIG9mIGlucHV0IHBlcmlwaGVyYWxzIHdoZW4gZm9j
dXNpbmcgZm9ybSBjb250cm9scyB3aXRoIGEgdmFsaWRhdGlvbiBtZXNzYWdlCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1
aXJrcy5jcHAKaW5kZXggNzEzMTExYzFlYmQwMzhmMGMyZGNkMzczY2VkMGJhNTNkNWRhMmM0MS4u
MjllZWI5ZWFjNDZmYjE3MjExNjJlODQzNmJhODIyMzY4ZDU2MjdmMiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVp
cmtzLmNwcApAQCAtMTA1Niw2ICsxMDU2LDggQEAgYm9vbCBRdWlya3M6Om5lZWRzQWthbWFpTWVk
aWFQbGF5ZXJRdWlyayhjb25zdCBIVE1MVmlkZW9FbGVtZW50JiBlbGVtZW50KSBjb25zdAogCiAg
ICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IGFrYW1haUhUTUw1KE1B
S0VfU1RBVElDX1NUUklOR19JTVBMKCJha2FtYWktaHRtbDUiKSk7CiAgICAgc3RhdGljIE5ldmVy
RGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IGFrYW1haU1lZGlhRWxlbWVudChNQUtFX1NUQVRJ
Q19TVFJJTkdfSU1QTCgiYWthbWFpLW1lZGlhLWVsZW1lbnQiKSk7CisgICAgc3RhdGljIE5ldmVy
RGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IGFtcEhUTUw1KE1BS0VfU1RBVElDX1NUUklOR19J
TVBMKCJhbXAtaHRtbDUiKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21T
dHJpbmc+IGFtcE1lZGlhRWxlbWVudChNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgiYW1wLW1lZGlh
LWVsZW1lbnQiKSk7CiAKICAgICBpZiAoIW5lZWRzUXVpcmtzKCkpCiAgICAgICAgIHJldHVybiBm
YWxzZTsKQEAgLTEwNjQsNyArMTA2Niw3IEBAIGJvb2wgUXVpcmtzOjpuZWVkc0FrYW1haU1lZGlh
UGxheWVyUXVpcmsoY29uc3QgSFRNTFZpZGVvRWxlbWVudCYgZWxlbWVudCkgY29uc3QKICAgICAg
ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYXV0byYgY2xhc3NOYW1lcyA9IGVsZW1lbnQuY2xhc3NO
YW1lcygpOwotICAgIHJldHVybiBjbGFzc05hbWVzLmNvbnRhaW5zKGFrYW1haUhUTUw1KSAmJiBj
bGFzc05hbWVzLmNvbnRhaW5zKGFrYW1haU1lZGlhRWxlbWVudCk7CisgICAgcmV0dXJuIGNsYXNz
TmFtZXMuY29udGFpbnMoYWthbWFpSFRNTDUpICYmIGNsYXNzTmFtZXMuY29udGFpbnMoYWthbWFp
TWVkaWFFbGVtZW50KSB8fCBjbGFzc05hbWVzLmNvbnRhaW5zKGFtcEhUTUw1KSAmJiBjbGFzc05h
bWVzLmNvbnRhaW5zKGFtcE1lZGlhRWxlbWVudCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShl
bGVtZW50KTsKICAgICByZXR1cm4gZmFsc2U7Cg==
</data>
<flag name="commit-queue"
          id="428518"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>