<?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>229745</bug_id>
          
          <creation_ts>2021-08-31 16:04:17 -0700</creation_ts>
          <short_desc>[COOP] Cross origin isolation doesn&apos;t happen when going from an HTTP URL to a HTTPS one with COOP+COEP</short_desc>
          <delta_ts>2021-09-07 12:51:40 -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>WebKit2</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=230017</see_also>
          <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>228755</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>crzwdjk</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>ggaren</cc>
    
    <cc>japhet</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1789139</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-08-31 16:04:17 -0700</bug_when>
    <thetext>Cross origin isolation doesn&apos;t happen when going from an HTTP URL to a HTTPS one with COOP+COEP.

The COOP header is ignored for non-secure contexts. However, our check is slightly wrong and we always check if the source of the navigation is a secure context or not.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789337</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-09-01 09:02:17 -0700</bug_when>
    <thetext>&lt;rdar://problem/82630927&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789432</commentid>
    <comment_count>2</comment_count>
      <attachid>437058</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-09-01 12:59:01 -0700</bug_when>
    <thetext>Created attachment 437058
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789771</commentid>
    <comment_count>3</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-09-02 10:25:42 -0700</bug_when>
    <thetext>Committed r281935 (241244@main): &lt;https://commits.webkit.org/241244@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 437058.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1791165</commentid>
    <comment_count>4</comment_count>
    <who name="Arcady Goldmints-Orlov">crzwdjk</who>
    <bug_when>2021-09-07 12:48:18 -0700</bug_when>
    <thetext>The test added in this change is flaky on GTK, sometimes passing and sometimes failing like this:

--- /home/buildbot/worker/gtk-linux-64-release-skip-failing-tests/build/layout-test-results/http/wpt/cross-origin-opener-policy/non-secure-to-secure-context-navigation.https-expected.txt
+++ /home/buildbot/worker/gtk-linux-64-release-skip-failing-tests/build/layout-test-results/http/wpt/cross-origin-opener-policy/non-secure-to-secure-context-navigation.https-actual.txt
@@ -1,3 +1,3 @@
 
-PASS Make sure that COOP causes a browsing context group switch when navigating from a secure context to a non-secure one
+FAIL Make sure that COOP causes a browsing context group switch when navigating from a secure context to a non-secure one assert_true: Window should be closed expected true got false</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437058</attachid>
            <date>2021-09-01 12:59:01 -0700</date>
            <delta_ts>2021-09-02 10:25:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229745-20210901125900.patch</filename>
            <type>text/plain</type>
            <size>18809</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQ4MjI5YjI4ZjkwMzBm
