86282 2012-05-11 23:18:53 -0700 Cleanup ContentSecurityPolicy naming conventions. 2012-05-12 01:30:51 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Minor --- 1 mkwst mkwst abarth sam webkit.review.bot oldest_to_newest 622242 0 mkwst 2012-05-11 23:18:53 -0700 Two tiny changes: 1. `reportURIs` and `reportURLs` are both used within the CSP implementation. We should standardize on `reportURIs` to match the spec. 2. `ContentSecurityPolicy::allowConnectFromSource` should probably be renamed to `allowConnectToSource` for clarity. 622252 1 141555 mkwst 2012-05-12 00:21:41 -0700 Created attachment 141555 Patch 622259 2 141555 abarth 2012-05-12 00:56:35 -0700 Comment on attachment 141555 Patch Thanks! 622280 3 141555 webkit.review.bot 2012-05-12 01:30:47 -0700 Comment on attachment 141555 Patch Clearing flags on attachment: 141555 Committed r116842: <http://trac.webkit.org/changeset/116842> 622281 4 webkit.review.bot 2012-05-12 01:30:51 -0700 All reviewed patches have been landed. Closing bug. 141555 2012-05-12 00:21:41 -0700 2012-05-12 01:30:47 -0700 Patch bug-86282-20120512092140.patch text/plain 8098 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlkYTU3Y2RiYzc2OWRj NGM0MzY0OGYwM2QxNDNkYzAwOGRiYjMyZC4uNjlhMGIzMzAyMmI1MTNlMjg5NWYyMWU1MmIzZmRm Y2QzODIwNTEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA1LTEyICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ2xlYW51cCBDb250ZW50U2Vj dXJpdHlQb2xpY3kgbmFtaW5nIGNvbnZlbnRpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYyODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUd28gdGlueSBjaGFuZ2VzOgorICAgICAgICAKKyAgICAg ICAgMS4gYHJlcG9ydFVSSWAgYW5kIGByZXBvcnRVUkxgIGFyZSBib3RoIHVzZWQgd2l0aGluIHRo ZSBDU1AKKyAgICAgICAgICAgaW1wbGVtZW50YXRpb24uIFdlIHNob3VsZCBzdGFuZGFyZGl6ZSBv biBgcmVwb3J0VVJJYCB0byBtYXRjaCB0aGUKKyAgICAgICAgICAgc3BlYy4KKyAgICAgICAgCisg ICAgICAgIDIuIFJlbmFtZXMgYENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dDb25uZWN0RnJv bVNvdXJjZWAgdG8KKyAgICAgICAgICAgYENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dDb25u ZWN0VG9Tb3VyY2VgIGZvciBjbGFyaXR5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgdGhl cmUncyBubyB1c2VyLXZpc2libGUgY2hhbmdlLgorCisgICAgICAgICogTW9kdWxlcy93ZWJzb2Nr ZXRzL1dlYlNvY2tldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXQ6OmNvbm5lY3Qp OgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKENT UERpcmVjdGl2ZUxpc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q1NQRGlyZWN0aXZlTGlzdDo6cmVw b3J0VmlvbGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZUxpc3Q6OmFsbG93 Q29ubmVjdFRvU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZUxpc3Q6OnBh cnNlUmVwb3J0VVJJKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZUxpc3Q6OmFkZERp cmVjdGl2ZSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93 Q29ubmVjdFRvU291cmNlKToKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5o OgorICAgICAgICAqIHBhZ2UvRXZlbnRTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZl bnRTb3VyY2U6OmNyZWF0ZSk6CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpvcGVuKToKKwogMjAxMi0wNS0xMSAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1RleHR1cmVN YXBwZXJdIFRpbGVzIGFyZSBub3QgY3JlYXRlZCBmb3IgbGFyZ2UgdGV4dHVyZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAKaW5kZXggM2YzODNl N2Q2NWQ1NTJiZjY0ZmU2NDgxOThhZThkN2RiYzdkYzA3YS4uOTJmMWYyNmJhNTU1NjVkOGEzZmFm YjIwZWMyNjY2YjlhMzljYTg4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJz b2NrZXRzL1dlYlNvY2tldC5jcHAKQEAgLTIyMSw3ICsyMjEsNyBAQCB2b2lkIFdlYlNvY2tldDo6 Y29ubmVjdChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHByb3RvY29s cywgRXhjZQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFzY3JpcHRFeGVjdXRp b25Db250ZXh0KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0Nvbm5lY3RGcm9tU291 cmNlKG1fdXJsKSkgeworICAgIGlmICghc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5jb250ZW50 U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dDb25uZWN0VG9Tb3VyY2UobV91cmwpKSB7CiAgICAgICAg IG1fc3RhdGUgPSBDTE9TRUQ7CiAKICAgICAgICAgLy8gRklYTUU6IFNob3VsZCB0aGlzIGJlIHRo cm93aW5nIGFuIGV4Y2VwdGlvbj8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29u dGVudFNlY3VyaXR5UG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3Vy aXR5UG9saWN5LmNwcAppbmRleCAyOGRhNGRjZDBhZmUzODhkNjRiOTA1YjUwMTVlNzIxM2U2OGQx ODc1Li5mYzBlMjE0YzEzYTFmODU5OGFlZmQ1MWJhNzM2ZjVjMGU2NDcxMzFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCkBAIC01MDMsNyArNTAz LDcgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dTdHlsZUZyb21Tb3VyY2UoY29uc3QgS1VSTCYp IGNvbnN0OwogICAgIGJvb2wgYWxsb3dGb250RnJvbVNvdXJjZShjb25zdCBLVVJMJikgY29uc3Q7 CiAgICAgYm9vbCBhbGxvd01lZGlhRnJvbVNvdXJjZShjb25zdCBLVVJMJikgY29uc3Q7Ci0gICAg Ym9vbCBhbGxvd0Nvbm5lY3RGcm9tU291cmNlKGNvbnN0IEtVUkwmKSBjb25zdDsKKyAgICBib29s IGFsbG93Q29ubmVjdFRvU291cmNlKGNvbnN0IEtVUkwmKSBjb25zdDsKIAogcHJpdmF0ZToKICAg ICBleHBsaWNpdCBDU1BEaXJlY3RpdmVMaXN0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKQEAg LTU0NCw3ICs1NDQsNyBAQCBwcml2YXRlOgogICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fbWVk aWFTcmM7CiAgICAgT3duUHRyPENTUERpcmVjdGl2ZT4gbV9jb25uZWN0U3JjOwogCi0gICAgVmVj dG9yPEtVUkw+IG1fcmVwb3J0VVJMczsKKyAgICBWZWN0b3I8S1VSTD4gbV9yZXBvcnRVUklzOwog fTsKIAogQ1NQRGlyZWN0aXZlTGlzdDo6Q1NQRGlyZWN0aXZlTGlzdChTY3JpcHRFeGVjdXRpb25D b250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0KQpAQCAtNTgwLDcgKzU4MCw3IEBAIHZvaWQg Q1NQRGlyZWN0aXZlTGlzdDo6cmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0aXZl VGV4dCwgY29uc3QgU3RyaW5nCiAgICAgU3RyaW5nIG1lc3NhZ2UgPSBtX3JlcG9ydE9ubHkgPyAi W1JlcG9ydCBPbmx5XSAiICsgY29uc29sZU1lc3NhZ2UgOiBjb25zb2xlTWVzc2FnZTsKICAgICBt X3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmFkZENvbnNvbGVNZXNzYWdlKEpTTWVzc2FnZVNvdXJj ZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCBtZXNzYWdlKTsKIAotICAgIGlm IChtX3JlcG9ydFVSTHMuaXNFbXB0eSgpKQorICAgIGlmIChtX3JlcG9ydFVSSXMuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBGSVhNRTogU3VwcG9ydCBzZW5kaW5nIHJlcG9y dHMgZnJvbSB3b3JrZXIuCkBAIC02MTgsOCArNjE4LDggQEAgdm9pZCBDU1BEaXJlY3RpdmVMaXN0 OjpyZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5nJiBkaXJlY3RpdmVUZXh0LCBjb25zdCBTdHJp bmcKIAogICAgIFJlZlB0cjxGb3JtRGF0YT4gcmVwb3J0ID0gRm9ybURhdGE6OmNyZWF0ZShyZXBv cnRPYmplY3QtPnRvSlNPTlN0cmluZygpLnV0ZjgoKSk7CiAKLSAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IG1fcmVwb3J0VVJMcy5zaXplKCk7ICsraSkKLSAgICAgICAgUGluZ0xvYWRlcjo6cmVw b3J0Q29udGVudFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uKGZyYW1lLCBtX3JlcG9ydFVSTHNbaV0s IHJlcG9ydCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3JlcG9ydFVSSXMuc2l6ZSgp OyArK2kpCisgICAgICAgIFBpbmdMb2FkZXI6OnJlcG9ydENvbnRlbnRTZWN1cml0eVBvbGljeVZp b2xhdGlvbihmcmFtZSwgbV9yZXBvcnRVUklzW2ldLCByZXBvcnQpOwogfQogCiB2b2lkIENTUERp cmVjdGl2ZUxpc3Q6OmxvZ1VucmVjb2duaXplZERpcmVjdGl2ZShjb25zdCBTdHJpbmcmIG5hbWUp IGNvbnN0CkBAIC03MzgsNyArNzM4LDcgQEAgYm9vbCBDU1BEaXJlY3RpdmVMaXN0OjphbGxvd01l ZGlhRnJvbVNvdXJjZShjb25zdCBLVVJMJiB1cmwpIGNvbnN0CiAgICAgcmV0dXJuIGNoZWNrU291 cmNlQW5kUmVwb3J0VmlvbGF0aW9uKG9wZXJhdGl2ZURpcmVjdGl2ZShtX21lZGlhU3JjLmdldCgp KSwgdXJsLCB0eXBlKTsKIH0KIAotYm9vbCBDU1BEaXJlY3RpdmVMaXN0OjphbGxvd0Nvbm5lY3RG cm9tU291cmNlKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKK2Jvb2wgQ1NQRGlyZWN0aXZlTGlzdDo6 YWxsb3dDb25uZWN0VG9Tb3VyY2UoY29uc3QgS1VSTCYgdXJsKSBjb25zdAogewogICAgIERFRklO RV9TVEFUSUNfTE9DQUwoU3RyaW5nLCB0eXBlLCAoImNvbm5lY3QiKSk7CiAgICAgcmV0dXJuIGNo ZWNrU291cmNlQW5kUmVwb3J0VmlvbGF0aW9uKG9wZXJhdGl2ZURpcmVjdGl2ZShtX2Nvbm5lY3RT cmMuZ2V0KCkpLCB1cmwsIHR5cGUpOwpAQCAtODI2LDcgKzgyNiw3IEBAIHZvaWQgQ1NQRGlyZWN0 aXZlTGlzdDo6cGFyc2VSZXBvcnRVUkkoY29uc3QgU3RyaW5nJiB2YWx1ZSkKIAogICAgICAgICBp ZiAodXJsQmVnaW4gPCBwb3NpdGlvbikgewogICAgICAgICAgICAgU3RyaW5nIHVybCA9IFN0cmlu Zyh1cmxCZWdpbiwgcG9zaXRpb24gLSB1cmxCZWdpbik7Ci0gICAgICAgICAgICBtX3JlcG9ydFVS THMuYXBwZW5kKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+Y29tcGxldGVVUkwodXJsKSk7Cisg ICAgICAgICAgICBtX3JlcG9ydFVSSXMuYXBwZW5kKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+ Y29tcGxldGVVUkwodXJsKSk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC04NzksNyArODc5LDcg QEAgdm9pZCBDU1BEaXJlY3RpdmVMaXN0OjphZGREaXJlY3RpdmUoY29uc3QgU3RyaW5nJiBuYW1l LCBjb25zdCBTdHJpbmcmIHZhbHVlKQogICAgICAgICBtX2Nvbm5lY3RTcmMgPSBjcmVhdGVDU1BE aXJlY3RpdmUobmFtZSwgdmFsdWUpOwogICAgIGVsc2UgaWYgKCFtX2hhdmVTYW5kYm94UG9saWN5 ICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHNhbmRib3gpKQogICAgICAgICBhcHBseVNhbmRi b3hQb2xpY3kodmFsdWUpOwotICAgIGVsc2UgaWYgKG1fcmVwb3J0VVJMcy5pc0VtcHR5KCkgJiYg ZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgcmVwb3J0VVJJKSkKKyAgICBlbHNlIGlmIChtX3JlcG9y dFVSSXMuaXNFbXB0eSgpICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHJlcG9ydFVSSSkpCiAg ICAgICAgIHBhcnNlUmVwb3J0VVJJKHZhbHVlKTsKICAgICBlbHNlCiAgICAgICAgIGxvZ1VucmVj b2duaXplZERpcmVjdGl2ZShuYW1lKTsKQEAgLTEwMDQsOSArMTAwNCw5IEBAIGJvb2wgQ29udGVu dFNlY3VyaXR5UG9saWN5OjphbGxvd01lZGlhRnJvbVNvdXJjZShjb25zdCBLVVJMJiB1cmwpIGNv bnN0CiAgICAgcmV0dXJuIGlzQWxsb3dlZEJ5QWxsPCZDU1BEaXJlY3RpdmVMaXN0OjphbGxvd01l ZGlhRnJvbVNvdXJjZT4obV9wb2xpY2llcywgdXJsKTsKIH0KIAotYm9vbCBDb250ZW50U2VjdXJp dHlQb2xpY3k6OmFsbG93Q29ubmVjdEZyb21Tb3VyY2UoY29uc3QgS1VSTCYgdXJsKSBjb25zdAor Ym9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93Q29ubmVjdFRvU291cmNlKGNvbnN0IEtV UkwmIHVybCkgY29uc3QKIHsKLSAgICByZXR1cm4gaXNBbGxvd2VkQnlBbGw8JkNTUERpcmVjdGl2 ZUxpc3Q6OmFsbG93Q29ubmVjdEZyb21Tb3VyY2U+KG1fcG9saWNpZXMsIHVybCk7CisgICAgcmV0 dXJuIGlzQWxsb3dlZEJ5QWxsPCZDU1BEaXJlY3RpdmVMaXN0OjphbGxvd0Nvbm5lY3RUb1NvdXJj ZT4obV9wb2xpY2llcywgdXJsKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVu dFNlY3VyaXR5UG9saWN5LmgKaW5kZXggNTVkMjE4MDBlZGM3N2JlZTdhYzllYzVmMzg0ZTI0YWQ1 Njc1ZmMxYy4uZjEzMDE0ZjEzMWY1NzBiZmJiNjA1OWE1Mjg2YWNkZDgwMTg0YjVjYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC03NCw3ICs3NCw3 IEBAIHB1YmxpYzoKICAgICBib29sIGFsbG93U3R5bGVGcm9tU291cmNlKGNvbnN0IEtVUkwmKSBj b25zdDsKICAgICBib29sIGFsbG93Rm9udEZyb21Tb3VyY2UoY29uc3QgS1VSTCYpIGNvbnN0Owog ICAgIGJvb2wgYWxsb3dNZWRpYUZyb21Tb3VyY2UoY29uc3QgS1VSTCYpIGNvbnN0OwotICAgIGJv b2wgYWxsb3dDb25uZWN0RnJvbVNvdXJjZShjb25zdCBLVVJMJikgY29uc3Q7CisgICAgYm9vbCBh bGxvd0Nvbm5lY3RUb1NvdXJjZShjb25zdCBLVVJMJikgY29uc3Q7CiAKICAgICB2b2lkIHNldE92 ZXJyaWRlQWxsb3dJbmxpbmVTdHlsZShib29sKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9FdmVudFNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50U291cmNl LmNwcAppbmRleCA1NDNmMWUxYWM3NDIzOGEzMzllMjE4MTI5ODAyODMwZjRhYTI5NDEzLi4yYTRk YjAzZmEwMGIyMTc2Y2VhMWQyYmI5Yjk2NTFlM2I4MTRjYWM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0V2ZW50U291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50U291cmNlLmNwcApAQCAtODgsNyArODgsNyBAQCBQYXNzUmVmUHRyPEV2ZW50U291cmNlPiBF dmVudFNvdXJjZTo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbgog ICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICBpZiAoIWNvbnRleHQtPmNvbnRlbnRTZWN1 cml0eVBvbGljeSgpLT5hbGxvd0Nvbm5lY3RGcm9tU291cmNlKGZ1bGxVUkwpKSB7CisgICAgaWYg KCFjb250ZXh0LT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dDb25uZWN0VG9Tb3VyY2Uo ZnVsbFVSTCkpIHsKICAgICAgICAgLy8gRklYTUU6IFNob3VsZCB0aGlzIGJlIHRocm93aW5nIGFu IGV4Y2VwdGlvbj8KICAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7CiAgICAgICAgIHJldHVybiAw OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKaW5kZXggYTcxYzQ0NTU1Mzg3ZjVm Zjg2ODQ0MzUyOTg3NDI0NDQyYzY4ODUwMS4uMDU5NjcyYjIyZGU5NWRlNmQ3NzY5YTJjNmU5YjA2 N2EyM2RiNTBhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCkBAIC00Nzgs NyArNDc4LDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6b3Blbihjb25zdCBTdHJpbmcmIG1ldGhv ZCwgY29uc3QgS1VSTCYgdXJsLCBib29sIGFzeW5jLCBFeGMKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotICAgIGlmICghc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5jb250ZW50U2VjdXJpdHlQ b2xpY3koKS0+YWxsb3dDb25uZWN0RnJvbVNvdXJjZSh1cmwpKSB7CisgICAgaWYgKCFzY3JpcHRF eGVjdXRpb25Db250ZXh0KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0Nvbm5lY3RU b1NvdXJjZSh1cmwpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBTaG91bGQgdGhpcyBiZSB0aHJvd2lu ZyBhbiBleGNlcHRpb24/CiAgICAgICAgIGVjID0gU0VDVVJJVFlfRVJSOwogICAgICAgICByZXR1 cm47Cg==