186082 2018-05-29 21:18:46 -0700 Rename FromOrigin runtime flag to CrossOriginResourcePolicy and enable it by default 2018-05-30 14:39:18 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf beidson cdumez commit-queue dbates ggaren webkit-bug-importer wilander oldest_to_newest 1428344 0 youennf 2018-05-29 21:18:46 -0700 Rename FromOrigin runtime flag to CrossOriginResourcePolicy and enable it by default 1428345 1 341556 youennf 2018-05-29 21:23:24 -0700 Created attachment 341556 Patch 1428479 2 youennf 2018-05-30 09:48:27 -0700 GTK error seems unrelated. 1428480 3 341556 youennf 2018-05-30 09:49:50 -0700 Comment on attachment 341556 Patch Plan is to land this patch after https://bugs.webkit.org/show_bug.cgi?id=186080. 1428561 4 341556 cdumez 2018-05-30 13:12:27 -0700 Comment on attachment 341556 Patch r=me 1428603 5 341556 commit-queue 2018-05-30 14:38:12 -0700 Comment on attachment 341556 Patch Clearing flags on attachment: 341556 Committed r232311: <https://trac.webkit.org/changeset/232311> 1428604 6 commit-queue 2018-05-30 14:38:14 -0700 All reviewed patches have been landed. Closing bug. 1428605 7 webkit-bug-importer 2018-05-30 14:39:18 -0700 <rdar://problem/40663955> 341556 2018-05-29 21:23:24 -0700 2018-05-30 14:38:12 -0700 Patch bug-186082-20180529212323.patch text/plain 10436 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjNkZTJkNGQ2NTQzMDdk NjdkMmRkNWU1NjY3NDE3N2E3NTQyNWQzNS4uOTYwMjQwYWJjMTRlZmQyYTI0ZThmYTEwZDM1YTFj ZmMxZDk3YTY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA1LTI5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgRnJvbU9yaWdp biBydW50aW1lIGZsYWcgdG8gQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeSBhbmQgZW5hYmxlIGl0 IGJ5IGRlZmF1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NjA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5vIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAgICAgICAqIHBhZ2UvUnVudGltZUVuYWJs ZWRGZWF0dXJlcy5oOgorICAgICAgICAoV2ViQ29yZTo6UnVudGltZUVuYWJsZWRGZWF0dXJlczo6 c2V0Q3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeUVuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6 UnVudGltZUVuYWJsZWRGZWF0dXJlczo6Y3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeUVuYWJsZWQg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2V0RnJv bU9yaWdpblJlc3BvbnNlSGVhZGVyRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpmcm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVk IGNvbnN0KTogRGVsZXRlZC4KKwogMjAxOC0wNS0yOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIENyb3NzT3JpZ2luUmVzb3VyY2VQb2xpY3kgc2Ft ZSB0byBzYW1lLW9yaWdpbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA5MmNmZjIyODJkZTdmMmYxNDVhZTZjMDIzZmEz NTk1ZWUwZjkyMGUxLi4xODUwMDY2NTkxNDFhYzc0NmMzM2I0YTQwZWUwMTI4NmY3MjU0ZmI4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA1LTI5ICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgRnJvbU9yaWdpbiBydW50aW1lIGZsYWcg dG8gQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeSBhbmQgZW5hYmxlIGl0IGJ5IGRlZmF1bHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjA4MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaDoKKyAgICAg ICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0Q3Jvc3NPcmln aW5SZXNvdXJjZVBvbGljeUVuYWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldENyb3Nz T3JpZ2luUmVzb3VyY2VQb2xpY3lFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRG cm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdLUHJl ZmVyZW5jZXNHZXRGcm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVkKTogRGVsZXRlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZi5oOgorICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MpOgorCiAy MDE4LTA1LTI5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZW5hbWUgQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeSBzYW1lIHRvIHNhbWUtb3JpZ2luCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oCmluZGV4IDZjYzkyZTA5 MDM2YzdiOTZiNGUzOTc2OGNhZTYzNmZhNzA4YTliNDYuLjZhNjg3ZmUzNjU1ZjJjZDNlYzA1ZTI0 ODIwY2ZlNjE4NWZlNmU0MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUnVudGlt ZUVuYWJsZWRGZWF0dXJlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUnVudGltZUVuYWJs ZWRGZWF0dXJlcy5oCkBAIC0yNTAsOCArMjUwLDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0UmVz dHJpY3RlZEhUVFBSZXNwb25zZUFjY2Vzcyhib29sIGlzRW5hYmxlZCkgeyBtX2lzUmVzdHJpY3Rl ZEhUVFBSZXNwb25zZUFjY2VzcyA9IGlzRW5hYmxlZDsgfQogICAgIGJvb2wgcmVzdHJpY3RlZEhU VFBSZXNwb25zZUFjY2VzcygpIGNvbnN0IHsgcmV0dXJuIG1faXNSZXN0cmljdGVkSFRUUFJlc3Bv bnNlQWNjZXNzOyB9CiAKLSAgICB2b2lkIHNldEZyb21PcmlnaW5SZXNwb25zZUhlYWRlckVuYWJs ZWQoYm9vbCBpc0VuYWJsZWQpIHsgbV9mcm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVkID0g aXNFbmFibGVkOyB9Ci0gICAgYm9vbCBmcm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVkKCkg Y29uc3QgeyByZXR1cm4gbV9mcm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVkOyB9CisgICAg dm9pZCBzZXRDcm9zc09yaWdpblJlc291cmNlUG9saWN5RW5hYmxlZChib29sIGlzRW5hYmxlZCkg eyBtX2Nyb3NzT3JpZ2luUmVzb3VyY2VQb2xpY3lFbmFibGVkID0gaXNFbmFibGVkOyB9CisgICAg Ym9vbCBjcm9zc09yaWdpblJlc291cmNlUG9saWN5RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1f Y3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeUVuYWJsZWQ7IH0KICAgICAKICAgICB2b2lkIHNldFdl YkdMQ29tcHJlc3NlZFRleHR1cmVBU1RDU3VwcG9ydEVuYWJsZWQoYm9vbCBpc0VuYWJsZWQpIHsg bV9pc1dlYkdMQ29tcHJlc3NlZFRleHR1cmVBU1RDU3VwcG9ydEVuYWJsZWQgPSBpc0VuYWJsZWQ7 IH0KICAgICBib29sIHdlYkdMQ29tcHJlc3NlZFRleHR1cmVBU1RDU3VwcG9ydEVuYWJsZWQoKSBj b25zdCB7IHJldHVybiBtX2lzV2ViR0xDb21wcmVzc2VkVGV4dHVyZUFTVENTdXBwb3J0RW5hYmxl ZDsgfQpAQCAtMzk5LDcgKzM5OSw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1faXNSZXN0cmlj dGVkSFRUUFJlc3BvbnNlQWNjZXNzIHsgdHJ1ZSB9OwogCi0gICAgYm9vbCBtX2Zyb21PcmlnaW5S ZXNwb25zZUhlYWRlckVuYWJsZWQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9jcm9zc09yaWdpblJl c291cmNlUG9saWN5RW5hYmxlZCB7IHRydWUgfTsKIAogICAgIGJvb2wgbV9pc1dlYkdMQ29tcHJl c3NlZFRleHR1cmVBU1RDU3VwcG9ydEVuYWJsZWQgeyBmYWxzZSB9OwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnMuY3BwCmluZGV4IDg2YjdiNTA3ODhkMTI1YzIwNjcyYmViOGExYmYzOTJkMjY0MDc2 ODkuLjE5OGE0NmY2OTMwMGQ4MzY3OGQxM2E2YWMyZWZkMTc5NjY3MDZjMmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRl cnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnMuY3BwCkBAIC05Nyw3ICs5Nyw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAKICAg ICBlbmNvZGVyLmVuY29kZUVudW0ocHJlZmxpZ2h0UG9saWN5KTsKIAotICAgIGVuY29kZXIgPDwg c2hvdWxkRW5hYmxlRnJvbU9yaWdpblJlc3BvbnNlSGVhZGVyOworICAgIGVuY29kZXIgPDwgc2hv dWxkRW5hYmxlQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeTsKIAogICAgIGVuY29kZXIgPDwgZnJh bWVBbmNlc3Rvck9yaWdpbnM7CiAKQEAgLTIwNSwxMSArMjA1LDExIEBAIGJvb2wgTmV0d29ya1Jl c291cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIE5ldHdv cmtSZXNvdXJjCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0ocmVzdWx0LnByZWZsaWdodFBv bGljeSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4g c2hvdWxkRW5hYmxlRnJvbU9yaWdpblJlc3BvbnNlSGVhZGVyOwotICAgIGRlY29kZXIgPj4gc2hv dWxkRW5hYmxlRnJvbU9yaWdpblJlc3BvbnNlSGVhZGVyOwotICAgIGlmICghc2hvdWxkRW5hYmxl RnJvbU9yaWdpblJlc3BvbnNlSGVhZGVyKQorICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gc2hvdWxk RW5hYmxlQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeTsKKyAgICBkZWNvZGVyID4+IHNob3VsZEVu YWJsZUNyb3NzT3JpZ2luUmVzb3VyY2VQb2xpY3k7CisgICAgaWYgKCFzaG91bGRFbmFibGVDcm9z c09yaWdpblJlc291cmNlUG9saWN5KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmVzdWx0 LnNob3VsZEVuYWJsZUZyb21PcmlnaW5SZXNwb25zZUhlYWRlciA9ICpzaG91bGRFbmFibGVGcm9t T3JpZ2luUmVzcG9uc2VIZWFkZXI7CisgICAgcmVzdWx0LnNob3VsZEVuYWJsZUNyb3NzT3JpZ2lu UmVzb3VyY2VQb2xpY3kgPSAqc2hvdWxkRW5hYmxlQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeTsK IAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmZyYW1lQW5jZXN0b3JPcmlnaW5zKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCmluZGV4IDc1YTkx N2U3MjdkYmNkZjY0ZDViM2EwOTI2MDkwYmFhZTQyZTQxZjguLmQ2MzczOGFlZWM4YTM1MzVkMDk2 MTAzNjllNzg2NDkxYjFlOWQyZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKQEAgLTYxLDcg KzYxLDcgQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkhUVFBIZWFkZXJNYXAgb3JpZ2luYWxSZXF1 ZXN0SGVhZGVyczsKICAgICBib29sIHNob3VsZFJlc3RyaWN0SFRUUFJlc3BvbnNlQWNjZXNzIHsg ZmFsc2UgfTsKICAgICBXZWJDb3JlOjpQcmVmbGlnaHRQb2xpY3kgcHJlZmxpZ2h0UG9saWN5IHsg V2ViQ29yZTo6UHJlZmxpZ2h0UG9saWN5OjpDb25zaWRlciB9OwotICAgIGJvb2wgc2hvdWxkRW5h YmxlRnJvbU9yaWdpblJlc3BvbnNlSGVhZGVyIHsgZmFsc2UgfTsKKyAgICBib29sIHNob3VsZEVu YWJsZUNyb3NzT3JpZ2luUmVzb3VyY2VQb2xpY3kgeyBmYWxzZSB9OwogICAgIFZlY3RvcjxSZWZQ dHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiBmcmFtZUFuY2VzdG9yT3JpZ2luczsKIAogI2lm IEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVy ZW5jZXMueWFtbAppbmRleCA1ZDMzYWQxZmZhM2EzYzNjZjE4YTdiMjkyMDNhYjMxZTFhYzE3NDIy Li5kMTM0OWQyNjU4ZTk4MDljMzVjMjFiYjI2OTRiZjVjODY0ZDNkZmFkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlcy55YW1sCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzLnlhbWwKQEAgLTEyNTMsMTEgKzEyNTMsMTEgQEAgUmVz dHJpY3RlZEhUVFBSZXNwb25zZUFjY2VzczoKICAgICBjYXRlZ29yeTogZXhwZXJpbWVudGFsCiAg ICAgd2ViY29yZUJpbmRpbmc6IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMKIAotRnJvbU9yaWdpblJl c3BvbnNlSGVhZGVyRW5hYmxlZDoKK0Nyb3NzT3JpZ2luUmVzb3VyY2VQb2xpY3lFbmFibGVkOgog ICAgIHR5cGU6IGJvb2wKLSAgICBkZWZhdWx0VmFsdWU6IGZhbHNlCi0gICAgaHVtYW5SZWFkYWJs ZU5hbWU6ICJGcm9tLU9yaWdpbiBSZXNwb25zZSBIZWFkZXIiCi0gICAgaHVtYW5SZWFkYWJsZURl c2NyaXB0aW9uOiAiU3VwcG9ydCBmb3IgdGhlIEZyb20tT3JpZ2luIFJlc3BvbnNlIEhlYWRlciIK KyAgICBkZWZhdWx0VmFsdWU6IHRydWUKKyAgICBodW1hblJlYWRhYmxlTmFtZTogIkNyb3NzLU9y aWdpbi1SZXNvdXJjZS1Qb2xpY3kgUmVzcG9uc2UgSGVhZGVyIgorICAgIGh1bWFuUmVhZGFibGVE ZXNjcmlwdGlvbjogIlN1cHBvcnQgZm9yIHRoZSBDcm9zcy1PcmlnaW4tUmVzb3VyY2UtUG9saWN5 IFJlc3BvbnNlIEhlYWRlciIKICAgICBjYXRlZ29yeTogZXhwZXJpbWVudGFsCiAgICAgd2ViY29y ZUJpbmRpbmc6IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRleCBmYzFkN2ZhNDkxY2JlNWM4Mjk2 YTk2NzQwMGU0MTQ5Y2U5YzkzODEwLi40NTVjMjc0MmJjZDM3NmVmMTU2YjQyMDJmNDMwOThkMTUx YzllNzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZl cmVuY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVu Y2VzLmNwcApAQCAtMTk3NCwxNCArMTk3NCwxNCBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRBbGxv d0Nyb3NzT3JpZ2luU3VicmVzb3VyY2VzVG9Bc2tGb3JDcmVkZW50aWFscyhXS1ByZWZlcmVuYwog ICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5hbGxvd0Nyb3NzT3JpZ2luU3VicmVz b3VyY2VzVG9Bc2tGb3JDcmVkZW50aWFscygpOwogfQogCi12b2lkIFdLUHJlZmVyZW5jZXNTZXRG cm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5j ZXNSZWYsIGJvb2wgZmxhZykKK3ZvaWQgV0tQcmVmZXJlbmNlc1NldENyb3NzT3JpZ2luUmVzb3Vy Y2VQb2xpY3lFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxh ZykKIHsKLSAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRGcm9tT3JpZ2luUmVzcG9uc2VI ZWFkZXJFbmFibGVkKGZsYWcpOworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldENyb3Nz T3JpZ2luUmVzb3VyY2VQb2xpY3lFbmFibGVkKGZsYWcpOwogfQogCi1ib29sIFdLUHJlZmVyZW5j ZXNHZXRGcm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYpCitib29sIFdLUHJlZmVyZW5jZXNHZXRDcm9zc09yaWdpblJlc291cmNlUG9s aWN5RW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQogewotICAgIHJldHVy biB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5mcm9tT3JpZ2luUmVzcG9uc2VIZWFkZXJFbmFibGVk KCk7CisgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPmNyb3NzT3JpZ2luUmVzb3Vy Y2VQb2xpY3lFbmFibGVkKCk7CiB9CiAKIHZvaWQgV0tQcmVmZXJlbmNlc1NldFJlc3RyaWN0ZWRI VFRQUmVzcG9uc2VBY2Nlc3MoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBm bGFnKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlc1JlZi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1Jl Zi5oCmluZGV4IDc4OWVmYjA3NWE5NWViY2Y0ZDExNDZlYmZhODBjMDk1YmQxNDI3OTQuLjFiYjA5 ODQ3ZWRiODBiNTdhMjk5MmE4ZGZlZTY5ZjQ1NWQyNDQ4MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWYuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmLmgKQEAgLTMyMCw4ICszMjAsOCBA QCBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0UmVzdHJpY3RlZEhUVFBSZXNwb25zZUFj Y2VzcyhXS1ByZWZlcmVuY2VzUmVmIHByZQogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1Nl dFJlc3RyaWN0ZWRIVFRQUmVzcG9uc2VBY2Nlc3MoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNl c1JlZiwgYm9vbCBhbGxvdyk7CiAKIC8vIERlZmF1bHRzIHRvIGZhbHNlLgotV0tfRVhQT1JUIGJv b2wgV0tQcmVmZXJlbmNlc0dldEZyb21PcmlnaW5SZXNwb25zZUhlYWRlckVuYWJsZWQoV0tQcmVm ZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7Ci1XS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2Vz U2V0RnJvbU9yaWdpblJlc3BvbnNlSGVhZGVyRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZl cmVuY2VzUmVmLCBib29sIGFsbG93KTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRD cm9zc09yaWdpblJlc291cmNlUG9saWN5RW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmKTsKK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRDcm9zc09yaWdpblJlc291 cmNlUG9saWN5RW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGFs bG93KTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggN2VhOTYwNDI3 NzNiOTNhYzY5MDViODhmMzQyYjU4NGNmZjRmMGEzMS4uMDk3YjhiYmQzZWNmNDU1MWY2NzFlYjNh ODQ3ZWJmM2U5MjBlMGVhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05l dHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtMzI3LDcgKzMyNyw3IEBAIHZvaWQg V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZEZyb21OZXR3b3JrUHJvY2VzcyhSZXNvdXJj ZUxvYWRlciYgcmVzb3VyY2VMCiAKICAgICBsb2FkUGFyYW1ldGVycy5pc01haW5GcmFtZU5hdmln YXRpb24gPSByZXNvdXJjZUxvYWRlci5mcmFtZSgpICYmIHJlc291cmNlTG9hZGVyLmZyYW1lKCkt PmlzTWFpbkZyYW1lKCkgJiYgcmVzb3VyY2VMb2FkZXIub3B0aW9ucygpLm1vZGUgPT0gRmV0Y2hP cHRpb25zOjpNb2RlOjpOYXZpZ2F0ZTsKIAotICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZEVuYWJs ZUZyb21PcmlnaW5SZXNwb25zZUhlYWRlciA9IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJl ZEZlYXR1cmVzKCkuZnJvbU9yaWdpblJlc3BvbnNlSGVhZGVyRW5hYmxlZCgpICYmICFsb2FkUGFy YW1ldGVycy5pc01haW5GcmFtZU5hdmlnYXRpb247CisgICAgbG9hZFBhcmFtZXRlcnMuc2hvdWxk RW5hYmxlQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeSA9IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6 OnNoYXJlZEZlYXR1cmVzKCkuY3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeUVuYWJsZWQoKSAmJiAh bG9hZFBhcmFtZXRlcnMuaXNNYWluRnJhbWVOYXZpZ2F0aW9uOwogCiAgICAgaWYgKHJlc291cmNl TG9hZGVyLm9wdGlvbnMoKS5tb2RlID09IEZldGNoT3B0aW9uczo6TW9kZTo6TmF2aWdhdGUpIHsK ICAgICAgICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IGZyYW1lQW5jZXN0b3JPcmln aW5zOwo=