60402 2011-05-06 14:23:08 -0700 Implement "Report-Only" mode for CSP 2011-05-06 19:13:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 53572 1 abarth abarth commit-queue eric oldest_to_newest 399813 0 abarth 2011-05-06 14:23:08 -0700 Implement "Report-Only" mode for CSP 399816 1 92639 abarth 2011-05-06 14:24:41 -0700 Created attachment 92639 Patch 399914 2 92639 eric 2011-05-06 16:52:50 -0700 Comment on attachment 92639 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92639&action=review > Source/WebCore/page/ContentSecurityPolicy.cpp:553 > + return m_reportOnly; This is a bit confusing since in the "pass" case, return m_reportOnly would return the inverse of what you wanted. Maybe this should be some helper function? I'm not sure the name. falseIfEnforcingPolicy()? !enforcingPolicy()? false || m_reportOnly? I'm not sure. This may be fine as is, just smells a little funny. 399923 3 abarth 2011-05-06 17:08:32 -0700 The "pass" case is handled two lines above. This return statement is only encountered after we've fired off the violation report. 399925 4 abarth 2011-05-06 17:09:21 -0700 I can see wrapping it in a function though. return denyIfEnforcingPolicy(); ??? 399937 5 92662 abarth 2011-05-06 17:24:13 -0700 Created attachment 92662 Patch 399958 6 92662 eric 2011-05-06 17:46:06 -0700 Comment on attachment 92662 Patch LGTM. 399960 7 eric 2011-05-06 17:46:47 -0700 Of course now it feels like we should have an Allow/Deny enum (mapping to 1, 0 of course). :) 400004 8 92662 commit-queue 2011-05-06 19:13:24 -0700 Comment on attachment 92662 Patch Clearing flags on attachment: 92662 Committed r85993: <http://trac.webkit.org/changeset/85993> 400005 9 commit-queue 2011-05-06 19:13:28 -0700 All reviewed patches have been landed. Closing bug. 92639 2011-05-06 14:24:41 -0700 2011-05-06 17:24:09 -0700 Patch bug-60402-20110506142440.patch text/plain 9328 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTc4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDUtMDYgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgIlJlcG9ydC1Pbmx5IiBtb2RlIGZvciBDU1AKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwNDAyCisKKyAg ICAgICAgVGhpcyBtb2RlIGxldHMgd2ViIHNpdGVzIHRyeSBvdXQgQ1NQIGJ5IGdldHRpbmcgdmlv bGF0aW9uIHJlcG9ydHMgKGFuZAorICAgICAgICBjb25zb2xlIHNwYW0pIHdpdGhvdXQgYWN0dWFs bHkgY2hhbmdpbmcgdGhlIGJlaGF2aW9yIG9mIHRoZWlyIHdlYiBzaXRlcy4KKworICAgICAgICBU ZXN0OiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtb25s eS5odG1sCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OnByb2Nlc3NIdHRwRXF1aXYpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVudCk6 CisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpDb250ZW50U2VjdXJpdHlQb2xpY3kpOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpkaWRSZWNlaXZlSGVhZGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9u KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2hlY2tJbmxpbmVB bmRSZXBvcnRWaW9sYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9s aWN5OjpjaGVja0V2YWxBbmRSZXBvcnRWaW9sYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29u dGVudFNlY3VyaXR5UG9saWN5OjpjaGVja1NvdXJjZUFuZFJlcG9ydFZpb2xhdGlvbik6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SmF2YVNjcmlwdFVSTHMp OgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisKIDIwMTEtMDUtMDYg IEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBF cmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gODU5NzYp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NjM1LDcgKzI2MzUsOSBAQCB2b2lkIERvY3VtZW50Ojpwcm9jZXNzSHR0cEVxdWl2KGNvbnN0IFN0 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKGVxdWFsSWdub3JpbmdD YXNlKGVxdWl2LCAieC13ZWJraXQtY3NwIikpCi0gICAgICAgIGNvbnRlbnRTZWN1cml0eVBvbGlj eSgpLT5kaWRSZWNlaXZlSGVhZGVyKGNvbnRlbnQpOworICAgICAgICBjb250ZW50U2VjdXJpdHlQ b2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihjb250ZW50LCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OkVuZm9yY2VQb2xpY3kpOworICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGVxdWl2LCAi eC13ZWJraXQtY3NwLXJlcG9ydC1vbmx5IikpCisgICAgICAgIGNvbnRlbnRTZWN1cml0eVBvbGlj eSgpLT5kaWRSZWNlaXZlSGVhZGVyKGNvbnRlbnQsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVw b3J0T25seSk7CiB9CiAKIC8vIFRob3VnaCBpc3NwYWNlKCkgY29uc2lkZXJzIFx0IGFuZCBcdiB0 byBiZSB3aGl0ZXNwYWNlLCBXaW4gSUUgZG9lc24ndC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gODU5NzYpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MTksNyArNzE5LDExIEBAIHZv aWQgRnJhbWVMb2FkZXI6OmRpZEJlZ2luRG9jdW1lbnQoYm9vbCAKIAogICAgICAgICBTdHJpbmcg Y29udGVudFNlY3VyaXR5UG9saWN5ID0gbV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5odHRw SGVhZGVyRmllbGQoIlgtV2ViS2l0LUNTUCIpOwogICAgICAgICBpZiAoIWNvbnRlbnRTZWN1cml0 eVBvbGljeS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5jb250 ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihjb250ZW50U2VjdXJpdHlQb2xp Y3kpOworICAgICAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9s aWN5KCktPmRpZFJlY2VpdmVIZWFkZXIoY29udGVudFNlY3VyaXR5UG9saWN5LCBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OkVuZm9yY2VQb2xpY3kpOworCisgICAgICAgIFN0cmluZyByZXBvcnRPbmx5 Q29udGVudFNlY3VyaXR5UG9saWN5ID0gbV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5odHRw SGVhZGVyRmllbGQoIlgtV2ViS2l0LUNTUC1SZXBvcnQtT25seSIpOworICAgICAgICBpZiAoIWNv bnRlbnRTZWN1cml0eVBvbGljeS5pc0VtcHR5KCkpCisgICAgICAgICAgICBtX2ZyYW1lLT5kb2N1 bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihyZXBvcnRP bmx5Q29udGVudFNlY3VyaXR5UG9saWN5LCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJlcG9ydE9u bHkpOwogICAgIH0KIAogICAgIGhpc3RvcnkoKS0+cmVzdG9yZURvY3VtZW50U3RhdGUoKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAJKHJl dmlzaW9uIDg1OTc2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xp Y3kuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTQsNiArNDU0LDcgQEAgcHJpdmF0ZToKIENvbnRl bnRTZWN1cml0eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KERvY3VtZW50KiBkb2N1bWVu dCkKICAgICA6IG1faGF2ZVBvbGljeShmYWxzZSkKICAgICAsIG1fZG9jdW1lbnQoZG9jdW1lbnQp CisgICAgLCBtX3JlcG9ydE9ubHkoZmFsc2UpCiAgICAgLCBtX2Rpc2FibGVKYXZhU2NyaXB0VVJM cyhmYWxzZSkKIHsKIH0KQEAgLTQ2Miw3ICs0NjMsNyBAQCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 On5Db250ZW50U2VjdXJpdHlQCiB7CiB9CiAKLXZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpk aWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYgaGVhZGVyKQordm9pZCBDb250ZW50U2VjdXJp dHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5nJiBoZWFkZXIsIEhlYWRlclR5 cGUgdHlwZSkKIHsKICAgICBpZiAobV9oYXZlUG9saWN5KQogICAgICAgICByZXR1cm47IC8vIFRo ZSBmaXJzdCBwb2xpY3kgd2lucy4KQEAgLTQ3MCw2ICs0NzEsMTUgQEAgdm9pZCBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZQogICAgIHBhcnNlKGhlYWRlcik7CiAgICAgbV9oYXZl UG9saWN5ID0gdHJ1ZTsKIAorICAgIHN3aXRjaCAodHlwZSkgeworICAgIGNhc2UgUmVwb3J0T25s eToKKyAgICAgICAgbV9yZXBvcnRPbmx5ID0gdHJ1ZTsKKyAgICAgICAgcmV0dXJuOworICAgIGNh c2UgRW5mb3JjZVBvbGljeToKKyAgICAgICAgQVNTRVJUKCFtX3JlcG9ydE9ubHkpOworICAgICAg ICBicmVhazsKKyAgICB9CisKICAgICBpZiAoIWNoZWNrRXZhbChvcGVyYXRpdmVEaXJlY3RpdmUo bV9zY3JpcHRTcmMuZ2V0KCkpKSkgewogICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9kb2N1 bWVudC0+ZnJhbWUoKSkKICAgICAgICAgICAgIGZyYW1lLT5zY3JpcHQoKS0+ZGlzYWJsZUV2YWwo KTsKQEAgLTQ4Miw3ICs0OTIsOCBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0 VmlvbGF0CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZnJhbWUtPmRv bVdpbmRvdygpLT5jb25zb2xlKCktPmFkZE1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBMb2dNZXNz YWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGNvbnNvbGVNZXNzYWdlLCAxLCBTdHJpbmcoKSk7 CisgICAgU3RyaW5nIG1lc3NhZ2UgPSBtX3JlcG9ydE9ubHkgPyAiW1JlcG9ydCBPbmx5XSAiICsg Y29uc29sZU1lc3NhZ2UgOiBjb25zb2xlTWVzc2FnZTsKKyAgICBmcmFtZS0+ZG9tV2luZG93KCkt PmNvbnNvbGUoKS0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBF cnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgMSwgU3RyaW5nKCkpOwogCiAgICAgaWYgKG1fcmVw b3J0VVJMcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKQEAgLTUyMyw3ICs1MzQsNyBAQCBi b29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2hlY2tJbmxpbmVBCiAgICAgaWYgKCFkaXJlY3Rp dmUgfHwgZGlyZWN0aXZlLT5hbGxvd0lubGluZSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICByZXBvcnRWaW9sYXRpb24oZGlyZWN0aXZlLT50ZXh0KCksIGNvbnNvbGVNZXNzYWdlKTsKLSAg ICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIG1fcmVwb3J0T25seTsKIH0KIAogYm9vbCBDb250 ZW50U2VjdXJpdHlQb2xpY3k6OmNoZWNrRXZhbEFuZFJlcG9ydFZpb2xhdGlvbihDU1BEaXJlY3Rp dmUqIGRpcmVjdGl2ZSwgY29uc3QgU3RyaW5nJiBjb25zb2xlTWVzc2FnZSkgY29uc3QKQEAgLTUz MSw3ICs1NDIsNyBAQCBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2hlY2tFdmFsQW5kCiAg ICAgaWYgKGNoZWNrRXZhbChkaXJlY3RpdmUpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBy ZXBvcnRWaW9sYXRpb24oZGlyZWN0aXZlLT50ZXh0KCksIGNvbnNvbGVNZXNzYWdlKTsKLSAgICBy ZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIG1fcmVwb3J0T25seTsKIH0KIAogYm9vbCBDb250ZW50 U2VjdXJpdHlQb2xpY3k6OmNoZWNrU291cmNlQW5kUmVwb3J0VmlvbGF0aW9uKENTUERpcmVjdGl2 ZSogZGlyZWN0aXZlLCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgdHlwZSkgY29uc3QK QEAgLTUzOSw3ICs1NTAsNyBAQCBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2hlY2tTb3Vy Y2VBCiAgICAgaWYgKCFkaXJlY3RpdmUgfHwgZGlyZWN0aXZlLT5hbGxvd3ModXJsKSkKICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgcmVwb3J0VmlvbGF0aW9uKGRpcmVjdGl2ZS0+dGV4dCgpLCBt YWtlU3RyaW5nKCJSZWZ1c2VkIHRvIGxvYWQgIiwgdHlwZSwgIiBmcm9tICciLCB1cmwuc3RyaW5n KCksICInIGJlY2F1c2Ugb2YgQ29udGVudC1TZWN1cml0eS1Qb2xpY3kuXG4iKSk7Ci0gICAgcmV0 dXJuIGZhbHNlOworICAgIHJldHVybiBtX3JlcG9ydE9ubHk7CiB9CiAKIGJvb2wgQ29udGVudFNl Y3VyaXR5UG9saWN5OjphbGxvd0phdmFTY3JpcHRVUkxzKCkgY29uc3QKQEAgLTU0Nyw3ICs1NTgs NyBAQCBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dKYXZhU2NyCiAgICAgREVGSU5F X1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNvbGVNZXNzYWdlLCAoIlJlZnVzZWQgdG8gZXhlY3V0 ZSBKYXZhU2NyaXB0IFVSTCBiZWNhdXNlIG9mIENvbnRlbnQtU2VjdXJpdHktUG9saWN5LlxuIikp OwogICAgIGlmIChtX2Rpc2FibGVKYXZhU2NyaXB0VVJMcykgewogICAgICAgICByZXBvcnRWaW9s YXRpb24oU3RyaW5nKCksIGNvbnNvbGVNZXNzYWdlKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICByZXR1cm4gbV9yZXBvcnRPbmx5OwogICAgIH0KICAgICByZXR1cm4gY2hlY2tJbmxp bmVBbmRSZXBvcnRWaW9sYXRpb24ob3BlcmF0aXZlRGlyZWN0aXZlKG1fc2NyaXB0U3JjLmdldCgp KSwgY29uc29sZU1lc3NhZ2UpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50 U2VjdXJpdHlQb2xpY3kuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5oCShyZXZpc2lvbiA4NTk3NikKKysrIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDEy IEBAIHB1YmxpYzoKICAgICB9CiAgICAgfkNvbnRlbnRTZWN1cml0eVBvbGljeSgpOwogCi0gICAg dm9pZCBkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYpOworICAgIGVudW0gSGVhZGVyVHlw ZSB7CisgICAgICAgIFJlcG9ydE9ubHksCisgICAgICAgIEVuZm9yY2VQb2xpY3kKKyAgICB9Owor CisgICAgdm9pZCBkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYsIEhlYWRlclR5cGUpOwog CiAgICAgYm9vbCBhbGxvd0phdmFTY3JpcHRVUkxzKCkgY29uc3Q7CiAgICAgYm9vbCBhbGxvd0lu bGluZUV2ZW50SGFuZGxlcnMoKSBjb25zdDsKQEAgLTgwLDYgKzg1LDcgQEAgcHJpdmF0ZToKICAg ICBib29sIG1faGF2ZVBvbGljeTsKICAgICBEb2N1bWVudCogbV9kb2N1bWVudDsKIAorICAgIGJv b2wgbV9yZXBvcnRPbmx5OwogICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fZGVmYXVsdFNyYzsK ICAgICBPd25QdHI8Q1NQRGlyZWN0aXZlPiBtX3NjcmlwdFNyYzsKICAgICBPd25QdHI8Q1NQRGly ZWN0aXZlPiBtX29iamVjdFNyYzsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTc4KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUt MDYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgIlJlcG9ydC1Pbmx5IiBtb2Rl IGZvciBDU1AKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYwNDAyCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBv bGljeS9yZXBvcnQtb25seS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVz dHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1vbmx5Lmh0bWw6IEFkZGVk LgorCiAyMDExLTA1LTA2ICBKdXN0aW4gU2NodWggIDxqc2NodWhAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtb25seS1leHBlY3RlZC50 eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50 U2VjdXJpdHlQb2xpY3kvcmVwb3J0LW9ubHktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVw b3J0LW9ubHktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEwIEBACitDT05T T0xFIE1FU1NBR0U6IGxpbmUgMTogW1JlcG9ydCBPbmx5XSBSZWZ1c2VkIHRvIGV4ZWN1dGUgaW5s aW5lIHNjcmlwdCBiZWNhdXNlIG9mIENvbnRlbnQtU2VjdXJpdHktUG9saWN5LgorCitBTEVSVDog UEFTUworQ1NQIHJlcG9ydCByZWNlaXZlZDoKK0NPTlRFTlRfVFlQRTogYXBwbGljYXRpb24veC13 d3ctZm9ybS11cmxlbmNvZGVkCitIVFRQX1JFRkVSRVI6IGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9z ZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LW9ubHkuaHRtbAorUkVRVUVTVF9N RVRIT0Q6IFBPU1QKKz09PSBQT1NUIERBVEEgPT09Citkb2N1bWVudC11cmw6IGh0dHA6Ly8xMjcu MC4wLjE6ODAwMC9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LW9ubHkuaHRt bAordmlvbGF0ZWQtZGlyZWN0aXZlOiBzY3JpcHQtc3JjICdzZWxmJwpJbmRleDogTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LW9ubHku aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRl bnRTZWN1cml0eVBvbGljeS9yZXBvcnQtb25seS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LW9u bHkuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw2IEBACis8bWV0YSBodHRwLWVxdWl2PSJY LVdlYktpdC1DU1AtUmVwb3J0LU9ubHkiIGNvbnRlbnQ9InNjcmlwdC1zcmMgJ3NlbGYnOyByZXBv cnQtdXJpIHJlc291cmNlcy9zYXZlLXJlcG9ydC5waHAiPgorPHNjcmlwdD4KKy8vIFRoaXMgc2Ny aXB0IGJsb2NrIHdpbGwgdHJpZ2dlciBhIHZpb2xhdGlvbiByZXBvcnQgYnV0IHNob3VsZG4ndCBi ZSBibG9ja2VkLgorYWxlcnQoJ1BBU1MnKTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJlc291 cmNlcy9nby10by1lY2hvLXJlcG9ydC5qcyI+PC9zY3JpcHQ+Cg== 92662 2011-05-06 17:24:13 -0700 2011-05-06 19:13:24 -0700 Patch bug-60402-20110506172411.patch text/plain 9627 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTc4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDUtMDYgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgIlJlcG9ydC1Pbmx5IiBtb2RlIGZvciBDU1AKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwNDAyCisKKyAg ICAgICAgVGhpcyBtb2RlIGxldHMgd2ViIHNpdGVzIHRyeSBvdXQgQ1NQIGJ5IGdldHRpbmcgdmlv bGF0aW9uIHJlcG9ydHMgKGFuZAorICAgICAgICBjb25zb2xlIHNwYW0pIHdpdGhvdXQgYWN0dWFs bHkgY2hhbmdpbmcgdGhlIGJlaGF2aW9yIG9mIHRoZWlyIHdlYiBzaXRlcy4KKworICAgICAgICBU ZXN0OiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtb25s eS5odG1sCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OnByb2Nlc3NIdHRwRXF1aXYpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVudCk6 CisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpDb250ZW50U2VjdXJpdHlQb2xpY3kpOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpkaWRSZWNlaXZlSGVhZGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9u KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2hlY2tJbmxpbmVB bmRSZXBvcnRWaW9sYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9s aWN5OjpjaGVja0V2YWxBbmRSZXBvcnRWaW9sYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29u dGVudFNlY3VyaXR5UG9saWN5OjpjaGVja1NvdXJjZUFuZFJlcG9ydFZpb2xhdGlvbik6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SmF2YVNjcmlwdFVSTHMp OgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisKIDIwMTEtMDUtMDYg IEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBF cmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gODU5NzYp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NjM1LDcgKzI2MzUsOSBAQCB2b2lkIERvY3VtZW50Ojpwcm9jZXNzSHR0cEVxdWl2KGNvbnN0IFN0 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKGVxdWFsSWdub3JpbmdD YXNlKGVxdWl2LCAieC13ZWJraXQtY3NwIikpCi0gICAgICAgIGNvbnRlbnRTZWN1cml0eVBvbGlj eSgpLT5kaWRSZWNlaXZlSGVhZGVyKGNvbnRlbnQpOworICAgICAgICBjb250ZW50U2VjdXJpdHlQ b2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihjb250ZW50LCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OkVuZm9yY2VQb2xpY3kpOworICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGVxdWl2LCAi eC13ZWJraXQtY3NwLXJlcG9ydC1vbmx5IikpCisgICAgICAgIGNvbnRlbnRTZWN1cml0eVBvbGlj eSgpLT5kaWRSZWNlaXZlSGVhZGVyKGNvbnRlbnQsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVw b3J0T25seSk7CiB9CiAKIC8vIFRob3VnaCBpc3NwYWNlKCkgY29uc2lkZXJzIFx0IGFuZCBcdiB0 byBiZSB3aGl0ZXNwYWNlLCBXaW4gSUUgZG9lc24ndC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gODU5NzYpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MTksNyArNzE5LDExIEBAIHZv aWQgRnJhbWVMb2FkZXI6OmRpZEJlZ2luRG9jdW1lbnQoYm9vbCAKIAogICAgICAgICBTdHJpbmcg Y29udGVudFNlY3VyaXR5UG9saWN5ID0gbV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5odHRw SGVhZGVyRmllbGQoIlgtV2ViS2l0LUNTUCIpOwogICAgICAgICBpZiAoIWNvbnRlbnRTZWN1cml0 eVBvbGljeS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5jb250 ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihjb250ZW50U2VjdXJpdHlQb2xp Y3kpOworICAgICAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9s aWN5KCktPmRpZFJlY2VpdmVIZWFkZXIoY29udGVudFNlY3VyaXR5UG9saWN5LCBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OkVuZm9yY2VQb2xpY3kpOworCisgICAgICAgIFN0cmluZyByZXBvcnRPbmx5 Q29udGVudFNlY3VyaXR5UG9saWN5ID0gbV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5odHRw SGVhZGVyRmllbGQoIlgtV2ViS2l0LUNTUC1SZXBvcnQtT25seSIpOworICAgICAgICBpZiAoIWNv bnRlbnRTZWN1cml0eVBvbGljeS5pc0VtcHR5KCkpCisgICAgICAgICAgICBtX2ZyYW1lLT5kb2N1 bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihyZXBvcnRP bmx5Q29udGVudFNlY3VyaXR5UG9saWN5LCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJlcG9ydE9u bHkpOwogICAgIH0KIAogICAgIGhpc3RvcnkoKS0+cmVzdG9yZURvY3VtZW50U3RhdGUoKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAJKHJl dmlzaW9uIDg1OTc2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xp Y3kuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTQsNiArNDU0LDcgQEAgcHJpdmF0ZToKIENvbnRl bnRTZWN1cml0eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KERvY3VtZW50KiBkb2N1bWVu dCkKICAgICA6IG1faGF2ZVBvbGljeShmYWxzZSkKICAgICAsIG1fZG9jdW1lbnQoZG9jdW1lbnQp CisgICAgLCBtX3JlcG9ydE9ubHkoZmFsc2UpCiAgICAgLCBtX2Rpc2FibGVKYXZhU2NyaXB0VVJM cyhmYWxzZSkKIHsKIH0KQEAgLTQ2Miw3ICs0NjMsNyBAQCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 On5Db250ZW50U2VjdXJpdHlQCiB7CiB9CiAKLXZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5Ojpk aWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYgaGVhZGVyKQordm9pZCBDb250ZW50U2VjdXJp dHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5nJiBoZWFkZXIsIEhlYWRlclR5 cGUgdHlwZSkKIHsKICAgICBpZiAobV9oYXZlUG9saWN5KQogICAgICAgICByZXR1cm47IC8vIFRo ZSBmaXJzdCBwb2xpY3kgd2lucy4KQEAgLTQ3MCw2ICs0NzEsMTUgQEAgdm9pZCBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZQogICAgIHBhcnNlKGhlYWRlcik7CiAgICAgbV9oYXZl UG9saWN5ID0gdHJ1ZTsKIAorICAgIHN3aXRjaCAodHlwZSkgeworICAgIGNhc2UgUmVwb3J0T25s eToKKyAgICAgICAgbV9yZXBvcnRPbmx5ID0gdHJ1ZTsKKyAgICAgICAgcmV0dXJuOworICAgIGNh c2UgRW5mb3JjZVBvbGljeToKKyAgICAgICAgQVNTRVJUKCFtX3JlcG9ydE9ubHkpOworICAgICAg ICBicmVhazsKKyAgICB9CisKICAgICBpZiAoIWNoZWNrRXZhbChvcGVyYXRpdmVEaXJlY3RpdmUo bV9zY3JpcHRTcmMuZ2V0KCkpKSkgewogICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9kb2N1 bWVudC0+ZnJhbWUoKSkKICAgICAgICAgICAgIGZyYW1lLT5zY3JpcHQoKS0+ZGlzYWJsZUV2YWwo KTsKQEAgLTQ4Miw3ICs0OTIsOCBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6cmVwb3J0 VmlvbGF0CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZnJhbWUtPmRv bVdpbmRvdygpLT5jb25zb2xlKCktPmFkZE1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBMb2dNZXNz YWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGNvbnNvbGVNZXNzYWdlLCAxLCBTdHJpbmcoKSk7 CisgICAgU3RyaW5nIG1lc3NhZ2UgPSBtX3JlcG9ydE9ubHkgPyAiW1JlcG9ydCBPbmx5XSAiICsg Y29uc29sZU1lc3NhZ2UgOiBjb25zb2xlTWVzc2FnZTsKKyAgICBmcmFtZS0+ZG9tV2luZG93KCkt PmNvbnNvbGUoKS0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBF cnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgMSwgU3RyaW5nKCkpOwogCiAgICAgaWYgKG1fcmVw b3J0VVJMcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKQEAgLTUyMyw3ICs1MzQsNyBAQCBi b29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2hlY2tJbmxpbmVBCiAgICAgaWYgKCFkaXJlY3Rp dmUgfHwgZGlyZWN0aXZlLT5hbGxvd0lubGluZSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICByZXBvcnRWaW9sYXRpb24oZGlyZWN0aXZlLT50ZXh0KCksIGNvbnNvbGVNZXNzYWdlKTsKLSAg ICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIGRlbnlJZkVuZm9yY2luZ1BvbGljeSgpOwogfQog CiBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2hlY2tFdmFsQW5kUmVwb3J0VmlvbGF0aW9u KENTUERpcmVjdGl2ZSogZGlyZWN0aXZlLCBjb25zdCBTdHJpbmcmIGNvbnNvbGVNZXNzYWdlKSBj b25zdApAQCAtNTMxLDcgKzU0Miw3IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjpjaGVj a0V2YWxBbmQKICAgICBpZiAoY2hlY2tFdmFsKGRpcmVjdGl2ZSkpCiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIHJlcG9ydFZpb2xhdGlvbihkaXJlY3RpdmUtPnRleHQoKSwgY29uc29sZU1lc3Nh Z2UpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gZGVueUlmRW5mb3JjaW5nUG9saWN5 KCk7CiB9CiAKIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjpjaGVja1NvdXJjZUFuZFJlcG9y dFZpb2xhdGlvbihDU1BEaXJlY3RpdmUqIGRpcmVjdGl2ZSwgY29uc3QgS1VSTCYgdXJsLCBjb25z dCBTdHJpbmcmIHR5cGUpIGNvbnN0CkBAIC01MzksNyArNTUwLDcgQEAgYm9vbCBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OmNoZWNrU291cmNlQQogICAgIGlmICghZGlyZWN0aXZlIHx8IGRpcmVjdGl2 ZS0+YWxsb3dzKHVybCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIHJlcG9ydFZpb2xhdGlv bihkaXJlY3RpdmUtPnRleHQoKSwgbWFrZVN0cmluZygiUmVmdXNlZCB0byBsb2FkICIsIHR5cGUs ICIgZnJvbSAnIiwgdXJsLnN0cmluZygpLCAiJyBiZWNhdXNlIG9mIENvbnRlbnQtU2VjdXJpdHkt UG9saWN5LlxuIikpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gZGVueUlmRW5mb3Jj aW5nUG9saWN5KCk7CiB9CiAKIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0phdmFT Y3JpcHRVUkxzKCkgY29uc3QKQEAgLTU0Nyw3ICs1NTgsNyBAQCBib29sIENvbnRlbnRTZWN1cml0 eVBvbGljeTo6YWxsb3dKYXZhU2NyCiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNv bnNvbGVNZXNzYWdlLCAoIlJlZnVzZWQgdG8gZXhlY3V0ZSBKYXZhU2NyaXB0IFVSTCBiZWNhdXNl IG9mIENvbnRlbnQtU2VjdXJpdHktUG9saWN5LlxuIikpOwogICAgIGlmIChtX2Rpc2FibGVKYXZh U2NyaXB0VVJMcykgewogICAgICAgICByZXBvcnRWaW9sYXRpb24oU3RyaW5nKCksIGNvbnNvbGVN ZXNzYWdlKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gZGVueUlmRW5m b3JjaW5nUG9saWN5KCk7CiAgICAgfQogICAgIHJldHVybiBjaGVja0lubGluZUFuZFJlcG9ydFZp b2xhdGlvbihvcGVyYXRpdmVEaXJlY3RpdmUobV9zY3JpcHRTcmMuZ2V0KCkpLCBjb25zb2xlTWVz c2FnZSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGlj eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9s aWN5LmgJKHJldmlzaW9uIDg1OTc2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2Vj dXJpdHlQb2xpY3kuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsMTIgQEAgcHVibGljOgog ICAgIH0KICAgICB+Q29udGVudFNlY3VyaXR5UG9saWN5KCk7CiAKLSAgICB2b2lkIGRpZFJlY2Vp dmVIZWFkZXIoY29uc3QgU3RyaW5nJik7CisgICAgZW51bSBIZWFkZXJUeXBlIHsKKyAgICAgICAg UmVwb3J0T25seSwKKyAgICAgICAgRW5mb3JjZVBvbGljeQorICAgIH07CisKKyAgICB2b2lkIGRp ZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5nJiwgSGVhZGVyVHlwZSk7CiAKICAgICBib29sIGFs bG93SmF2YVNjcmlwdFVSTHMoKSBjb25zdDsKICAgICBib29sIGFsbG93SW5saW5lRXZlbnRIYW5k bGVycygpIGNvbnN0OwpAQCAtNzcsOSArODIsMTIgQEAgcHJpdmF0ZToKICAgICBib29sIGNoZWNr RXZhbEFuZFJlcG9ydFZpb2xhdGlvbihDU1BEaXJlY3RpdmUqLCBjb25zdCBTdHJpbmcmIGNvbnNv bGVNZXNzYWdlKSBjb25zdDsKICAgICBib29sIGNoZWNrU291cmNlQW5kUmVwb3J0VmlvbGF0aW9u KENTUERpcmVjdGl2ZSosIGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmIHR5cGUpIGNvbnN0Owog CisgICAgYm9vbCBkZW55SWZFbmZvcmNpbmdQb2xpY3koKSBjb25zdCB7IHJldHVybiBtX3JlcG9y dE9ubHk7IH0KKwogICAgIGJvb2wgbV9oYXZlUG9saWN5OwogICAgIERvY3VtZW50KiBtX2RvY3Vt ZW50OwogCisgICAgYm9vbCBtX3JlcG9ydE9ubHk7CiAgICAgT3duUHRyPENTUERpcmVjdGl2ZT4g bV9kZWZhdWx0U3JjOwogICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fc2NyaXB0U3JjOwogICAg IE93blB0cjxDU1BEaXJlY3RpdmU+IG1fb2JqZWN0U3JjOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gODU5 NzgpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx MyBAQAorMjAxMS0wNS0wNiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCAiUmVw b3J0LU9ubHkiIG1vZGUgZm9yIENTUAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjA0MDIKKworICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29u dGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1vbmx5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVwb3J0LW9u bHkuaHRtbDogQWRkZWQuCisKIDIwMTEtMDUtMDYgIEp1c3RpbiBTY2h1aCAgPGpzY2h1aEBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IExheW91 dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1v bmx5LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Nl Y3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtb25seS1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1 cml0eVBvbGljeS9yZXBvcnQtb25seS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMTAgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAxOiBbUmVwb3J0IE9ubHldIFJlZnVzZWQg dG8gZXhlY3V0ZSBpbmxpbmUgc2NyaXB0IGJlY2F1c2Ugb2YgQ29udGVudC1TZWN1cml0eS1Qb2xp Y3kuCisKK0FMRVJUOiBQQVNTCitDU1AgcmVwb3J0IHJlY2VpdmVkOgorQ09OVEVOVF9UWVBFOiBh cHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQKK0hUVFBfUkVGRVJFUjogaHR0cDovLzEy Ny4wLjAuMTo4MDAwL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXBvcnQtb25seS5o dG1sCitSRVFVRVNUX01FVEhPRDogUE9TVAorPT09IFBPU1QgREFUQSA9PT0KK2RvY3VtZW50LXVy bDogaHR0cDovLzEyNy4wLjAuMTo4MDAwL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9y ZXBvcnQtb25seS5odG1sCit2aW9sYXRlZC1kaXJlY3RpdmU6IHNjcmlwdC1zcmMgJ3NlbGYnCklu ZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGlj eS9yZXBvcnQtb25seS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv c2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3JlcG9ydC1vbmx5Lmh0bWwJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBv bGljeS9yZXBvcnQtb25seS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYgQEAKKzxtZXRh IGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUC1SZXBvcnQtT25seSIgY29udGVudD0ic2NyaXB0LXNy YyAnc2VsZic7IHJlcG9ydC11cmkgcmVzb3VyY2VzL3NhdmUtcmVwb3J0LnBocCI+Cis8c2NyaXB0 PgorLy8gVGhpcyBzY3JpcHQgYmxvY2sgd2lsbCB0cmlnZ2VyIGEgdmlvbGF0aW9uIHJlcG9ydCBi dXQgc2hvdWxkbid0IGJlIGJsb2NrZWQuCithbGVydCgnUEFTUycpOworPC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0icmVzb3VyY2VzL2dvLXRvLWVjaG8tcmVwb3J0LmpzIj48L3NjcmlwdD4K