MDE5MzhiOGY5YmZlZGJhN2U2M2IxOTY0ZC4uYmQyMDIwNTI4YmYxZTdjODBiYWIwNGM2MDE5YWIy
Mjk0MTllOWJjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA5LTAxICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NPT1BdIENyb3NzIG9yaWdp
biBpc29sYXRpb24gZG9lc24ndCBoYXBwZW4gd2hlbiBnb2luZyBmcm9tIGFuIEhUVFAgVVJMIHRv
IGEgSFRUUFMgb25lIHdpdGggQ09PUCtDT0VQCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk3NDUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgyNjMw
OTI3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdo
ZW4gY2FsbGluZyBvYnRhaW5Dcm9zc09yaWdpbk9wZW5lclBvbGljeSgpIC8gb2J0YWluQ3Jvc3NP
cmlnaW5FbWJlZGRlclBvbGljeSgpIHRvIGdldCB0aGUgQ09PUCAvIENPRVAKKyAgICAgICAgcG9s
aWN5IGZyb20gYSByZXNvdXJjZSByZXNwb25zZSwgd2Ugc2hvdWxkIGNoZWNrIGlmIHRoZSByZXNw
b25zZSdzIFVSTCBpcyBwb3RlbnRpYWxseSB0cnVzdHdvcnR5IHRvCisgICAgICAgIGRldGVybWlu
ZSBpZiBDT09QL0NPRVAgYXBwbHksIGluc3RlYWQgb2YgcmVseWluZyBvbiB0aGUgY3VycmVudCBj
b250ZXh0J3MgaXNTZWN1cmVDb250ZXh0KCkuCisKKyAgICAgICAgV2hlbiBuYXZpZ2F0aW5nIGZy
b20gYSBIVFRQIFVSTCB0byBhIEhUVFBTIG9uZSB3aXRoIENPT1ArQ09FUCwgd2Ugb2J2aW91c2x5
IHdhbnQgY3Jvc3Mtb3JpZ2luIGlzb2xhdGlvbgorICAgICAgICB0byBoYXBwZW4sIGV2ZW4gaWYg
dGhlIHNvdXJjZSBjb250ZXh0IGlzIG5vdCBhIHNlY3VyZSBjb250ZXh0LgorCisgICAgICAgIFRl
c3Q6IGh0dHAvd3B0L2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L25vbi1zZWN1cmUtdG8tc2Vj
dXJlLWNvbnRleHQtbmF2aWdhdGlvbi5odHRwcy5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvQ3Jv
c3NPcmlnaW5FbWJlZGRlclBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvYnRhaW5Dcm9z
c09yaWdpbkVtYmVkZGVyUG9saWN5KToKKyAgICAgICAgKiBsb2FkZXIvQ3Jvc3NPcmlnaW5FbWJl
ZGRlclBvbGljeS5oOgorICAgICAgICAqIGxvYWRlci9Dcm9zc09yaWdpbk9wZW5lclBvbGljeS5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpvYnRhaW5Dcm9zc09yaWdpbk9wZW5lclBvbGljeSk6Cisg
ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l
TG9hZGVyOjpkaWRCZWdpbkRvY3VtZW50KToKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlclNjcmlw
dExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHRMb2FkZXI6OmxvYWRT
eW5jaHJvbm91c2x5KToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclNjcmlwdExvYWRlcjo6bG9h
ZEFzeW5jaHJvbm91c2x5KToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclNjcmlwdExvYWRlcjo6
ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlclNjcmlwdExvYWRl
ci5oOgorCiAyMDIxLTA5LTAxICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+
CiAKICAgICAgICAgSW1hZ2VSZW5kZXJpbmdNb2RlLmggaXMgbm90IHVzZWQKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg
YjhkNTZkMDJjNGZiYzNlYzJlNzBhNDJhOTM0YjE3OWRhMjVlYWU1Mi4uMzNiMWI3NjJkZGE2MDk4
YWQwN2Y4MzA1OWY4ODhiYTczYjVhMmZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu
Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAy
MS0wOS0wMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFtDT09Q
XSBDcm9zcyBvcmlnaW4gaXNvbGF0aW9uIGRvZXNuJ3QgaGFwcGVuIHdoZW4gZ29pbmcgZnJvbSBh
biBIVFRQIFVSTCB0byBhIEhUVFBTIG9uZSB3aXRoIENPT1ArQ09FUAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NzQ1CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS84MjYzMDkyNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6Cisg
ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c2hvdWxkSW50ZXJydXB0TmF2
aWdhdGlvbkZvckNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kpOgorICAgICAgICAoV2ViS2l0OjpO
ZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnNob3VsZEludGVycnVwdFdvcmtlckxvYWRGb3JDcm9zc09y
aWdpbkVtYmVkZGVyUG9saWN5KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29y
a2VyL1NlcnZpY2VXb3JrZXJTb2Z0VXBkYXRlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
U2VydmljZVdvcmtlclNvZnRVcGRhdGVMb2FkZXI6OnByb2Nlc3NSZXNwb25zZSk6CisKIDIwMjEt
MDktMDEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3Vw
cG9ydCBmb3IgU2VydmljZVdvcmtlckdsb2JhbFNjb3BlLnNlcnZpY2VXb3JrZXIKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5LmNwcCBi
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5LmNwcAppbmRl
eCA3YzhkYmU2MDg1MzBjZDBkMzZkOGY5OTc0MWY3OTU1ZDUwZDQwMzA0Li4xOTI5MmFkNjNiNjJi
OTc1MTc1NjkxYjhiODY0ZDRkOWZkOGQ1MDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s
b2FkZXIvQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
bG9hZGVyL0Nyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kuY3BwCkBAIC0zNSw3ICszNSw3IEBACiBu
YW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVs
dGlwYWdlL29yaWdpbi5odG1sI29idGFpbi1hbi1lbWJlZGRlci1wb2xpY3kKLUNyb3NzT3JpZ2lu
RW1iZWRkZXJQb2xpY3kgb2J0YWluQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeShjb25zdCBSZXNv
dXJjZVJlc3BvbnNlJiByZXNwb25zZSwgSXNTZWN1cmVDb250ZXh0IGlzU2VjdXJlQ29udGV4dCkK
K0Nyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kgb2J0YWluQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGlj
eShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3QgU2NyaXB0RXhlY3V0aW9u
Q29udGV4dCogY29udGV4dCkKIHsKICAgICBhdXRvIHBhcnNlQ09FUEhlYWRlciA9IFsmcmVzcG9u
c2VdKEhUVFBIZWFkZXJOYW1lIGhlYWRlck5hbWUsIGF1dG8mIHZhbHVlLCBhdXRvJiByZXBvcnRp
bmdFbmRwb2ludCkgewogICAgICAgICBhdXRvIGNvZXBQYXJzaW5nUmVzdWx0ID0gcGFyc2VTdHJ1
Y3R1cmVkRmllbGRWYWx1ZShyZXNwb25zZS5odHRwSGVhZGVyRmllbGQoaGVhZGVyTmFtZSkpOwpA
QCAtNDYsNyArNDYsOSBAQCBDcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5IG9idGFpbkNyb3NzT3Jp
Z2luRW1iZWRkZXJQb2xpY3koY29uc3QgUmVzb3VyY2VSZXNwb25zZQogICAgIH07CiAKICAgICBD
cm9zc09yaWdpbkVtYmVkZGVyUG9saWN5IHBvbGljeTsKLSAgICBpZiAoaXNTZWN1cmVDb250ZXh0
ID09IElzU2VjdXJlQ29udGV4dDo6Tm8pCisgICAgaWYgKGNvbnRleHQgJiYgIWNvbnRleHQtPnNl
dHRpbmdzVmFsdWVzKCkuY3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeUVuYWJsZWQpCisgICAgICAg
IHJldHVybiBwb2xpY3k7CisgICAgaWYgKCFTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHJlc3BvbnNl
LnVybCgpKS0+aXNQb3RlbnRpYWxseVRydXN0d29ydGh5KCkpCiAgICAgICAgIHJldHVybiBwb2xp
Y3k7CiAKICAgICBwYXJzZUNPRVBIZWFkZXIoSFRUUEhlYWRlck5hbWU6OkNyb3NzT3JpZ2luRW1i
ZWRkZXJQb2xpY3ksIHBvbGljeS52YWx1ZSwgcG9saWN5LnJlcG9ydGluZ0VuZHBvaW50KTsKQEAg
LTU0LDE2ICs1Niw2IEBAIENyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kgb2J0YWluQ3Jvc3NPcmln
aW5FbWJlZGRlclBvbGljeShjb25zdCBSZXNvdXJjZVJlc3BvbnNlCiAgICAgcmV0dXJuIHBvbGlj
eTsKIH0KIAotQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeSBvYnRhaW5Dcm9zc09yaWdpbkVtYmVk
ZGVyUG9saWN5KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBTY3JpcHRF
eGVjdXRpb25Db250ZXh0JiBjb250ZXh0KQotewotICAgIGlmICghY29udGV4dC5zZXR0aW5nc1Zh
bHVlcygpLmNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3lFbmFibGVkKQotICAgICAgICByZXR1cm4g
eyB9OwotCi0gICAgLy8gRklYTUU6IGFib3V0OmJsYW5rIHNob3VsZCBiZSBtYXJrZWQgYXMgc2Vj
dXJlIGFzIHBlciBodHRwczovL3czYy5naXRodWIuaW8vd2ViYXBwc2VjLXNlY3VyZS1jb250ZXh0
cy8jcG90ZW50aWFsbHktdHJ1c3R3b3J0aHktdXJsLgotICAgIGF1dG8gaXNTZWN1cmVDb250ZXh0
ID0gY29udGV4dC5pc1NlY3VyZUNvbnRleHQoKSB8fCBjb250ZXh0LnVybCgpID09IGFib3V0Qmxh
bmtVUkwoKSB8fCBjb250ZXh0LnVybCgpLmlzRW1wdHkoKSA/IElzU2VjdXJlQ29udGV4dDo6WWVz
IDogSXNTZWN1cmVDb250ZXh0OjpObzsKLSAgICByZXR1cm4gb2J0YWluQ3Jvc3NPcmlnaW5FbWJl
ZGRlclBvbGljeShyZXNwb25zZSwgaXNTZWN1cmVDb250ZXh0KTsKLX0KLQogQ3Jvc3NPcmlnaW5F
bWJlZGRlclBvbGljeSBDcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5Ojppc29sYXRlZENvcHkoKSBj
b25zdCAmCiB7CiAgICAgcmV0dXJuIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl
ci9Dcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jv
c3NPcmlnaW5FbWJlZGRlclBvbGljeS5oCmluZGV4IGQ3NTZhNjU5M2ZkNTgyNjI3ZDNlMGUxMGZh
NTBkYWFhOGJlNDIwYzguLjc0OWYwYzc5ZmIzYmFjNWFmZDkwYWVhNjFmOWRkZGFiYTE2ZTdjMjYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9zc09yaWdpbkVtYmVkZGVyUG9s
aWN5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nyb3NzT3JpZ2luRW1iZWRkZXJQb2xp
Y3kuaApAQCAtOTMsMTAgKzkzLDcgQEAgc3RkOjpvcHRpb25hbDxDcm9zc09yaWdpbkVtYmVkZGVy
UG9saWN5PiBDcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5OjpkZWNvZGUoRGVjb2QKICAgICB9fTsK
IH0KIAotQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeSBvYnRhaW5Dcm9zc09yaWdpbkVtYmVkZGVy
UG9saWN5KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBTY3JpcHRFeGVjdXRpb25Db250
ZXh0Jik7CitXRUJDT1JFX0VYUE9SVCBDcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5IG9idGFpbkNy
b3NzT3JpZ2luRW1iZWRkZXJQb2xpY3koY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFNj
cmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKIFdFQkNPUkVfRVhQT1JUIHZvaWQgYWRkQ3Jvc3NPcmln
aW5FbWJlZGRlclBvbGljeUhlYWRlcnMoUmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IENyb3NzT3Jp
Z2luRW1iZWRkZXJQb2xpY3kmKTsKIAotZW51bSBjbGFzcyBJc1NlY3VyZUNvbnRleHQgOiBib29s
IHsgTm8sIFllcyB9OwotV0VCQ09SRV9FWFBPUlQgQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeSBv
YnRhaW5Dcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBJ
c1NlY3VyZUNvbnRleHQpOwotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3kuY3BwIGIvU291cmNl
L1dlYkNvcmUvbG9hZGVyL0Nyb3NzT3JpZ2luT3BlbmVyUG9saWN5LmNwcAppbmRleCAwNDAxNTU2
YTg3NjJiMzdmMTc5Y2MwMjNiZDRlNmMzZGE5YzA1YTE1Li5hNzhjZTQwODg4YWRkMThkNmY5OTE4
NjZkMjZlMzk5MmZlNDhhYjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jv
c3NPcmlnaW5PcGVuZXJQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Dcm9z
c09yaWdpbk9wZW5lclBvbGljeS5jcHAKQEAgLTU0LDcgKzU0LDcgQEAgQ3Jvc3NPcmlnaW5PcGVu
ZXJQb2xpY3kgb2J0YWluQ3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3koY29uc3QgUmVzb3VyY2VSZXNw
b25zZSYgcmUKICAgICBzdGQ6Om9wdGlvbmFsPENyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3k+IGNv
ZXA7CiAgICAgYXV0byBlbnN1cmVDT0VQID0gWyZjb2VwLCAmcmVzcG9uc2UsICZjb250ZXh0XSgp
IC0+IENyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kmIHsKICAgICAgICAgaWYgKCFjb2VwKQotICAg
ICAgICAgICAgY29lcCA9IG9idGFpbkNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kocmVzcG9uc2Us
IGNvbnRleHQpOworICAgICAgICAgICAgY29lcCA9IG9idGFpbkNyb3NzT3JpZ2luRW1iZWRkZXJQ
b2xpY3kocmVzcG9uc2UsICZjb250ZXh0KTsKICAgICAgICAgcmV0dXJuICpjb2VwOwogICAgIH07
CiAgICAgYXV0byBwYXJzZUNPT1AgPSBbJnJlc3BvbnNlLCAmZW5zdXJlQ09FUF0oSFRUUEhlYWRl
ck5hbWUgaGVhZGVyTmFtZSwgYXV0byYgdmFsdWUsIGF1dG8mIHJlcG9ydGluZ0VuZHBvaW50KSB7
CkBAIC03NSwxMCArNzUsNyBAQCBDcm9zc09yaWdpbk9wZW5lclBvbGljeSBvYnRhaW5Dcm9zc09y
aWdpbk9wZW5lclBvbGljeShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZQogICAgIH07CiAKICAg
ICBDcm9zc09yaWdpbk9wZW5lclBvbGljeSBwb2xpY3k7Ci0gICAgaWYgKCFjb250ZXh0LnNldHRp
bmdzVmFsdWVzKCkuY3Jvc3NPcmlnaW5PcGVuZXJQb2xpY3lFbmFibGVkKQotICAgICAgICByZXR1
cm4gcG9saWN5OwotICAgIC8vIEZJWE1FOiBhYm91dDpibGFuayBzaG91bGQgYmUgbWFya2VkIGFz
IHNlY3VyZSBhcyBwZXIgaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3dlYmFwcHNlYy1zZWN1cmUtY29u
dGV4dHMvI3BvdGVudGlhbGx5LXRydXN0d29ydGh5LXVybC4KLSAgICBpZiAoIWNvbnRleHQuaXNT
ZWN1cmVDb250ZXh0KCkgJiYgY29udGV4dC51cmwoKSAhPSBhYm91dEJsYW5rVVJMKCkgJiYgIWNv
bnRleHQudXJsKCkuaXNFbXB0eSgpKQorICAgIGlmICghY29udGV4dC5zZXR0aW5nc1ZhbHVlcygp
LmNyb3NzT3JpZ2luT3BlbmVyUG9saWN5RW5hYmxlZCB8fCAhU2VjdXJpdHlPcmlnaW46OmNyZWF0
ZShyZXNwb25zZS51cmwoKSktPmlzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSgpKQogICAgICAgICBy
ZXR1cm4gcG9saWN5OwogCiAgICAgcGFyc2VDT09QKEhUVFBIZWFkZXJOYW1lOjpDcm9zc09yaWdp
bk9wZW5lclBvbGljeSwgcG9saWN5LnZhbHVlLCBwb2xpY3kucmVwb3J0aW5nRW5kcG9pbnQpOwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggMzhlNmI2NzE0MDY1MzczMTM0
MzRmNTY2NDZjOTE1YTA1YzQyZGI1Yy4uNjk3ZWI2OWRkZjFjMWIyMDBhN2E5NTNkYTYwMTlkYjcx
NTE3Y2FmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC03NTIsNyAr
NzUyLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVudChib29sIGRpc3BhdGNo
KQogICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5k
aWRSZWNlaXZlSGVhZGVycyhDb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMobV9k
b2N1bWVudExvYWRlci0+cmVzcG9uc2UoKSksIHJlZmVycmVyKCksIENvbnRlbnRTZWN1cml0eVBv
bGljeTo6UmVwb3J0UGFyc2luZ0Vycm9yczo6Tm8pOwogCiAgICAgICAgIGlmIChtX2ZyYW1lLmRv
Y3VtZW50KCktPnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSB8fCBtX2ZyYW1lLmRvY3Vt
ZW50KCktPnVybCgpLnByb3RvY29sSXNCbG9iKCkpCi0gICAgICAgICAgICBtX2ZyYW1lLmRvY3Vt
ZW50KCktPnNldENyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kob2J0YWluQ3Jvc3NPcmlnaW5FbWJl
ZGRlclBvbGljeShtX2RvY3VtZW50TG9hZGVyLT5yZXNwb25zZSgpLCAqbV9mcmFtZS5kb2N1bWVu
dCgpKSk7CisgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPnNldENyb3NzT3JpZ2luRW1i
ZWRkZXJQb2xpY3kob2J0YWluQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeShtX2RvY3VtZW50TG9h
ZGVyLT5yZXNwb25zZSgpLCBtX2ZyYW1lLmRvY3VtZW50KCkpKTsKIAogICAgICAgICBTdHJpbmcg
cmVmZXJyZXJQb2xpY3kgPSBtX2RvY3VtZW50TG9hZGVyLT5yZXNwb25zZSgpLmh0dHBIZWFkZXJG
aWVsZChIVFRQSGVhZGVyTmFtZTo6UmVmZXJyZXJQb2xpY3kpOwogICAgICAgICBpZiAoIXJlZmVy
cmVyUG9saWN5LmlzTnVsbCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9X
b3JrZXJTY3JpcHRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJTY3Jp
cHRMb2FkZXIuY3BwCmluZGV4IDdlMGY5ZTMzZmRkZDliYzg5NTA4YWEyY2Q0ODMxNjE1MzZiNjg0
NzguLjczYWU3YWJiNzEzYzZhZjY5NDViOGQ1MWUwYTBlN2Y5NzliMTE1ZjEgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5jcHAKQEAgLTU4LDcgKzU4LDcg
QEAgc3RkOjpvcHRpb25hbDxFeGNlcHRpb24+IFdvcmtlclNjcmlwdExvYWRlcjo6bG9hZFN5bmNo
cm9ub3VzbHkoU2NyaXB0RXhlY3V0aW9uQ28KIAogICAgIG1fdXJsID0gdXJsOwogICAgIG1fZGVz
dGluYXRpb24gPSBGZXRjaE9wdGlvbnM6OkRlc3RpbmF0aW9uOjpTY3JpcHQ7Ci0gICAgbV9pc1Nl
Y3VyZUNvbnRleHQgPSB3b3JrZXJHbG9iYWxTY29wZS5pc1NlY3VyZUNvbnRleHQoKTsKKyAgICBt
X2lzQ09FUEVuYWJsZWQgPSBzY3JpcHRFeGVjdXRpb25Db250ZXh0LT5zZXR0aW5nc1ZhbHVlcygp
LmNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3lFbmFibGVkOwogCiAjaWYgRU5BQkxFKFNFUlZJQ0Vf
V09SS0VSKQogICAgIGJvb2wgaXNTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUgPSBpczxTZXJ2aWNl
V29ya2VyR2xvYmFsU2NvcGU+KHdvcmtlckdsb2JhbFNjb3BlKTsKQEAgLTExNyw3ICsxMTcsNyBA
QCB2b2lkIFdvcmtlclNjcmlwdExvYWRlcjo6bG9hZEFzeW5jaHJvbm91c2x5KFNjcmlwdEV4ZWN1
dGlvbkNvbnRleHQmIHNjcmlwdEV4ZWN1dAogICAgIG1fY2xpZW50ID0gJmNsaWVudDsKICAgICBt
X3VybCA9IHNjcmlwdFJlcXVlc3QudXJsKCk7CiAgICAgbV9kZXN0aW5hdGlvbiA9IGZldGNoT3B0
aW9ucy5kZXN0aW5hdGlvbjsKLSAgICBtX2lzU2VjdXJlQ29udGV4dCA9IHNjcmlwdEV4ZWN1dGlv
bkNvbnRleHQuaXNTZWN1cmVDb250ZXh0KCk7CisgICAgbV9pc0NPRVBFbmFibGVkID0gc2NyaXB0
RXhlY3V0aW9uQ29udGV4dC5zZXR0aW5nc1ZhbHVlcygpLmNyb3NzT3JpZ2luRW1iZWRkZXJQb2xp
Y3lFbmFibGVkOwogCiAgICAgQVNTRVJUKHNjcmlwdFJlcXVlc3QuaHR0cE1ldGhvZCgpID09ICJH
RVQiKTsKIApAQCAtMTkzLDcgKzE5Myw4IEBAIHZvaWQgV29ya2VyU2NyaXB0TG9hZGVyOjpkaWRS
ZWNlaXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvCiAgICAg
bV9yZXNwb25zZVNvdXJjZSA9IHJlc3BvbnNlLnNvdXJjZSgpOwogICAgIG1faXNSZWRpcmVjdGVk
ID0gcmVzcG9uc2UuaXNSZWRpcmVjdGVkKCk7CiAgICAgbV9jb250ZW50U2VjdXJpdHlQb2xpY3kg
PSBDb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMgeyByZXNwb25zZSB9OwotICAg
IG1fY3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeSA9IG9idGFpbkNyb3NzT3JpZ2luRW1iZWRkZXJQ
b2xpY3kocmVzcG9uc2UsIG1faXNTZWN1cmVDb250ZXh0ID8gSXNTZWN1cmVDb250ZXh0OjpZZXMg
OiBJc1NlY3VyZUNvbnRleHQ6Ok5vKTsKKyAgICBpZiAobV9pc0NPRVBFbmFibGVkKQorICAgICAg
ICBtX2Nyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kgPSBvYnRhaW5Dcm9zc09yaWdpbkVtYmVkZGVy
UG9saWN5KHJlc3BvbnNlLCBudWxscHRyKTsKICAgICBtX3JlZmVycmVyUG9saWN5ID0gcmVzcG9u
c2UuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpSZWZlcnJlclBvbGljeSk7CiAgICAg
aWYgKG1fY2xpZW50KQogICAgICAgICBtX2NsaWVudC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKGlkZW50
aWZpZXIsIHJlc3BvbnNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29y
a2VyU2NyaXB0TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExv
YWRlci5oCmluZGV4IGVjZWU4M2IzZWQyMzkwMmM3Mzk3OTEyNTIyZWFhZGNjODgzMTg4YjIuLjNl
ZTRkYTZjNTA2Y2JmZDZlYjg3NWQ5YzI3NDk4ZjEzZjNjN2ExMTkgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNv
cmUvd29ya2Vycy9Xb3JrZXJTY3JpcHRMb2FkZXIuaApAQCAtMTE0LDcgKzExNCw3IEBAIHByaXZh
dGU6CiAgICAgYm9vbCBtX2ZhaWxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2ZpbmlzaGluZyB7
IGZhbHNlIH07CiAgICAgYm9vbCBtX2lzUmVkaXJlY3RlZCB7IGZhbHNlIH07Ci0gICAgYm9vbCBt
X2lzU2VjdXJlQ29udGV4dCB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzQ09FUEVuYWJsZWQgeyBm
YWxzZSB9OwogICAgIFJlc291cmNlUmVzcG9uc2U6OlNvdXJjZSBtX3Jlc3BvbnNlU291cmNlIHsg
UmVzb3VyY2VSZXNwb25zZTo6U291cmNlOjpVbmtub3duIH07CiAgICAgUmVzb3VyY2VFcnJvciBt
X2Vycm9yOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0
d29ya1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0
d29ya1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAyMjhkMzlkOWU0NmZlNjMwNjQzYzAyYTFmZGEy
ZGFmZjVkYWMyNGRlLi4zZjliMWU1MzhkMzk3NjI2MDVlMjQ0OGEwYjlkMjZmODM3NmZmMzBmIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv
YWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy
Y2VMb2FkZXIuY3BwCkBAIC02MDIsNyArNjAyLDcgQEAgYm9vbCBOZXR3b3JrUmVzb3VyY2VMb2Fk
ZXI6OnNob3VsZEludGVycnVwdE5hdmlnYXRpb25Gb3JDcm9zc09yaWdpbkVtYmVkZGVyUG9saWMK
IAogICAgIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL29yaWdpbi5o
dG1sI2NoZWNrLWEtbmF2aWdhdGlvbi1yZXNwb25zZSdzLWFkaGVyZW5jZS10by1pdHMtZW1iZWRk
ZXItcG9saWN5CiAgICAgaWYgKG1fcGFyYW1ldGVycy5wYXJlbnRDcm9zc09yaWdpbkVtYmVkZGVy
UG9saWN5LnZhbHVlICE9IFdlYkNvcmU6OkNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3lWYWx1ZTo6
VW5zYWZlTm9uZSAmJiBtX3BhcmFtZXRlcnMuc291cmNlT3JpZ2luKSB7Ci0gICAgICAgIGF1dG8g
cmVzcG9uc2VDT0VQID0gV2ViQ29yZTo6b2J0YWluQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeShy
ZXNwb25zZSwgbV9wYXJhbWV0ZXJzLnNvdXJjZU9yaWdpbi0+aXNQb3RlbnRpYWxseVRydXN0d29y
dGh5KCkgPyBJc1NlY3VyZUNvbnRleHQ6OlllcyA6IElzU2VjdXJlQ29udGV4dDo6Tm8pOworICAg
ICAgICBhdXRvIHJlc3BvbnNlQ09FUCA9IFdlYkNvcmU6Om9idGFpbkNyb3NzT3JpZ2luRW1iZWRk
ZXJQb2xpY3kocmVzcG9uc2UsIG51bGxwdHIpOwogICAgICAgICBpZiAocmVzcG9uc2VDT0VQLnZh
bHVlICE9IFdlYkNvcmU6OkNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3lWYWx1ZTo6UmVxdWlyZUNP
UlApIHsKICAgICAgICAgICAgIFN0cmluZyBlcnJvck1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJSZWZ1
c2VkIHRvIGRpc3BsYXkgJyIsIHJlc3BvbnNlLnVybCgpLnN0cmluZ0NlbnRlckVsbGlwc2l6ZWRU
b0xlbmd0aCgpLCAiJyBpbiBhIGZyYW1lIGJlY2F1c2Ugb2YgQ3Jvc3MtT3JpZ2luLUVtYmVkZGVy
LVBvbGljeS4iKTsKICAgICAgICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkFkZENvbnNv
bGVNZXNzYWdlIHsgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsICBNZXNzYWdlU291cmNlOjpTZWN1
cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgZXJyb3JNZXNzYWdlLCBjb3JlSWRlbnRpZmllcigp
IH0sIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQpOwpAQCAtNjE4LDcgKzYxOCw3IEBAIGJvb2wgTmV0
d29ya1Jlc291cmNlTG9hZGVyOjpzaG91bGRJbnRlcnJ1cHRXb3JrZXJMb2FkRm9yQ3Jvc3NPcmln
aW5FbWJlZGRlclBvbGljCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChtX3BhcmFt
ZXRlcnMuY3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeS52YWx1ZSAhPSBXZWJDb3JlOjpDcm9zc09y
aWdpbkVtYmVkZGVyUG9saWN5VmFsdWU6OlVuc2FmZU5vbmUgJiYgbV9wYXJhbWV0ZXJzLnNvdXJj
ZU9yaWdpbikgewotICAgICAgICBhdXRvIHJlc3BvbnNlQ09FUCA9IFdlYkNvcmU6Om9idGFpbkNy
b3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kocmVzcG9uc2UsIG1fcGFyYW1ldGVycy5zb3VyY2VPcmln
aW4tPmlzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSgpID8gSXNTZWN1cmVDb250ZXh0OjpZZXMgOiBJ
c1NlY3VyZUNvbnRleHQ6Ok5vKTsKKyAgICAgICAgYXV0byByZXNwb25zZUNPRVAgPSBXZWJDb3Jl
OjpvYnRhaW5Dcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5KHJlc3BvbnNlLCBudWxscHRyKTsKICAg
ICAgICAgaWYgKHJlc3BvbnNlQ09FUC52YWx1ZSAhPSBXZWJDb3JlOjpDcm9zc09yaWdpbkVtYmVk
ZGVyUG9saWN5VmFsdWU6OlJlcXVpcmVDT1JQKSB7CiAgICAgICAgICAgICBTdHJpbmcgZXJyb3JN
ZXNzYWdlID0gbWFrZVN0cmluZygiUmVmdXNlZCB0byBsb2FkICciLCByZXNwb25zZS51cmwoKS5z
dHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSwgIicgd29ya2VyIGJlY2F1c2Ugb2YgQ3Jv
c3MtT3JpZ2luLUVtYmVkZGVyLVBvbGljeS4iKTsKICAgICAgICAgICAgIHNlbmQoTWVzc2FnZXM6
OldlYlBhZ2U6OkFkZENvbnNvbGVNZXNzYWdlIHsgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsICBN
ZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgZXJyb3JNZXNzYWdl
LCBjb3JlSWRlbnRpZmllcigpIH0sIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQpOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3Jr
ZXJTb2Z0VXBkYXRlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2Vy
dmljZVdvcmtlci9TZXJ2aWNlV29ya2VyU29mdFVwZGF0ZUxvYWRlci5jcHAKaW5kZXggOWExNTgz
NmIyNjc4ZmJkZDk0NzFlZmJjYmU5MmRlMDE5YjhmODA5Zi4uZjUzMDE1MGQzMTU5NmI4MWE1NWZl
MDUyOTIxYzU1YmM1NDBiMzM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv
Y2Vzcy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJTb2Z0VXBkYXRlTG9hZGVyLmNwcAorKysg
Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvU2VydmljZVdvcmtl
clNvZnRVcGRhdGVMb2FkZXIuY3BwCkBAIC0xNzAsNyArMTcwLDcgQEAgUmVzb3VyY2VFcnJvciBT
ZXJ2aWNlV29ya2VyU29mdFVwZGF0ZUxvYWRlcjo6cHJvY2Vzc1Jlc3BvbnNlKGNvbnN0IFJlc291
cmNlUmVzcG8KIAogICAgIG1fY29udGVudFNlY3VyaXR5UG9saWN5ID0gQ29udGVudFNlY3VyaXR5
UG9saWN5UmVzcG9uc2VIZWFkZXJzIHsgcmVzcG9uc2UgfTsKICAgICAvLyBTZXJ2aWNlIHdvcmtl
cnMgYXJlIGFsd2F5cyBzZWN1cmUgY29udGV4dHMuCi0gICAgbV9jcm9zc09yaWdpbkVtYmVkZGVy
UG9saWN5ID0gb2J0YWluQ3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeShyZXNwb25zZSwgSXNTZWN1
cmVDb250ZXh0OjpZZXMpOworICAgIG1fY3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeSA9IG9idGFp
bkNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kocmVzcG9uc2UsIG51bGxwdHIpOwogICAgIG1fcmVm
ZXJyZXJQb2xpY3kgPSByZXNwb25zZS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OlJl
ZmVycmVyUG9saWN5KTsKICAgICBtX3Jlc3BvbnNlRW5jb2RpbmcgPSByZXNwb25zZS50ZXh0RW5j
b2RpbmdOYW1lKCk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2YTQ3ZTljYzkwMDBmNmRkMzBkYWZjMTFjNzQxMTg3YWU1
NDk1NTU0Li5jZmFkZWE0YjA1ZWMxODdiZjg1MjA3YjRjZDkyMGRkZWMyZDYzMWY2IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTcgQEAKKzIwMjEtMDktMDEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv
bT4KKworICAgICAgICBbQ09PUF0gQ3Jvc3Mgb3JpZ2luIGlzb2xhdGlvbiBkb2Vzbid0IGhhcHBl
biB3aGVuIGdvaW5nIGZyb20gYW4gSFRUUCBVUkwgdG8gYSBIVFRQUyBvbmUgd2l0aCBDT09QK0NP
RVAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTc0
NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI2MzA5Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGxheW91dCB0ZXN0IGNvdmVyYWdlLgor
CisgICAgICAgICogaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvbm9uLXNlY3Vy
ZS10by1zZWN1cmUtY29udGV4dC1uYXZpZ2F0aW9uLmh0dHBzLWV4cGVjdGVkLnR4dDogQWRkZWQu
CisgICAgICAgICogaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvbm9uLXNlY3Vy
ZS10by1zZWN1cmUtY29udGV4dC1uYXZpZ2F0aW9uLmh0dHBzLmh0bWw6IEFkZGVkLgorICAgICAg
ICAqIGh0dHAvd3B0L2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L3Jlc291cmNlcy9ub24tc2Vj
dXJlLXRvLXNlY3VyZS1jb250ZXh0LW5hdmlnYXRpb24tcG9wdXAuaHRtbDogQWRkZWQuCisKIDIw
MjEtMDktMDEgIEF5dW1pIEtvamltYSAgPGF5dW1pX2tvamltYUBhcHBsZS5jb20+CiAKICAgICAg
ICAgWyBNb250ZXJleSBHdWFyZE1hbGxvYyBdIGFjY2Vzc2liaWxpdHkvKiB0ZXN0cyBhcmUgdGlt
aW5nIG91dC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nyb3NzLW9yaWdpbi1v
cGVuZXItcG9saWN5L25vbi1zZWN1cmUtdG8tc2VjdXJlLWNvbnRleHQtbmF2aWdhdGlvbi5odHRw
cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9jcm9zcy1vcmlnaW4tb3BlbmVy
LXBvbGljeS9ub24tc2VjdXJlLXRvLXNlY3VyZS1jb250ZXh0LW5hdmlnYXRpb24uaHR0cHMtZXhw
ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjNkZDBkNDRkYzI1MzQwMDAxZjBiY2MyMzFlZTQxMWYxNDE4
YTU1NjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9jcm9zcy1vcmln
aW4tb3BlbmVyLXBvbGljeS9ub24tc2VjdXJlLXRvLXNlY3VyZS1jb250ZXh0LW5hdmlnYXRpb24u
aHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitQQVNTIE1ha2Ugc3VyZSB0aGF0
IENPT1AgY2F1c2VzIGEgYnJvd3NpbmcgY29udGV4dCBncm91cCBzd2l0Y2ggd2hlbiBuYXZpZ2F0
aW5nIGZyb20gYSBzZWN1cmUgY29udGV4dCB0byBhIG5vbi1zZWN1cmUgb25lCisKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L25vbi1z
ZWN1cmUtdG8tc2VjdXJlLWNvbnRleHQtbmF2aWdhdGlvbi5odHRwcy5odG1sIGIvTGF5b3V0VGVz
dHMvaHR0cC93cHQvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvbm9uLXNlY3VyZS10by1zZWN1
cmUtY29udGV4dC1uYXZpZ2F0aW9uLmh0dHBzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k
ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjk3Nzc3MzI3NGFm
NDhkMTI3OTU4NjNkMTdjNzc0OTcyN2Q1YTkzMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl
c3RzL2h0dHAvd3B0L2Nyb3NzLW9yaWdpbi1vcGVuZXItcG9saWN5L25vbi1zZWN1cmUtdG8tc2Vj
dXJlLWNvbnRleHQtbmF2aWdhdGlvbi5odHRwcy5odG1sCkBAIC0wLDAgKzEsMjggQEAKKzwhRE9D
VFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9dXRmLTg+Cis8c2NyaXB0
IHNyYz0vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9L3Jl
c291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcz48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvY29t
bW9uL2dldC1ob3N0LWluZm8uc3ViLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHNj
cmlwdD4KK2FzeW5jX3Rlc3QoKHQpID0+IHsKKyAgICBsZXQgYmMgPSBuZXcgQnJvYWRjYXN0Q2hh
bm5lbCgnbm9uLXNlY3VyZS10by1zZWN1cmUtY29udGV4dC1uYXZpZ2F0aW9uJyk7CisgICAgYmMu
b25tZXNzYWdlID0gdC5zdGVwX2Z1bmMoKGV2ZW50KSA9PiB7CisgICAgICAgIGFzc2VydF90cnVl
KHdpbi5jbG9zZWQsICJXaW5kb3cgc2hvdWxkIGJlIGNsb3NlZCIpOworICAgICAgICBhc3NlcnRf
ZXF1YWxzKGV2ZW50LmRhdGEsICJkb2VzX25vdF9oYXZlX29wZW5lciIpOworICAgICAgICB0LmRv
bmUoKTsKKyAgICB9KTsKKworICAgIHdpbiA9IG9wZW4oInJlc291cmNlcy9ub24tc2VjdXJlLXRv
LXNlY3VyZS1jb250ZXh0LW5hdmlnYXRpb24tcG9wdXAuaHRtbCIpOworICAgIHdpbi5vbmxvYWQg
PSAoKSA9PiB7CisgICAgICAgIHdpbi5vbmxvYWQgPSBudWxsOworICAgICAgICAvLyBOYXZpZ2F0
ZSB0byBIVFRQUyB3aXRoICBDT09QPXNhbWUtb3JpZ2luLgorICAgICAgICB3aW4ubG9jYXRpb24u
aHJlZiA9IHdpbi5sb2NhdGlvbi5ocmVmICsgIj9zZWN1cmU9MSZwaXBlPWhlYWRlcihDcm9zcy1P
cmlnaW4tT3BlbmVyLVBvbGljeSxzYW1lLW9yaWdpbikiOworICAgIH07Cit9LCAiTWFrZSBzdXJl
IHRoYXQgQ09PUCBjYXVzZXMgYSBicm93c2luZyBjb250ZXh0IGdyb3VwIHN3aXRjaCB3aGVuIG5h
dmlnYXRpbmcgZnJvbSBhIHNlY3VyZSBjb250ZXh0IHRvIGEgbm9uLXNlY3VyZSBvbmUiKTsKKzwv
c2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93
cHQvY3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvcmVzb3VyY2VzL25vbi1zZWN1cmUtdG8tc2Vj
dXJlLWNvbnRleHQtbmF2aWdhdGlvbi1wb3B1cC5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQv
Y3Jvc3Mtb3JpZ2luLW9wZW5lci1wb2xpY3kvcmVzb3VyY2VzL25vbi1zZWN1cmUtdG8tc2VjdXJl
LWNvbnRleHQtbmF2aWdhdGlvbi1wb3B1cC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjNkMzkxNGEyYmRhNDcw
MWNjYjg4NmNiZmNjODkzNzdjMzFjNmRkNDMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0
cy9odHRwL3dwdC9jcm9zcy1vcmlnaW4tb3BlbmVyLXBvbGljeS9yZXNvdXJjZXMvbm9uLXNlY3Vy
ZS10by1zZWN1cmUtY29udGV4dC1uYXZpZ2F0aW9uLXBvcHVwLmh0bWwKQEAgLTAsMCArMSwxNiBA
QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5PgorPHNjcmlwdD4KK2NvbnN0IHVybFBh
cmFtcyA9IG5ldyBVUkxTZWFyY2hQYXJhbXMobG9jYXRpb24uc2VhcmNoKTsKK2NvbnN0IGlzU2Vj
dXJlQ29udGV4dCA9IHVybFBhcmFtcy5nZXQoInNlY3VyZSIpID09ICIxIjsKK2lmICh3aW5kb3cu
aW50ZXJuYWxzICYmICFpc1NlY3VyZUNvbnRleHQpCisgICAgaW50ZXJuYWxzLm1hcmtDb250ZXh0
QXNJbnNlY3VyZSgpOworCitpZiAoaXNTZWN1cmVDb250ZXh0KSB7CisgICAgbGV0IGJjID0gbmV3
IEJyb2FkY2FzdENoYW5uZWwoJ25vbi1zZWN1cmUtdG8tc2VjdXJlLWNvbnRleHQtbmF2aWdhdGlv
bicpOworICAgIGJjLnBvc3RNZXNzYWdlKHdpbmRvdy5vcGVuZXIgPyAiaGFzX29wZW5lciIgOiAi
ZG9lc19ub3RfaGF2ZV9vcGVuZXIiKTsKK30KKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>