209587 2020-03-26 01:53:27 -0700 Move applyUserAgentIfNeeded calls to a more central place 2020-06-25 16:52:42 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210863 213626 1 rbuis rbuis achristensen cdumez darin ews-watchlist japhet webkit-bug-importer youennf oldest_to_newest 1634240 0 rbuis 2020-03-26 01:53:27 -0700 Move applyUserAgentIfNeeded calls to a more central place. 1634241 1 394585 rbuis 2020-03-26 01:55:15 -0700 Created attachment 394585 Patch 1634262 2 394589 rbuis 2020-03-26 03:33:06 -0700 Created attachment 394589 Patch 1634272 3 394594 rbuis 2020-03-26 04:13:49 -0700 Created attachment 394594 Patch 1634822 4 ews-feeder 2020-03-27 09:12:41 -0700 Committed r259116: <https://trac.webkit.org/changeset/259116> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394594. 1634823 5 webkit-bug-importer 2020-03-27 09:13:13 -0700 <rdar://problem/60970124> 1644302 6 cdumez 2020-04-22 08:37:35 -0700 Reverted r259116 for reason: Broke login flow on some apple-internal sites (rdar://problem/61905262) Committed r260511: <https://trac.webkit.org/changeset/260511> 1644306 7 darin 2020-04-22 08:40:54 -0700 We know that this revision caused the login failures. We don’t know what behavior changed. Need to figure that out, make tests, to make sure future refactoring doesn’t break this again. 1644310 8 cdumez 2020-04-22 08:43:16 -0700 (In reply to Darin Adler from comment #7) > We know that this revision caused the login failures. We don’t know what > behavior changed. Need to figure that out, make tests, to make sure future > refactoring doesn’t break this again. Understood. I will follow-up with more investigation and hopefully a test. For now, my priority is to get us back into a working state. 1644323 9 cdumez 2020-04-22 08:58:05 -0700 (In reply to Chris Dumez from comment #8) > (In reply to Darin Adler from comment #7) > > We know that this revision caused the login failures. We don’t know what > > behavior changed. Need to figure that out, make tests, to make sure future > > refactoring doesn’t break this again. > > Understood. I will follow-up with more investigation and hopefully a test. > For now, my priority is to get us back into a working state. I did some digging with Web Inspector and it looks like if you do a navigation like so: "window.location = 'test.html';" then WebCore no longer sets the User-Agent header on the main resource request to test.html 1644326 10 394594 cdumez 2020-04-22 09:03:35 -0700 Comment on attachment 394594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394594&action=review > Source/WebCore/loader/FrameLoader.cpp:-2979 > - applyUserAgentIfNeeded(request); For the scenario I mentioned, this used to add the user-agent header. 1644367 11 cdumez 2020-04-22 10:05:59 -0700 (In reply to Chris Dumez from comment #10) > Comment on attachment 394594 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394594&action=review > > > Source/WebCore/loader/FrameLoader.cpp:-2979 > > - applyUserAgentIfNeeded(request); > > For the scenario I mentioned, this used to add the user-agent header. I was wrong, the User-Agent header seems to be missing from sync XHR requests. I have a test almost ready. 1644368 12 rbuis 2020-04-22 10:11:11 -0700 (In reply to Chris Dumez from comment #11) > (In reply to Chris Dumez from comment #10) > > Comment on attachment 394594 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=394594&action=review > > > > > Source/WebCore/loader/FrameLoader.cpp:-2979 > > > - applyUserAgentIfNeeded(request); > > > > For the scenario I mentioned, this used to add the user-agent header. > > I was wrong, the User-Agent header seems to be missing from sync XHR > requests. I have a test almost ready. Thanks for your work here! My patch probably did not add an applyUserAgentIfNeeded to FrameLoader::loadResourceSynchronously, to correct the applyUserAgentIfNeeded that was removed from addExtraFieldsToRequest. 1644381 13 cdumez 2020-04-22 10:25:23 -0700 (In reply to Darin Adler from comment #7) > We know that this revision caused the login failures. We don’t know what > behavior changed. Need to figure that out, make tests, to make sure future > refactoring doesn’t break this again. Added test that would have failed via https://bugs.webkit.org/show_bug.cgi?id=210863. 1644419 14 397229 rbuis 2020-04-22 12:05:07 -0700 Created attachment 397229 Patch 1644499 15 397229 darin 2020-04-22 14:22:57 -0700 Comment on attachment 397229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397229&action=review > Source/WebCore/loader/cache/CachedResourceLoader.h:178 > - void updateHTTPRequestHeaders(CachedResource::Type, CachedResourceRequest&); > + void updateHTTPRequestHeaders(FrameLoader&, CachedResource::Type, CachedResourceRequest&); This doesn’t seem good. 1644665 16 397229 rbuis 2020-04-22 21:39:03 -0700 Comment on attachment 397229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397229&action=review >> Source/WebCore/loader/cache/CachedResourceLoader.h:178 >> + void updateHTTPRequestHeaders(FrameLoader&, CachedResource::Type, CachedResourceRequest&); > > This doesn’t seem good. Can you expand on what is not good? This is the original patch plus the fix to loadResourceSynchronously. 1644794 17 397229 darin 2020-04-23 09:15:56 -0700 Comment on attachment 397229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397229&action=review >>> Source/WebCore/loader/cache/CachedResourceLoader.h:178 >>> + void updateHTTPRequestHeaders(FrameLoader&, CachedResource::Type, CachedResourceRequest&); >> >> This doesn’t seem good. > > Can you expand on what is not good? This is the original patch plus the fix to loadResourceSynchronously. Having to pass a FrameLoader here bothers me. But it’s not really about this one patch. 1644944 18 397229 rbuis 2020-04-23 13:33:43 -0700 Comment on attachment 397229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397229&action=review >>>> Source/WebCore/loader/cache/CachedResourceLoader.h:178 >>>> + void updateHTTPRequestHeaders(FrameLoader&, CachedResource::Type, CachedResourceRequest&); >>> >>> This doesn’t seem good. >> >> Can you expand on what is not good? This is the original patch plus the fix to loadResourceSynchronously. > > Having to pass a FrameLoader here bothers me. But it’s not really about this one patch. I see, one impovement may be to inline this more in CachedResourceLoader::requestResource, and make sure to order well and add the right comments and spec links. There is probably still quite some we can do to improve that method, I made a start here https://bugs.webkit.org/show_bug.cgi?id=210925. 1644948 19 ews-feeder 2020-04-23 13:37:58 -0700 Committed r260596: <https://trac.webkit.org/changeset/260596> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397229. 1666277 20 achristensen 2020-06-25 16:37:47 -0700 This broke our API. See https://bugs.webkit.org/show_bug.cgi?id=213626 394585 2020-03-26 01:55:15 -0700 2020-03-26 03:33:02 -0700 Patch bug-209587-20200326095514.patch text/plain 8781 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgwNWE1MWFmZTFkMGQw Y2RhZmU1Yjg4MjE0ZWJiOWVjNTJkMTNjZC4uY2VjMzRjNzY5YzhlYTU2ZTcxZTVjYmVlYzNjYjQw MGFmZWNmNGM2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAzLTI2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBhcHBseVVzZXJBZ2VudElm TmVlZGVkIGNhbGxzIHRvIGEgbW9yZSBjZW50cmFsIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk1ODcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGFwcGx5VXNlckFnZW50SWZOZWVkZWQg Y2FsbHMgdG8gYSBtb3JlIGNlbnRyYWwgcGxhY2UuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRz VG9SZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkUmVzb3VyY2VT eW5jaHJvbm91c2x5KToKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNo ZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6Y3Jl YXRlUmVxdWVzdCk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjp1cGRhdGVIVFRQ UmVxdWVzdEhlYWRlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6 OnJlcXVlc3RSZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl TG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZVJlZmVy cmVyQW5kT3JpZ2luSGVhZGVycyk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZVJl cXVlc3Q6OnVwZGF0ZVVzZXJBZ2VudEhlYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRS ZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZVJlZmVycmVyT3JpZ2luQW5kVXNlckFnZW50SGVhZGVycyk6 IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5o OgorCiAyMDIwLTAzLTI2ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAg VGFrZSBpbnRvIGFjY291bnQgcmVmZXJyZXItcG9saWN5IGluIGFwcGVuZCBPcmlnaW4gaGVhZGVy IGFsZ29yaXRobQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggODc5YTBk MzhiNTQ0YmM0ZDc5ZTQ0ZGE1YTg1NWVlNDlkNDAzMDZiMy4uODgzMzM0NGE1MGViZTJmMjFlMTIy MDc3NzlkNzI3Yjg5YTViMjdjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CkBAIC0yOTc2LDggKzI5NzYsNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1Rv UmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZyYW1lTG9hZFR5cAogICAgIGlmICht X292ZXJyaWRlUmVzb3VyY2VMb2FkUHJpb3JpdHlGb3JUZXN0aW5nKQogICAgICAgICByZXF1ZXN0 LnNldFByaW9yaXR5KG1fb3ZlcnJpZGVSZXNvdXJjZUxvYWRQcmlvcml0eUZvclRlc3RpbmcudmFs dWUoKSk7CiAKLSAgICBhcHBseVVzZXJBZ2VudElmTmVlZGVkKHJlcXVlc3QpOwotCiAgICAgLy8g T25seSBzZXQgZmFsbGJhY2sgYXJyYXkgaWYgaXQncyBzdGlsbCBlbXB0eSAobGF0ZXIgYXR0ZW1w dHMgbWF5IGJlIGluY29ycmVjdCwgc2VlIGJ1ZyAxMTc4MTgpLgogICAgIGlmIChyZXF1ZXN0LnJl c3BvbnNlQ29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5KCkuaXNFbXB0eSgp KSB7CiAgICAgICAgIC8vIEFsd2F5cyB0cnkgVVRGLTguIElmIHRoYXQgZmFpbHMsIHRyeSBmcmFt ZSBlbmNvZGluZyAoaWYgYW55KSBhbmQgdGhlbiB0aGUgZGVmYXVsdC4KQEAgLTMwODgsNiArMzA4 Niw3IEBAIHVuc2lnbmVkIGxvbmcgRnJhbWVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3Vz bHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1CiAgICAgaW5pdGlhbFJlcXVlc3Quc2V0Rmly c3RQYXJ0eUZvckNvb2tpZXMobV9mcmFtZS5tYWluRnJhbWUoKS5sb2FkZXIoKS5kb2N1bWVudExv YWRlcigpLT5yZXF1ZXN0KCkudXJsKCkpOwogICAgIAogICAgIGFkZEV4dHJhRmllbGRzVG9TdWJy ZXNvdXJjZVJlcXVlc3QoaW5pdGlhbFJlcXVlc3QpOworICAgIGFwcGx5VXNlckFnZW50SWZOZWVk ZWQoaW5pdGlhbFJlcXVlc3QpOwogCiAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyID0gMDsg ICAgCiAgICAgUmVzb3VyY2VSZXF1ZXN0IG5ld1JlcXVlc3QoaW5pdGlhbFJlcXVlc3QpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVH cm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNo ZUdyb3VwLmNwcAppbmRleCA2MGMyNGJmNzhjMWFiYjg2ZmJhZWNmNDVlOTE2NTIxMDVhYWVjNzk0 Li5iNjNkZjdlMGExNjRiZmUxNTc2NTQ5YmEyZThhMjViOWYxNTcwY2FiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3Vw LmNwcApAQCAtNDYzLDcgKzQ2Myw2IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjp1cGRh dGUoRnJhbWUmIGZyYW1lLCBBcHBsaWNhdGlvbkNhY2hlVXBkYXRlT3B0aW9uIHVwCiBSZXNvdXJj ZVJlcXVlc3QgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpjcmVhdGVSZXF1ZXN0KFVSTCYmIHVybCwg QXBwbGljYXRpb25DYWNoZVJlc291cmNlKiByZXNvdXJjZSkKIHsKICAgICBSZXNvdXJjZVJlcXVl c3QgcmVxdWVzdCB7IFdURk1vdmUodXJsKSB9OwotICAgIG1fZnJhbWUtPmxvYWRlcigpLmFwcGx5 VXNlckFnZW50SWZOZWVkZWQocmVxdWVzdCk7CiAgICAgcmVxdWVzdC5zZXRIVFRQSGVhZGVyRmll bGQoSFRUUEhlYWRlck5hbWU6OkNhY2hlQ29udHJvbCwgSFRUUEhlYWRlclZhbHVlczo6bWF4QWdl MCgpKTsKIAogICAgIGlmIChyZXNvdXJjZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYjIwZTFjYzZhZjJhYjVj YjNhM2E2NThhNmNlNDAyODQ2YjhjNmUyOS4uMDkwYWU0NTY4ZjY2YzcwOWE1NTcxZGVkMWY1YzI1 MTFjNzRkN2JmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC03MzMsMTcgKzczMywxNCBAQCB2b2lkIENhY2hlZFJl c291cmNlTG9hZGVyOjpwcmVwYXJlRmV0Y2goQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgQ2Fj aGVkUmVzb3VyYwogICAgIC8vIEZJWE1FOiBEZWNpZGUgd2hldGhlciB0byBzdXBwb3J0IGNsaWVu dCBoaW50cwogfQogCi12b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjp1cGRhdGVIVFRQUmVxdWVz dEhlYWRlcnMoQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0KQordm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6dXBkYXRlSFRUUFJlcXVlc3RI ZWFkZXJzKEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlciwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlw ZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIC8vIEltcGxlbWVudGlu ZyBzdGVwcyA3IHRvIDEyIG9mIGh0dHBzOi8vZmV0Y2guc3BlYy53aGF0d2cub3JnLyNodHRwLW5l dHdvcmstb3ItY2FjaGUtZmV0Y2gKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcmVjb25jaWxl IGhhbmRsaW5nIG9mIE1haW5SZXNvdXJjZSB3aXRoIG90aGVyIHJlc291cmNlcy4KLSAgICBpZiAo dHlwZSAhPSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6TWFpblJlc291cmNlKSB7Ci0gICAgICAgIC8v IEluIHNvbWUgY2FzZXMgd2UgbWF5IHRyeSB0byBsb2FkIHJlc291cmNlcyBpbiBmcmFtZWxlc3Mg ZG9jdW1lbnRzLiBTdWNoIGxvYWRzIGFsd2F5cyBmYWlsLgotICAgICAgICAvLyBGSVhNRTogV2Ug c2hvdWxkbid0IG5lZWQgdG8gZG8gdGhlIGNoZWNrIG9uIGZyYW1lLgotICAgICAgICBpZiAoYXV0 byogZnJhbWUgPSB0aGlzLT5mcmFtZSgpKQotICAgICAgICAgICAgcmVxdWVzdC51cGRhdGVSZWZl cnJlck9yaWdpbkFuZFVzZXJBZ2VudEhlYWRlcnMoZnJhbWUtPmxvYWRlcigpKTsKLSAgICB9Cisg ICAgaWYgKHR5cGUgIT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Ok1haW5SZXNvdXJjZSkKKyAgICAg ICAgcmVxdWVzdC51cGRhdGVSZWZlcnJlckFuZE9yaWdpbkhlYWRlcnMoZnJhbWVMb2FkZXIpOwor ICAgIHJlcXVlc3QudXBkYXRlVXNlckFnZW50SGVhZGVyKGZyYW1lTG9hZGVyKTsKIAogICAgIHJl cXVlc3QudXBkYXRlQWNjb3JkaW5nQ2FjaGVNb2RlKCk7CiAgICAgcmVxdWVzdC51cGRhdGVBY2Nl cHRFbmNvZGluZ0hlYWRlcigpOwpAQCAtODg4LDcgKzg4NSw3IEBAIFJlc291cmNlRXJyb3JPcjxD YWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4+IENhY2hlZFJlc291cmNlTG9hZGVy OjpyZXF1CiAgICAgSW5pdGlhdG9yQ29udGV4dCBpbml0aWF0b3JDb250ZXh0ID0gcmVxdWVzdC5v cHRpb25zKCkuaW5pdGlhdG9yQ29udGV4dDsKIAogICAgIGlmIChyZXF1ZXN0LnJlc291cmNlUmVx dWVzdCgpLnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKLSAgICAgICAgdXBkYXRlSFRU UFJlcXVlc3RIZWFkZXJzKHR5cGUsIHJlcXVlc3QpOworICAgICAgICB1cGRhdGVIVFRQUmVxdWVz dEhlYWRlcnMoZnJhbWUubG9hZGVyKCksIHR5cGUsIHJlcXVlc3QpOwogCiAgICAgYXV0byYgbWVt b3J5Q2FjaGUgPSBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCk7CiAgICAgaWYgKHJlcXVlc3QuYWxs b3dzQ2FjaGluZygpICYmIG1lbW9yeUNhY2hlLmRpc2FibGVkKCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCmluZGV4IGQ5ZTJlMzFk OWZkOTVhNjUzMmI5M2ZiMzA0MjlmMjQwNWVhN2YyZTcuLjY5NTM4OWRjYjIxYmMwMmE1ZTFhYzZl N2NkNWJhOWRkYmRhNzMzMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCkBAIC0xNzEsNyArMTcxLDcgQEAgcHJpdmF0ZToKICAg ICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gbG9hZFJlc291cmNlKENhY2hl ZFJlc291cmNlOjpUeXBlLCBQQUw6OlNlc3Npb25JRCwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYs IGNvbnN0IENvb2tpZUphciYpOwogCiAgICAgdm9pZCBwcmVwYXJlRmV0Y2goQ2FjaGVkUmVzb3Vy Y2U6OlR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYpOwotICAgIHZvaWQgdXBkYXRlSFRUUFJl cXVlc3RIZWFkZXJzKENhY2hlZFJlc291cmNlOjpUeXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qm KTsKKyAgICB2b2lkIHVwZGF0ZUhUVFBSZXF1ZXN0SGVhZGVycyhGcmFtZUxvYWRlciYsIENhY2hl ZFJlc291cmNlOjpUeXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmKTsKIAogICAgIGJvb2wgY2Fu UmVxdWVzdChDYWNoZWRSZXNvdXJjZTo6VHlwZSwgY29uc3QgVVJMJiwgY29uc3QgQ2FjaGVkUmVz b3VyY2VSZXF1ZXN0JiwgRm9yUHJlbG9hZCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHAKaW5kZXggZDc2MzI0MmVhMmYx ZjBkOTQ5MGMwYjM4NDJkNTEwOGQ3MTQ4M2ZlYS4uNTQ2MTk1NTM4ZGUwYmI4NmM0YzIwZGFkZDNl MGRlY2Q0MzhlNzYzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHAKQEAgLTIyMSwxNCArMjIxLDEzIEBAIHZvaWQgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlclBvbGljeShSZWZlcnJlclBvbGljeSBk ZWZhdWx0UG9saWN5KQogICAgICAgICBtX29wdGlvbnMucmVmZXJyZXJQb2xpY3kgPSBkZWZhdWx0 UG9saWN5OwogfQogCi12b2lkIENhY2hlZFJlc291cmNlUmVxdWVzdDo6dXBkYXRlUmVmZXJyZXJP cmlnaW5BbmRVc2VyQWdlbnRIZWFkZXJzKEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlcikKK3ZvaWQg Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlckFuZE9yaWdpbkhlYWRlcnMoRnJh bWVMb2FkZXImIGZyYW1lTG9hZGVyKQogewogICAgIC8vIEltcGxlbWVudGluZyBzdGVwIDkgdG8g MTEgb2YgaHR0cHM6Ly9mZXRjaC5zcGVjLndoYXR3Zy5vcmcvI2h0dHAtbmV0d29yay1vci1jYWNo ZS1mZXRjaCBhcyBvZiAxNiBNYXJjaCAyMDE4CiAgICAgU3RyaW5nIG91dGdvaW5nUmVmZXJyZXIg PSBmcmFtZUxvYWRlci5vdXRnb2luZ1JlZmVycmVyKCk7CiAgICAgaWYgKG1fcmVzb3VyY2VSZXF1 ZXN0Lmhhc0hUVFBSZWZlcnJlcigpKQogICAgICAgICBvdXRnb2luZ1JlZmVycmVyID0gbV9yZXNv dXJjZVJlcXVlc3QuaHR0cFJlZmVycmVyKCk7CiAgICAgdXBkYXRlUmVxdWVzdFJlZmVycmVyKG1f cmVzb3VyY2VSZXF1ZXN0LCBtX29wdGlvbnMucmVmZXJyZXJQb2xpY3ksIG91dGdvaW5nUmVmZXJy ZXIpOwotICAgIGZyYW1lTG9hZGVyLmFwcGx5VXNlckFnZW50SWZOZWVkZWQobV9yZXNvdXJjZVJl cXVlc3QpOwogCiAgICAgaWYgKGRvZXNSZXF1ZXN0TmVlZEhUVFBPcmlnaW5IZWFkZXIobV9yZXNv dXJjZVJlcXVlc3QpKSB7CiAgICAgICAgIGF1dG8gb3V0Z29pbmdPcmlnaW4gPSBTZWN1cml0eU9y aWdpbjo6Y3JlYXRlRnJvbVN0cmluZyhvdXRnb2luZ1JlZmVycmVyKTsKQEAgLTIzOSw2ICsyMzgs MTEgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZVJlZmVycmVyT3JpZ2luQW5k VXNlckFnZW50SGVhZGVycyhGcmFtZUxvYWRlciYKICAgICB9CiB9CiAKK3ZvaWQgQ2FjaGVkUmVz b3VyY2VSZXF1ZXN0Ojp1cGRhdGVVc2VyQWdlbnRIZWFkZXIoRnJhbWVMb2FkZXImIGZyYW1lTG9h ZGVyKQoreworICAgIGZyYW1lTG9hZGVyLmFwcGx5VXNlckFnZW50SWZOZWVkZWQobV9yZXNvdXJj ZVJlcXVlc3QpOworfQorCiBib29sIGlzUmVxdWVzdENyb3NzT3JpZ2luKFNlY3VyaXR5T3JpZ2lu KiBvcmlnaW4sIGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRp b25zJiBvcHRpb25zKQogewogICAgIGlmICghb3JpZ2luKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5oIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5oCmluZGV4IGY0YjAyYjg2ZjFj MzM2OTYwOGUwNTk3YzA0NTI0NDQyOWQ1ZWJmMDYuLjM3MTNhZTUxZDAzOTM1N2Y3NWUwYzgwNGE5 YzEwZGU4YmQ0YmUwNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZVJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmgKQEAgLTc4LDcgKzc4LDggQEAgcHVibGljOgogICAgIHZv aWQgdXBkYXRlRm9yQWNjZXNzQ29udHJvbChEb2N1bWVudCYpOwogCiAgICAgdm9pZCB1cGRhdGVS ZWZlcnJlclBvbGljeShSZWZlcnJlclBvbGljeSk7Ci0gICAgdm9pZCB1cGRhdGVSZWZlcnJlck9y aWdpbkFuZFVzZXJBZ2VudEhlYWRlcnMoRnJhbWVMb2FkZXImKTsKKyAgICB2b2lkIHVwZGF0ZVJl ZmVycmVyQW5kT3JpZ2luSGVhZGVycyhGcmFtZUxvYWRlciYpOworICAgIHZvaWQgdXBkYXRlVXNl ckFnZW50SGVhZGVyKEZyYW1lTG9hZGVyJik7CiAgICAgdm9pZCB1cGdyYWRlSW5zZWN1cmVSZXF1 ZXN0SWZOZWVkZWQoRG9jdW1lbnQmKTsKICAgICB2b2lkIHNldEFjY2VwdEhlYWRlcklmTm9uZShD YWNoZWRSZXNvdXJjZTo6VHlwZSk7CiAgICAgdm9pZCB1cGRhdGVBY2NvcmRpbmdDYWNoZU1vZGUo KTsK 394589 2020-03-26 03:33:06 -0700 2020-03-26 04:13:45 -0700 Patch bug-209587-20200326113305.patch text/plain 9523 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgwNWE1MWFmZTFkMGQw Y2RhZmU1Yjg4MjE0ZWJiOWVjNTJkMTNjZC4uNDRjNDBiMTJiMjI5NTJkYzUxMWNlY2VjMzNhMGJh YjQxMGI4OWNjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTAzLTI2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBhcHBseVVzZXJBZ2VudElm TmVlZGVkIGNhbGxzIHRvIGEgbW9yZSBjZW50cmFsIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk1ODcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIG1haW4gcmVzb3VyY2UgbG9hZHMgc3Rv cCBjYWxsaW5nIGFwcGx5VXNlckFnZW50SWZOZWVkZWQKKyAgICAgICAgYW5kIGluc3RlYWQgZG8g aXQgaW4gdGhlIENhY2hlZFJlc291cmNlTG9hZGVyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxk c1RvUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFJlc291cmNl U3luY2hyb25vdXNseSk6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2Fj aGVHcm91cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmNy ZWF0ZVJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6dXBkYXRlSFRU UFJlcXVlc3RIZWFkZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVy OjpyZXF1ZXN0UmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZl cnJlckFuZE9yaWdpbkhlYWRlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VS ZXF1ZXN0Ojp1cGRhdGVVc2VyQWdlbnRIZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVk UmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlck9yaWdpbkFuZFVzZXJBZ2VudEhlYWRlcnMp OiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3Qu aDoKKwogMjAyMC0wMy0yNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAg IFRha2UgaW50byBhY2NvdW50IHJlZmVycmVyLXBvbGljeSBpbiBhcHBlbmQgT3JpZ2luIGhlYWRl ciBhbGdvcml0aG0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4 IGRmODhjODQ1YzNjZmVkNTFmN2RkMjcwYTgxMGM4YzI0N2M4ODczNWUuLmE4NTIwYzUyYjU2ZDYz OWEwYjY3NGVlYTQyMWI1NjUzNmI0NGI0OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmNwcApAQCAtMTgxNiw3ICsxODE2LDYgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6 c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCkKICAgICAvLyBNYWtlIHN1cmUgd2UgcmUtYXBwbHkg dGhlIHVzZXIgYWdlbnQgdG8gdGhlIERvY3VtZW50J3MgUmVzb3VyY2VSZXF1ZXN0IHVwb24gcmVs b2FkIGluIGNhc2UgdGhlIGVtYmVkZGluZwogICAgIC8vIGFwcGxpY2F0aW9uIGhhcyBjaGFuZ2Vk IGl0LgogICAgIG1fcmVxdWVzdC5jbGVhckhUVFBVc2VyQWdlbnQoKTsKLSAgICBmcmFtZUxvYWRl cigpLT5hZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChtX3JlcXVlc3QpOwogCiAg ICAgQVNTRVJUKHRpbWluZygpLnN0YXJ0VGltZSgpKTsKICAgICBBU1NFUlQodGltaW5nKCkuZmV0 Y2hTdGFydCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDg3OWEw ZDM4YjU0NGJjNGQ3OWU0NGRhNWE4NTVlZTQ5ZDQwMzA2YjMuLjg4MzMzNDRhNTBlYmUyZjIxZTEy MjA3Nzc5ZDcyN2I4OWE1YjI3YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cApAQCAtMjk3Niw4ICsyOTc2LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNU b1JlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGcmFtZUxvYWRUeXAKICAgICBpZiAo bV9vdmVycmlkZVJlc291cmNlTG9hZFByaW9yaXR5Rm9yVGVzdGluZykKICAgICAgICAgcmVxdWVz dC5zZXRQcmlvcml0eShtX292ZXJyaWRlUmVzb3VyY2VMb2FkUHJpb3JpdHlGb3JUZXN0aW5nLnZh bHVlKCkpOwogCi0gICAgYXBwbHlVc2VyQWdlbnRJZk5lZWRlZChyZXF1ZXN0KTsKLQogICAgIC8v IE9ubHkgc2V0IGZhbGxiYWNrIGFycmF5IGlmIGl0J3Mgc3RpbGwgZW1wdHkgKGxhdGVyIGF0dGVt cHRzIG1heSBiZSBpbmNvcnJlY3QsIHNlZSBidWcgMTE3ODE4KS4KICAgICBpZiAocmVxdWVzdC5y ZXNwb25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSgpLmlzRW1wdHko KSkgewogICAgICAgICAvLyBBbHdheXMgdHJ5IFVURi04LiBJZiB0aGF0IGZhaWxzLCB0cnkgZnJh bWUgZW5jb2RpbmcgKGlmIGFueSkgYW5kIHRoZW4gdGhlIGRlZmF1bHQuCkBAIC0zMDg4LDYgKzMw ODYsNyBAQCB1bnNpZ25lZCBsb25nIEZyYW1lTG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91 c2x5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdQogICAgIGluaXRpYWxSZXF1ZXN0LnNldEZp cnN0UGFydHlGb3JDb29raWVzKG1fZnJhbWUubWFpbkZyYW1lKCkubG9hZGVyKCkuZG9jdW1lbnRM b2FkZXIoKS0+cmVxdWVzdCgpLnVybCgpKTsKICAgICAKICAgICBhZGRFeHRyYUZpZWxkc1RvU3Vi cmVzb3VyY2VSZXF1ZXN0KGluaXRpYWxSZXF1ZXN0KTsKKyAgICBhcHBseVVzZXJBZ2VudElmTmVl ZGVkKGluaXRpYWxSZXF1ZXN0KTsKIAogICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciA9IDA7 ICAgIAogICAgIFJlc291cmNlUmVxdWVzdCBuZXdSZXF1ZXN0KGluaXRpYWxSZXF1ZXN0KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hl R3JvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2Fj aGVHcm91cC5jcHAKaW5kZXggNjBjMjRiZjc4YzFhYmI4NmZiYWVjZjQ1ZTkxNjUyMTA1YWFlYzc5 NC4uYjYzZGY3ZTBhMTY0YmZlMTU3NjU0OWJhMmU4YTI1YjlmMTU3MGNhYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91 cC5jcHAKQEAgLTQ2Myw3ICs0NjMsNiBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6dXBk YXRlKEZyYW1lJiBmcmFtZSwgQXBwbGljYXRpb25DYWNoZVVwZGF0ZU9wdGlvbiB1cAogUmVzb3Vy Y2VSZXF1ZXN0IEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6Y3JlYXRlUmVxdWVzdChVUkwmJiB1cmws IEFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZSogcmVzb3VyY2UpCiB7CiAgICAgUmVzb3VyY2VSZXF1 ZXN0IHJlcXVlc3QgeyBXVEZNb3ZlKHVybCkgfTsKLSAgICBtX2ZyYW1lLT5sb2FkZXIoKS5hcHBs eVVzZXJBZ2VudElmTmVlZGVkKHJlcXVlc3QpOwogICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZp ZWxkKEhUVFBIZWFkZXJOYW1lOjpDYWNoZUNvbnRyb2wsIEhUVFBIZWFkZXJWYWx1ZXM6Om1heEFn ZTAoKSk7CiAKICAgICBpZiAocmVzb3VyY2UpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGIyMGUxY2M2YWYyYWI1 Y2IzYTNhNjU4YTZjZTQwMjg0NmI4YzZlMjkuLjA5MGFlNDU2OGY2NmM3MDlhNTU3MWRlZDFmNWMy NTExYzc0ZDdiZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtNzMzLDE3ICs3MzMsMTQgQEAgdm9pZCBDYWNoZWRS ZXNvdXJjZUxvYWRlcjo6cHJlcGFyZUZldGNoKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIENh Y2hlZFJlc291cmMKICAgICAvLyBGSVhNRTogRGVjaWRlIHdoZXRoZXIgdG8gc3VwcG9ydCBjbGll bnQgaGludHMKIH0KIAotdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6dXBkYXRlSFRUUFJlcXVl c3RIZWFkZXJzKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCkKK3ZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnVwZGF0ZUhUVFBSZXF1ZXN0 SGVhZGVycyhGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIsIENhY2hlZFJlc291cmNlOjpUeXBlIHR5 cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICAvLyBJbXBsZW1lbnRp bmcgc3RlcHMgNyB0byAxMiBvZiBodHRwczovL2ZldGNoLnNwZWMud2hhdHdnLm9yZy8jaHR0cC1u ZXR3b3JrLW9yLWNhY2hlLWZldGNoCiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHJlY29uY2ls ZSBoYW5kbGluZyBvZiBNYWluUmVzb3VyY2Ugd2l0aCBvdGhlciByZXNvdXJjZXMuCi0gICAgaWYg KHR5cGUgIT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Ok1haW5SZXNvdXJjZSkgewotICAgICAgICAv LyBJbiBzb21lIGNhc2VzIHdlIG1heSB0cnkgdG8gbG9hZCByZXNvdXJjZXMgaW4gZnJhbWVsZXNz IGRvY3VtZW50cy4gU3VjaCBsb2FkcyBhbHdheXMgZmFpbC4KLSAgICAgICAgLy8gRklYTUU6IFdl IHNob3VsZG4ndCBuZWVkIHRvIGRvIHRoZSBjaGVjayBvbiBmcmFtZS4KLSAgICAgICAgaWYgKGF1 dG8qIGZyYW1lID0gdGhpcy0+ZnJhbWUoKSkKLSAgICAgICAgICAgIHJlcXVlc3QudXBkYXRlUmVm ZXJyZXJPcmlnaW5BbmRVc2VyQWdlbnRIZWFkZXJzKGZyYW1lLT5sb2FkZXIoKSk7Ci0gICAgfQor ICAgIGlmICh0eXBlICE9IENhY2hlZFJlc291cmNlOjpUeXBlOjpNYWluUmVzb3VyY2UpCisgICAg ICAgIHJlcXVlc3QudXBkYXRlUmVmZXJyZXJBbmRPcmlnaW5IZWFkZXJzKGZyYW1lTG9hZGVyKTsK KyAgICByZXF1ZXN0LnVwZGF0ZVVzZXJBZ2VudEhlYWRlcihmcmFtZUxvYWRlcik7CiAKICAgICBy ZXF1ZXN0LnVwZGF0ZUFjY29yZGluZ0NhY2hlTW9kZSgpOwogICAgIHJlcXVlc3QudXBkYXRlQWNj ZXB0RW5jb2RpbmdIZWFkZXIoKTsKQEAgLTg4OCw3ICs4ODUsNyBAQCBSZXNvdXJjZUVycm9yT3I8 Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+PiBDYWNoZWRSZXNvdXJjZUxvYWRl cjo6cmVxdQogICAgIEluaXRpYXRvckNvbnRleHQgaW5pdGlhdG9yQ29udGV4dCA9IHJlcXVlc3Qu b3B0aW9ucygpLmluaXRpYXRvckNvbnRleHQ7CiAKICAgICBpZiAocmVxdWVzdC5yZXNvdXJjZVJl cXVlc3QoKS51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkpCi0gICAgICAgIHVwZGF0ZUhU VFBSZXF1ZXN0SGVhZGVycyh0eXBlLCByZXF1ZXN0KTsKKyAgICAgICAgdXBkYXRlSFRUUFJlcXVl c3RIZWFkZXJzKGZyYW1lLmxvYWRlcigpLCB0eXBlLCByZXF1ZXN0KTsKIAogICAgIGF1dG8mIG1l bW9yeUNhY2hlID0gTWVtb3J5Q2FjaGU6OnNpbmdsZXRvbigpOwogICAgIGlmIChyZXF1ZXN0LmFs bG93c0NhY2hpbmcoKSAmJiBtZW1vcnlDYWNoZS5kaXNhYmxlZCgpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaAppbmRleCBkOWUyZTMx ZDlmZDk1YTY1MzJiOTNmYjMwNDI5ZjI0MDVlYTdmMmU3Li42OTUzODlkY2IyMWJjMDJhNWUxYWM2 ZTdjZDViYTlkZGJkYTczMzA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaApAQCAtMTcxLDcgKzE3MSw3IEBAIHByaXZhdGU6CiAg ICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IGxvYWRSZXNvdXJjZShDYWNo ZWRSZXNvdXJjZTo6VHlwZSwgUEFMOjpTZXNzaW9uSUQsIENhY2hlZFJlc291cmNlUmVxdWVzdCYm LCBjb25zdCBDb29raWVKYXImKTsKIAogICAgIHZvaWQgcHJlcGFyZUZldGNoKENhY2hlZFJlc291 cmNlOjpUeXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmKTsKLSAgICB2b2lkIHVwZGF0ZUhUVFBS ZXF1ZXN0SGVhZGVycyhDYWNoZWRSZXNvdXJjZTo6VHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0 Jik7CisgICAgdm9pZCB1cGRhdGVIVFRQUmVxdWVzdEhlYWRlcnMoRnJhbWVMb2FkZXImLCBDYWNo ZWRSZXNvdXJjZTo6VHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Jik7CiAKICAgICBib29sIGNh blJlcXVlc3QoQ2FjaGVkUmVzb3VyY2U6OlR5cGUsIGNvbnN0IFVSTCYsIGNvbnN0IENhY2hlZFJl c291cmNlUmVxdWVzdCYsIEZvclByZWxvYWQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCmluZGV4IGQ3NjMyNDJlYTJm MWYwZDk0OTBjMGIzODQyZDUxMDhkNzE0ODNmZWEuLjU0NjE5NTUzOGRlMGJiODZjNGMyMGRhZGQz ZTBkZWNkNDM4ZTc2M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCkBAIC0yMjEsMTQgKzIyMSwxMyBAQCB2b2lkIENh Y2hlZFJlc291cmNlUmVxdWVzdDo6dXBkYXRlUmVmZXJyZXJQb2xpY3koUmVmZXJyZXJQb2xpY3kg ZGVmYXVsdFBvbGljeSkKICAgICAgICAgbV9vcHRpb25zLnJlZmVycmVyUG9saWN5ID0gZGVmYXVs dFBvbGljeTsKIH0KIAotdm9pZCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZVJlZmVycmVy T3JpZ2luQW5kVXNlckFnZW50SGVhZGVycyhGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIpCit2b2lk IENhY2hlZFJlc291cmNlUmVxdWVzdDo6dXBkYXRlUmVmZXJyZXJBbmRPcmlnaW5IZWFkZXJzKEZy YW1lTG9hZGVyJiBmcmFtZUxvYWRlcikKIHsKICAgICAvLyBJbXBsZW1lbnRpbmcgc3RlcCA5IHRv IDExIG9mIGh0dHBzOi8vZmV0Y2guc3BlYy53aGF0d2cub3JnLyNodHRwLW5ldHdvcmstb3ItY2Fj aGUtZmV0Y2ggYXMgb2YgMTYgTWFyY2ggMjAxOAogICAgIFN0cmluZyBvdXRnb2luZ1JlZmVycmVy ID0gZnJhbWVMb2FkZXIub3V0Z29pbmdSZWZlcnJlcigpOwogICAgIGlmIChtX3Jlc291cmNlUmVx dWVzdC5oYXNIVFRQUmVmZXJyZXIoKSkKICAgICAgICAgb3V0Z29pbmdSZWZlcnJlciA9IG1fcmVz b3VyY2VSZXF1ZXN0Lmh0dHBSZWZlcnJlcigpOwogICAgIHVwZGF0ZVJlcXVlc3RSZWZlcnJlciht X3Jlc291cmNlUmVxdWVzdCwgbV9vcHRpb25zLnJlZmVycmVyUG9saWN5LCBvdXRnb2luZ1JlZmVy cmVyKTsKLSAgICBmcmFtZUxvYWRlci5hcHBseVVzZXJBZ2VudElmTmVlZGVkKG1fcmVzb3VyY2VS ZXF1ZXN0KTsKIAogICAgIGlmIChkb2VzUmVxdWVzdE5lZWRIVFRQT3JpZ2luSGVhZGVyKG1fcmVz b3VyY2VSZXF1ZXN0KSkgewogICAgICAgICBhdXRvIG91dGdvaW5nT3JpZ2luID0gU2VjdXJpdHlP cmlnaW46OmNyZWF0ZUZyb21TdHJpbmcob3V0Z29pbmdSZWZlcnJlcik7CkBAIC0yMzksNiArMjM4 LDExIEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlck9yaWdpbkFu ZFVzZXJBZ2VudEhlYWRlcnMoRnJhbWVMb2FkZXImCiAgICAgfQogfQogCit2b2lkIENhY2hlZFJl c291cmNlUmVxdWVzdDo6dXBkYXRlVXNlckFnZW50SGVhZGVyKEZyYW1lTG9hZGVyJiBmcmFtZUxv YWRlcikKK3sKKyAgICBmcmFtZUxvYWRlci5hcHBseVVzZXJBZ2VudElmTmVlZGVkKG1fcmVzb3Vy Y2VSZXF1ZXN0KTsKK30KKwogYm9vbCBpc1JlcXVlc3RDcm9zc09yaWdpbihTZWN1cml0eU9yaWdp biogb3JpZ2luLCBjb25zdCBVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IFJlc291cmNlTG9hZGVyT3B0 aW9ucyYgb3B0aW9ucykKIHsKICAgICBpZiAoIW9yaWdpbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuaAppbmRleCBmNGIwMmI4NmYx YzMzNjk2MDhlMDU5N2MwNDUyNDQ0MjlkNWViZjA2Li4zNzEzYWU1MWQwMzkzNTdmNzVlMGM4MDRh OWMxMGRlOGJkNGJlMDU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlUmVxdWVzdC5oCkBAIC03OCw3ICs3OCw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIHVwZGF0ZUZvckFjY2Vzc0NvbnRyb2woRG9jdW1lbnQmKTsKIAogICAgIHZvaWQgdXBkYXRl UmVmZXJyZXJQb2xpY3koUmVmZXJyZXJQb2xpY3kpOwotICAgIHZvaWQgdXBkYXRlUmVmZXJyZXJP cmlnaW5BbmRVc2VyQWdlbnRIZWFkZXJzKEZyYW1lTG9hZGVyJik7CisgICAgdm9pZCB1cGRhdGVS ZWZlcnJlckFuZE9yaWdpbkhlYWRlcnMoRnJhbWVMb2FkZXImKTsKKyAgICB2b2lkIHVwZGF0ZVVz ZXJBZ2VudEhlYWRlcihGcmFtZUxvYWRlciYpOwogICAgIHZvaWQgdXBncmFkZUluc2VjdXJlUmVx dWVzdElmTmVlZGVkKERvY3VtZW50Jik7CiAgICAgdm9pZCBzZXRBY2NlcHRIZWFkZXJJZk5vbmUo Q2FjaGVkUmVzb3VyY2U6OlR5cGUpOwogICAgIHZvaWQgdXBkYXRlQWNjb3JkaW5nQ2FjaGVNb2Rl KCk7Cg== 394594 2020-03-26 04:13:49 -0700 2020-04-22 12:05:02 -0700 Patch bug-209587-20200326121347.patch text/plain 8369 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgwNWE1MWFmZTFkMGQw Y2RhZmU1Yjg4MjE0ZWJiOWVjNTJkMTNjZC4uYzk0YmIxOTdlMDgxM2JkZWEzNTBlMGU3YWNmNzcw MTk3MGQwZGIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAzLTI2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBhcHBseVVzZXJBZ2VudElm TmVlZGVkIGNhbGxzIHRvIGEgbW9yZSBjZW50cmFsIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk1ODcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIG1haW4gcmVzb3VyY2UgbG9hZHMgc3Rv cCBjYWxsaW5nIGFwcGx5VXNlckFnZW50SWZOZWVkZWQKKyAgICAgICAgYW5kIGluc3RlYWQgZG8g aXQgaW4gdGhlIENhY2hlZFJlc291cmNlTG9hZGVyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxk c1RvUmVxdWVzdCk6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVH cm91cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmNyZWF0 ZVJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6dXBkYXRlSFRUUFJl cXVlc3RIZWFkZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpy ZXF1ZXN0UmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxv YWRlci5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJl ckFuZE9yaWdpbkhlYWRlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VSZXF1 ZXN0Ojp1cGRhdGVVc2VyQWdlbnRIZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVz b3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlck9yaWdpbkFuZFVzZXJBZ2VudEhlYWRlcnMpOiBE ZWxldGVkLgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuaDoK KwogMjAyMC0wMy0yNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFRh a2UgaW50byBhY2NvdW50IHJlZmVycmVyLXBvbGljeSBpbiBhcHBlbmQgT3JpZ2luIGhlYWRlciBh bGdvcml0aG0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDg3OWEwZDM4 YjU0NGJjNGQ3OWU0NGRhNWE4NTVlZTQ5ZDQwMzA2YjMuLjZlYmRlNTBkZjlmOTI3OTNmMzY2MjJm ODU2MjY1M2JkNTVjOTAwZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApA QCAtMjk3Niw4ICsyOTc2LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb1Jl cXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGcmFtZUxvYWRUeXAKICAgICBpZiAobV9v dmVycmlkZVJlc291cmNlTG9hZFByaW9yaXR5Rm9yVGVzdGluZykKICAgICAgICAgcmVxdWVzdC5z ZXRQcmlvcml0eShtX292ZXJyaWRlUmVzb3VyY2VMb2FkUHJpb3JpdHlGb3JUZXN0aW5nLnZhbHVl KCkpOwogCi0gICAgYXBwbHlVc2VyQWdlbnRJZk5lZWRlZChyZXF1ZXN0KTsKLQogICAgIC8vIE9u bHkgc2V0IGZhbGxiYWNrIGFycmF5IGlmIGl0J3Mgc3RpbGwgZW1wdHkgKGxhdGVyIGF0dGVtcHRz IG1heSBiZSBpbmNvcnJlY3QsIHNlZSBidWcgMTE3ODE4KS4KICAgICBpZiAocmVxdWVzdC5yZXNw b25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSgpLmlzRW1wdHkoKSkg ewogICAgICAgICAvLyBBbHdheXMgdHJ5IFVURi04LiBJZiB0aGF0IGZhaWxzLCB0cnkgZnJhbWUg ZW5jb2RpbmcgKGlmIGFueSkgYW5kIHRoZW4gdGhlIGRlZmF1bHQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCmlu ZGV4IDYwYzI0YmY3OGMxYWJiODZmYmFlY2Y0NWU5MTY1MjEwNWFhZWM3OTQuLmI2M2RmN2UwYTE2 NGJmZTE1NzY1NDliYTJlOGEyNWI5ZjE1NzBjYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCkBAIC00NjMs NyArNDYzLDYgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OnVwZGF0ZShGcmFtZSYgZnJh bWUsIEFwcGxpY2F0aW9uQ2FjaGVVcGRhdGVPcHRpb24gdXAKIFJlc291cmNlUmVxdWVzdCBBcHBs aWNhdGlvbkNhY2hlR3JvdXA6OmNyZWF0ZVJlcXVlc3QoVVJMJiYgdXJsLCBBcHBsaWNhdGlvbkNh Y2hlUmVzb3VyY2UqIHJlc291cmNlKQogewogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0IHsg V1RGTW92ZSh1cmwpIH07Ci0gICAgbV9mcmFtZS0+bG9hZGVyKCkuYXBwbHlVc2VyQWdlbnRJZk5l ZWRlZChyZXF1ZXN0KTsKICAgICByZXF1ZXN0LnNldEhUVFBIZWFkZXJGaWVsZChIVFRQSGVhZGVy TmFtZTo6Q2FjaGVDb250cm9sLCBIVFRQSGVhZGVyVmFsdWVzOjptYXhBZ2UwKCkpOwogCiAgICAg aWYgKHJlc291cmNlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmNwcAppbmRleCBiMjBlMWNjNmFmMmFiNWNiM2EzYTY1OGE2Y2U0 MDI4NDZiOGM2ZTI5Li4wOTBhZTQ1NjhmNjZjNzA5YTU1NzFkZWQxZjVjMjUxMWM3NGQ3YmY2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxv YWRlci5jcHAKQEAgLTczMywxNyArNzMzLDE0IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6 OnByZXBhcmVGZXRjaChDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBDYWNoZWRSZXNvdXJjCiAg ICAgLy8gRklYTUU6IERlY2lkZSB3aGV0aGVyIHRvIHN1cHBvcnQgY2xpZW50IGhpbnRzCiB9CiAK LXZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnVwZGF0ZUhUVFBSZXF1ZXN0SGVhZGVycyhDYWNo ZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCit2 b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjp1cGRhdGVIVFRQUmVxdWVzdEhlYWRlcnMoRnJhbWVM b2FkZXImIGZyYW1lTG9hZGVyLCBDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBDYWNoZWRSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgLy8gSW1wbGVtZW50aW5nIHN0ZXBzIDcgdG8g MTIgb2YgaHR0cHM6Ly9mZXRjaC5zcGVjLndoYXR3Zy5vcmcvI2h0dHAtbmV0d29yay1vci1jYWNo ZS1mZXRjaAogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCByZWNvbmNpbGUgaGFuZGxpbmcgb2Yg TWFpblJlc291cmNlIHdpdGggb3RoZXIgcmVzb3VyY2VzLgotICAgIGlmICh0eXBlICE9IENhY2hl ZFJlc291cmNlOjpUeXBlOjpNYWluUmVzb3VyY2UpIHsKLSAgICAgICAgLy8gSW4gc29tZSBjYXNl cyB3ZSBtYXkgdHJ5IHRvIGxvYWQgcmVzb3VyY2VzIGluIGZyYW1lbGVzcyBkb2N1bWVudHMuIFN1 Y2ggbG9hZHMgYWx3YXlzIGZhaWwuCi0gICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGRuJ3QgbmVl ZCB0byBkbyB0aGUgY2hlY2sgb24gZnJhbWUuCi0gICAgICAgIGlmIChhdXRvKiBmcmFtZSA9IHRo aXMtPmZyYW1lKCkpCi0gICAgICAgICAgICByZXF1ZXN0LnVwZGF0ZVJlZmVycmVyT3JpZ2luQW5k VXNlckFnZW50SGVhZGVycyhmcmFtZS0+bG9hZGVyKCkpOwotICAgIH0KKyAgICBpZiAodHlwZSAh PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6TWFpblJlc291cmNlKQorICAgICAgICByZXF1ZXN0LnVw ZGF0ZVJlZmVycmVyQW5kT3JpZ2luSGVhZGVycyhmcmFtZUxvYWRlcik7CisgICAgcmVxdWVzdC51 cGRhdGVVc2VyQWdlbnRIZWFkZXIoZnJhbWVMb2FkZXIpOwogCiAgICAgcmVxdWVzdC51cGRhdGVB Y2NvcmRpbmdDYWNoZU1vZGUoKTsKICAgICByZXF1ZXN0LnVwZGF0ZUFjY2VwdEVuY29kaW5nSGVh ZGVyKCk7CkBAIC04ODgsNyArODg1LDcgQEAgUmVzb3VyY2VFcnJvck9yPENhY2hlZFJlc291cmNl SGFuZGxlPENhY2hlZFJlc291cmNlPj4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXUKICAgICBJ bml0aWF0b3JDb250ZXh0IGluaXRpYXRvckNvbnRleHQgPSByZXF1ZXN0Lm9wdGlvbnMoKS5pbml0 aWF0b3JDb250ZXh0OwogCiAgICAgaWYgKHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkudXJsKCku cHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQotICAgICAgICB1cGRhdGVIVFRQUmVxdWVzdEhlYWRl cnModHlwZSwgcmVxdWVzdCk7CisgICAgICAgIHVwZGF0ZUhUVFBSZXF1ZXN0SGVhZGVycyhmcmFt ZS5sb2FkZXIoKSwgdHlwZSwgcmVxdWVzdCk7CiAKICAgICBhdXRvJiBtZW1vcnlDYWNoZSA9IE1l bW9yeUNhY2hlOjpzaW5nbGV0b24oKTsKICAgICBpZiAocmVxdWVzdC5hbGxvd3NDYWNoaW5nKCkg JiYgbWVtb3J5Q2FjaGUuZGlzYWJsZWQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmgKaW5kZXggZDllMmUzMWQ5ZmQ5NWE2NTMyYjkz ZmIzMDQyOWYyNDA1ZWE3ZjJlNy4uNjk1Mzg5ZGNiMjFiYzAyYTVlMWFjNmU3Y2Q1YmE5ZGRiZGE3 MzMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmgKQEAgLTE3MSw3ICsxNzEsNyBAQCBwcml2YXRlOgogICAgIENhY2hlZFJlc291 cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBsb2FkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OlR5 cGUsIFBBTDo6U2Vzc2lvbklELCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmJiwgY29uc3QgQ29va2ll SmFyJik7CiAKICAgICB2b2lkIHByZXBhcmVGZXRjaChDYWNoZWRSZXNvdXJjZTo6VHlwZSwgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0Jik7Ci0gICAgdm9pZCB1cGRhdGVIVFRQUmVxdWVzdEhlYWRlcnMo Q2FjaGVkUmVzb3VyY2U6OlR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYpOworICAgIHZvaWQg dXBkYXRlSFRUUFJlcXVlc3RIZWFkZXJzKEZyYW1lTG9hZGVyJiwgQ2FjaGVkUmVzb3VyY2U6OlR5 cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYpOwogCiAgICAgYm9vbCBjYW5SZXF1ZXN0KENhY2hl ZFJlc291cmNlOjpUeXBlLCBjb25zdCBVUkwmLCBjb25zdCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qm LCBGb3JQcmVsb2FkKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcAppbmRleCBkNzYzMjQyZWEyZjFmMGQ5NDkwYzBiMzg0 MmQ1MTA4ZDcxNDgzZmVhLi41NDYxOTU1MzhkZTBiYjg2YzRjMjBkYWRkM2UwZGVjZDQzOGU3NjNm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VS ZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0LmNwcApAQCAtMjIxLDE0ICsyMjEsMTMgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZVJl cXVlc3Q6OnVwZGF0ZVJlZmVycmVyUG9saWN5KFJlZmVycmVyUG9saWN5IGRlZmF1bHRQb2xpY3kp CiAgICAgICAgIG1fb3B0aW9ucy5yZWZlcnJlclBvbGljeSA9IGRlZmF1bHRQb2xpY3k7CiB9CiAK LXZvaWQgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlck9yaWdpbkFuZFVzZXJB Z2VudEhlYWRlcnMoRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyKQordm9pZCBDYWNoZWRSZXNvdXJj ZVJlcXVlc3Q6OnVwZGF0ZVJlZmVycmVyQW5kT3JpZ2luSGVhZGVycyhGcmFtZUxvYWRlciYgZnJh bWVMb2FkZXIpCiB7CiAgICAgLy8gSW1wbGVtZW50aW5nIHN0ZXAgOSB0byAxMSBvZiBodHRwczov L2ZldGNoLnNwZWMud2hhdHdnLm9yZy8jaHR0cC1uZXR3b3JrLW9yLWNhY2hlLWZldGNoIGFzIG9m IDE2IE1hcmNoIDIwMTgKICAgICBTdHJpbmcgb3V0Z29pbmdSZWZlcnJlciA9IGZyYW1lTG9hZGVy Lm91dGdvaW5nUmVmZXJyZXIoKTsKICAgICBpZiAobV9yZXNvdXJjZVJlcXVlc3QuaGFzSFRUUFJl ZmVycmVyKCkpCiAgICAgICAgIG91dGdvaW5nUmVmZXJyZXIgPSBtX3Jlc291cmNlUmVxdWVzdC5o dHRwUmVmZXJyZXIoKTsKICAgICB1cGRhdGVSZXF1ZXN0UmVmZXJyZXIobV9yZXNvdXJjZVJlcXVl c3QsIG1fb3B0aW9ucy5yZWZlcnJlclBvbGljeSwgb3V0Z29pbmdSZWZlcnJlcik7Ci0gICAgZnJh bWVMb2FkZXIuYXBwbHlVc2VyQWdlbnRJZk5lZWRlZChtX3Jlc291cmNlUmVxdWVzdCk7CiAKICAg ICBpZiAoZG9lc1JlcXVlc3ROZWVkSFRUUE9yaWdpbkhlYWRlcihtX3Jlc291cmNlUmVxdWVzdCkp IHsKICAgICAgICAgYXV0byBvdXRnb2luZ09yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVG cm9tU3RyaW5nKG91dGdvaW5nUmVmZXJyZXIpOwpAQCAtMjM5LDYgKzIzOCwxMSBAQCB2b2lkIENh Y2hlZFJlc291cmNlUmVxdWVzdDo6dXBkYXRlUmVmZXJyZXJPcmlnaW5BbmRVc2VyQWdlbnRIZWFk ZXJzKEZyYW1lTG9hZGVyJgogICAgIH0KIH0KIAordm9pZCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6 OnVwZGF0ZVVzZXJBZ2VudEhlYWRlcihGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIpCit7CisgICAg ZnJhbWVMb2FkZXIuYXBwbHlVc2VyQWdlbnRJZk5lZWRlZChtX3Jlc291cmNlUmVxdWVzdCk7Cit9 CisKIGJvb2wgaXNSZXF1ZXN0Q3Jvc3NPcmlnaW4oU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29u c3QgVVJMJiByZXF1ZXN0VVJMLCBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMp CiB7CiAgICAgaWYgKCFvcmlnaW4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmgKaW5kZXggZjRiMDJiODZmMWMzMzY5NjA4ZTA1OTdj MDQ1MjQ0NDI5ZDVlYmYwNi4uMzcxM2FlNTFkMDM5MzU3Zjc1ZTBjODA0YTljMTBkZThiZDRiZTA1 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl UmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZVJlcXVlc3QuaApAQCAtNzgsNyArNzgsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVGb3JB Y2Nlc3NDb250cm9sKERvY3VtZW50Jik7CiAKICAgICB2b2lkIHVwZGF0ZVJlZmVycmVyUG9saWN5 KFJlZmVycmVyUG9saWN5KTsKLSAgICB2b2lkIHVwZGF0ZVJlZmVycmVyT3JpZ2luQW5kVXNlckFn ZW50SGVhZGVycyhGcmFtZUxvYWRlciYpOworICAgIHZvaWQgdXBkYXRlUmVmZXJyZXJBbmRPcmln aW5IZWFkZXJzKEZyYW1lTG9hZGVyJik7CisgICAgdm9pZCB1cGRhdGVVc2VyQWdlbnRIZWFkZXIo RnJhbWVMb2FkZXImKTsKICAgICB2b2lkIHVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RJZk5lZWRlZChE b2N1bWVudCYpOwogICAgIHZvaWQgc2V0QWNjZXB0SGVhZGVySWZOb25lKENhY2hlZFJlc291cmNl OjpUeXBlKTsKICAgICB2b2lkIHVwZGF0ZUFjY29yZGluZ0NhY2hlTW9kZSgpOwo= 397229 2020-04-22 12:05:07 -0700 2020-04-23 13:37:59 -0700 Patch bug-209587-20200422210505.patch text/plain 8778 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRhZjVhMTJlNGNlOGMy MGRlMzNiYjFmNjMzNzBmNDM0MGUwOGVhMi4uMTZmMjY4NzRkNmY0MDQ1NGM4N2Y2MWE1ZWMzODZi NjVhZGVhOWQ4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA0LTIyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBhcHBseVVzZXJBZ2VudElm TmVlZGVkIGNhbGxzIHRvIGEgbW9yZSBjZW50cmFsIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk1ODcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIG1haW4gcmVzb3VyY2UgbG9hZHMgc3Rv cCBjYWxsaW5nIGFwcGx5VXNlckFnZW50SWZOZWVkZWQKKyAgICAgICAgYW5kIGluc3RlYWQgZG8g aXQgaW4gdGhlIENhY2hlZFJlc291cmNlTG9hZGVyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxk c1RvUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFJlc291cmNl U3luY2hyb25vdXNseSk6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2Fj aGVHcm91cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmNy ZWF0ZVJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6dXBkYXRlSFRU UFJlcXVlc3RIZWFkZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVy OjpyZXF1ZXN0UmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZl cnJlckFuZE9yaWdpbkhlYWRlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VS ZXF1ZXN0Ojp1cGRhdGVVc2VyQWdlbnRIZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVk UmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlck9yaWdpbkFuZFVzZXJBZ2VudEhlYWRlcnMp OiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3Qu aDoKKwogMjAyMC0wNC0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIGNvbW1pdCB1cGRhdGVkIHhjZmlsZWxpc3QgZmlsZXMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAzODFmNWQzZjU1YjdmMzVkNTBkNTIwOTYw YzNkNWE1MTcwYTZmMTM5Li43ZmZmODI2OTYwMDhkMzIxMDI1M2Y1MzI2NzJhZjU3MjE1NjJjNGMw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTI5NjIsOCArMjk2Miw2 IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCwgSXNNYWluUmVzb3VyCiAgICAgaWYgKG1fb3ZlcnJpZGVSZXNvdXJjZUxv YWRQcmlvcml0eUZvclRlc3RpbmcpCiAgICAgICAgIHJlcXVlc3Quc2V0UHJpb3JpdHkobV9vdmVy cmlkZVJlc291cmNlTG9hZFByaW9yaXR5Rm9yVGVzdGluZy52YWx1ZSgpKTsKIAotICAgIGFwcGx5 VXNlckFnZW50SWZOZWVkZWQocmVxdWVzdCk7Ci0KICAgICAvLyBPbmx5IHNldCBmYWxsYmFjayBh cnJheSBpZiBpdCdzIHN0aWxsIGVtcHR5IChsYXRlciBhdHRlbXB0cyBtYXkgYmUgaW5jb3JyZWN0 LCBzZWUgYnVnIDExNzgxOCkuCiAgICAgaWYgKHJlcXVlc3QucmVzcG9uc2VDb250ZW50RGlzcG9z aXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkoKS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gQWx3 YXlzIHRyeSBVVEYtOC4gSWYgdGhhdCBmYWlscywgdHJ5IGZyYW1lIGVuY29kaW5nIChpZiBhbnkp IGFuZCB0aGVuIHRoZSBkZWZhdWx0LgpAQCAtMzA2Niw2ICszMDY0LDggQEAgdW5zaWduZWQgbG9u ZyBGcmFtZUxvYWRlcjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseShjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXUKICAgICAKICAgICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChpbml0aWFsUmVx dWVzdCwgSXNNYWluUmVzb3VyY2U6Ok5vKTsKIAorICAgIGFwcGx5VXNlckFnZW50SWZOZWVkZWQo aW5pdGlhbFJlcXVlc3QpOworCiAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyID0gMDsgICAg CiAgICAgUmVzb3VyY2VSZXF1ZXN0IG5ld1JlcXVlc3QoaW5pdGlhbFJlcXVlc3QpOwogICAgIHJl cXVlc3RGcm9tRGVsZWdhdGUobmV3UmVxdWVzdCwgaWRlbnRpZmllciwgZXJyb3IpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91 cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdy b3VwLmNwcAppbmRleCA2MGMyNGJmNzhjMWFiYjg2ZmJhZWNmNDVlOTE2NTIxMDVhYWVjNzk0Li5i NjNkZjdlMGExNjRiZmUxNTc2NTQ5YmEyZThhMjViOWYxNTcwY2FiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNw cApAQCAtNDYzLDcgKzQ2Myw2IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjp1cGRhdGUo RnJhbWUmIGZyYW1lLCBBcHBsaWNhdGlvbkNhY2hlVXBkYXRlT3B0aW9uIHVwCiBSZXNvdXJjZVJl cXVlc3QgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpjcmVhdGVSZXF1ZXN0KFVSTCYmIHVybCwgQXBw bGljYXRpb25DYWNoZVJlc291cmNlKiByZXNvdXJjZSkKIHsKICAgICBSZXNvdXJjZVJlcXVlc3Qg cmVxdWVzdCB7IFdURk1vdmUodXJsKSB9OwotICAgIG1fZnJhbWUtPmxvYWRlcigpLmFwcGx5VXNl ckFnZW50SWZOZWVkZWQocmVxdWVzdCk7CiAgICAgcmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQo SFRUUEhlYWRlck5hbWU6OkNhY2hlQ29udHJvbCwgSFRUUEhlYWRlclZhbHVlczo6bWF4QWdlMCgp KTsKIAogICAgIGlmIChyZXNvdXJjZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggZjViZDU0ZDlmOTJmYjQzNzRm MjY5MGEyNDg1NDIwNDViNzZjZmQ2OC4uMWU2OTY3MzYwMzU1MTFjM2E5MmViZWVhY2VkYTBjMGEx NjhlNTM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJl c291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2VMb2FkZXIuY3BwCkBAIC03MzQsMTcgKzczNCwxNCBAQCB2b2lkIENhY2hlZFJlc291 cmNlTG9hZGVyOjpwcmVwYXJlRmV0Y2goQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgQ2FjaGVk UmVzb3VyYwogICAgIC8vIEZJWE1FOiBEZWNpZGUgd2hldGhlciB0byBzdXBwb3J0IGNsaWVudCBo aW50cwogfQogCi12b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjp1cGRhdGVIVFRQUmVxdWVzdEhl YWRlcnMoQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0KQordm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6dXBkYXRlSFRUUFJlcXVlc3RIZWFk ZXJzKEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlciwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwg Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIC8vIEltcGxlbWVudGluZyBz dGVwcyA3IHRvIDEyIG9mIGh0dHBzOi8vZmV0Y2guc3BlYy53aGF0d2cub3JnLyNodHRwLW5ldHdv cmstb3ItY2FjaGUtZmV0Y2gKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcmVjb25jaWxlIGhh bmRsaW5nIG9mIE1haW5SZXNvdXJjZSB3aXRoIG90aGVyIHJlc291cmNlcy4KLSAgICBpZiAodHlw ZSAhPSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6TWFpblJlc291cmNlKSB7Ci0gICAgICAgIC8vIElu IHNvbWUgY2FzZXMgd2UgbWF5IHRyeSB0byBsb2FkIHJlc291cmNlcyBpbiBmcmFtZWxlc3MgZG9j dW1lbnRzLiBTdWNoIGxvYWRzIGFsd2F5cyBmYWlsLgotICAgICAgICAvLyBGSVhNRTogV2Ugc2hv dWxkbid0IG5lZWQgdG8gZG8gdGhlIGNoZWNrIG9uIGZyYW1lLgotICAgICAgICBpZiAoYXV0byog ZnJhbWUgPSB0aGlzLT5mcmFtZSgpKQotICAgICAgICAgICAgcmVxdWVzdC51cGRhdGVSZWZlcnJl ck9yaWdpbkFuZFVzZXJBZ2VudEhlYWRlcnMoZnJhbWUtPmxvYWRlcigpKTsKLSAgICB9CisgICAg aWYgKHR5cGUgIT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Ok1haW5SZXNvdXJjZSkKKyAgICAgICAg cmVxdWVzdC51cGRhdGVSZWZlcnJlckFuZE9yaWdpbkhlYWRlcnMoZnJhbWVMb2FkZXIpOworICAg IHJlcXVlc3QudXBkYXRlVXNlckFnZW50SGVhZGVyKGZyYW1lTG9hZGVyKTsKIAogICAgIHJlcXVl c3QudXBkYXRlQWNjb3JkaW5nQ2FjaGVNb2RlKCk7CiAgICAgcmVxdWVzdC51cGRhdGVBY2NlcHRF bmNvZGluZ0hlYWRlcigpOwpAQCAtOTA5LDcgKzkwNiw3IEBAIFJlc291cmNlRXJyb3JPcjxDYWNo ZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4+IENhY2hlZFJlc291cmNlTG9hZGVyOjpy ZXF1CiAgICAgSW5pdGlhdG9yQ29udGV4dCBpbml0aWF0b3JDb250ZXh0ID0gcmVxdWVzdC5vcHRp b25zKCkuaW5pdGlhdG9yQ29udGV4dDsKIAogICAgIGlmIChyZXF1ZXN0LnJlc291cmNlUmVxdWVz dCgpLnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKLSAgICAgICAgdXBkYXRlSFRUUFJl cXVlc3RIZWFkZXJzKHR5cGUsIHJlcXVlc3QpOworICAgICAgICB1cGRhdGVIVFRQUmVxdWVzdEhl YWRlcnMoZnJhbWUubG9hZGVyKCksIHR5cGUsIHJlcXVlc3QpOwogCiAgICAgYXV0byYgbWVtb3J5 Q2FjaGUgPSBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCk7CiAgICAgaWYgKHJlcXVlc3QuYWxsb3dz Q2FjaGluZygpICYmIG1lbW9yeUNhY2hlLmRpc2FibGVkKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCmluZGV4IGIzM2UzZGRjMzE1 YTVhODAwMjcyZTZhNjQ2YWNjNzQ0NTkwYzZkOTUuLjFiMDI2NDRkYTRjMjlhZjAzZDljZTZhYjlh NWEwMjdmNGE5OGExNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5oCkBAIC0xNzUsNyArMTc1LDcgQEAgcHJpdmF0ZToKICAgICBD YWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gbG9hZFJlc291cmNlKENhY2hlZFJl c291cmNlOjpUeXBlLCBQQUw6OlNlc3Npb25JRCwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYsIGNv bnN0IENvb2tpZUphciYpOwogCiAgICAgdm9pZCBwcmVwYXJlRmV0Y2goQ2FjaGVkUmVzb3VyY2U6 OlR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYpOwotICAgIHZvaWQgdXBkYXRlSFRUUFJlcXVl c3RIZWFkZXJzKENhY2hlZFJlc291cmNlOjpUeXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmKTsK KyAgICB2b2lkIHVwZGF0ZUhUVFBSZXF1ZXN0SGVhZGVycyhGcmFtZUxvYWRlciYsIENhY2hlZFJl c291cmNlOjpUeXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmKTsKIAogICAgIGJvb2wgY2FuUmVx dWVzdChDYWNoZWRSZXNvdXJjZTo6VHlwZSwgY29uc3QgVVJMJiwgY29uc3QgQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0JiwgRm9yUHJlbG9hZCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHAKaW5kZXggZWI1YzExYmE1NGE4MDU0 ZTRlYWU1N2E4MTNkZjdmNjY2M2VjZWIzOS4uNmEyOGE4NTcxYzVlY2E2MjdkM2U2ZTdkMTRmNzlh NzYzODY5NjViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlUmVxdWVzdC5jcHAKQEAgLTIyMSwxNCArMjIxLDEzIEBAIHZvaWQgQ2FjaGVk UmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlclBvbGljeShSZWZlcnJlclBvbGljeSBkZWZh dWx0UG9saWN5KQogICAgICAgICBtX29wdGlvbnMucmVmZXJyZXJQb2xpY3kgPSBkZWZhdWx0UG9s aWN5OwogfQogCi12b2lkIENhY2hlZFJlc291cmNlUmVxdWVzdDo6dXBkYXRlUmVmZXJyZXJPcmln aW5BbmRVc2VyQWdlbnRIZWFkZXJzKEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlcikKK3ZvaWQgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVSZWZlcnJlckFuZE9yaWdpbkhlYWRlcnMoRnJhbWVM b2FkZXImIGZyYW1lTG9hZGVyKQogewogICAgIC8vIEltcGxlbWVudGluZyBzdGVwIDkgdG8gMTEg b2YgaHR0cHM6Ly9mZXRjaC5zcGVjLndoYXR3Zy5vcmcvI2h0dHAtbmV0d29yay1vci1jYWNoZS1m ZXRjaCBhcyBvZiAxNiBNYXJjaCAyMDE4CiAgICAgU3RyaW5nIG91dGdvaW5nUmVmZXJyZXIgPSBm cmFtZUxvYWRlci5vdXRnb2luZ1JlZmVycmVyKCk7CiAgICAgaWYgKG1fcmVzb3VyY2VSZXF1ZXN0 Lmhhc0hUVFBSZWZlcnJlcigpKQogICAgICAgICBvdXRnb2luZ1JlZmVycmVyID0gbV9yZXNvdXJj ZVJlcXVlc3QuaHR0cFJlZmVycmVyKCk7CiAgICAgdXBkYXRlUmVxdWVzdFJlZmVycmVyKG1fcmVz b3VyY2VSZXF1ZXN0LCBtX29wdGlvbnMucmVmZXJyZXJQb2xpY3ksIG91dGdvaW5nUmVmZXJyZXIp OwotICAgIGZyYW1lTG9hZGVyLmFwcGx5VXNlckFnZW50SWZOZWVkZWQobV9yZXNvdXJjZVJlcXVl c3QpOwogCiAgICAgaWYgKGRvZXNSZXF1ZXN0TmVlZEhUVFBPcmlnaW5IZWFkZXIobV9yZXNvdXJj ZVJlcXVlc3QpKSB7CiAgICAgICAgIGF1dG8gb3V0Z29pbmdPcmlnaW4gPSBTZWN1cml0eU9yaWdp bjo6Y3JlYXRlRnJvbVN0cmluZyhvdXRnb2luZ1JlZmVycmVyKTsKQEAgLTIzNyw2ICsyMzYsMTEg QEAgdm9pZCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZVJlZmVycmVyT3JpZ2luQW5kVXNl ckFnZW50SGVhZGVycyhGcmFtZUxvYWRlciYKICAgICB9CiB9CiAKK3ZvaWQgQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0Ojp1cGRhdGVVc2VyQWdlbnRIZWFkZXIoRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVy KQoreworICAgIGZyYW1lTG9hZGVyLmFwcGx5VXNlckFnZW50SWZOZWVkZWQobV9yZXNvdXJjZVJl cXVlc3QpOworfQorCiBib29sIGlzUmVxdWVzdENyb3NzT3JpZ2luKFNlY3VyaXR5T3JpZ2luKiBv cmlnaW4sIGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25z JiBvcHRpb25zKQogewogICAgIGlmICghb3JpZ2luKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5oCmluZGV4IGY0YjAyYjg2ZjFjMzM2 OTYwOGUwNTk3YzA0NTI0NDQyOWQ1ZWJmMDYuLjM3MTNhZTUxZDAzOTM1N2Y3NWUwYzgwNGE5YzEw ZGU4YmQ0YmUwNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRSZXNvdXJjZVJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0LmgKQEAgLTc4LDcgKzc4LDggQEAgcHVibGljOgogICAgIHZvaWQg dXBkYXRlRm9yQWNjZXNzQ29udHJvbChEb2N1bWVudCYpOwogCiAgICAgdm9pZCB1cGRhdGVSZWZl cnJlclBvbGljeShSZWZlcnJlclBvbGljeSk7Ci0gICAgdm9pZCB1cGRhdGVSZWZlcnJlck9yaWdp bkFuZFVzZXJBZ2VudEhlYWRlcnMoRnJhbWVMb2FkZXImKTsKKyAgICB2b2lkIHVwZGF0ZVJlZmVy cmVyQW5kT3JpZ2luSGVhZGVycyhGcmFtZUxvYWRlciYpOworICAgIHZvaWQgdXBkYXRlVXNlckFn ZW50SGVhZGVyKEZyYW1lTG9hZGVyJik7CiAgICAgdm9pZCB1cGdyYWRlSW5zZWN1cmVSZXF1ZXN0 SWZOZWVkZWQoRG9jdW1lbnQmKTsKICAgICB2b2lkIHNldEFjY2VwdEhlYWRlcklmTm9uZShDYWNo ZWRSZXNvdXJjZTo6VHlwZSk7CiAgICAgdm9pZCB1cGRhdGVBY2NvcmRpbmdDYWNoZU1vZGUoKTsK