71588 2011-11-04 14:10:23 -0700 When CSP blocks mixed content, we shouldn't also warn about mixed content 2011-11-04 15:32:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth eric japhet sam webkit.review.bot oldest_to_newest 496457 0 abarth 2011-11-04 14:10:23 -0700 When CSP blocks mixed content, we shouldn't also warn about mixed content 496459 1 113711 abarth 2011-11-04 14:12:28 -0700 Created attachment 113711 Patch 496468 2 113711 eric 2011-11-04 14:23:03 -0700 Comment on attachment 113711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113711&action=review LGTM. > Source/WebCore/loader/cache/CachedResourceLoader.cpp:306 > switch (type) { This switch really should be a helper function. Another patch, of course. 496506 3 113711 webkit.review.bot 2011-11-04 15:32:30 -0700 Comment on attachment 113711 Patch Clearing flags on attachment: 113711 Committed r99329: <http://trac.webkit.org/changeset/99329> 496507 4 webkit.review.bot 2011-11-04 15:32:35 -0700 All reviewed patches have been landed. Closing bug. 113711 2011-11-04 14:12:28 -0700 2011-11-04 15:32:30 -0700 Patch bug-71588-20111104141227.patch text/plain 5701 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MzE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTEtMDQgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBXaGVuIENTUCBibG9ja3MgbWl4ZWQg Y29udGVudCwgd2Ugc2hvdWxkbid0IGFsc28gd2FybiBhYm91dCBtaXhlZCBjb250ZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTU4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdldHRpbmcgYm90aCB3 YXJuaW5ncyBjb25mdXNlZCBzb21lIGVhcmx5IGFkb3B0ZXJzLiAgVGhleSB0aG91Z2h0IHRoZQor ICAgICAgICBpbnNlY3VyZSBsb2FkcyB3ZXJlIGhhcHBlbmluZyBldmVuIHRob3VnaCB0aGV5IGJs b2NrZWQgdGhlbSB3aXRoIENTUC4KKyAgICAgICAgVGhpcyBwYXRjaCByZXN0cmljdHMgdGhlIG1p eGVkIGNvbnRlbnQgd2FybmluZ3MgdG8gc2hvdyBvbmx5IHdoZW4gdGhlCisgICAgICAgIGxvYWQg aXNuJ3QgYWxyZWFkeSBibG9ja2VkIGJ5IENTUCBvciBieSB0aGUgZW1iZWRkZXIuCisKKyAgICAg ICAgVGVzdDogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvYmxvY2st bWl4ZWQtY29udGVudC1oaWRlcy13YXJuaW5nLmh0bWwKKworICAgICAgICAqIGxvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNv dXJjZUxvYWRlcjo6Y2FuUmVxdWVzdCk6CisKIDIwMTEtMTEtMDQgIFBhdHJpY2sgR2Fuc3RlcmVy ICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBSZW1vdmUgRU5BQkxFX1NRTElU RSBmcm9tIHFtYWtlIGZpbGVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDk5MzEwKQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzAzLDEzICszMDMsNiBAQCBib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpj YW5SZXF1ZXN0KENhCiAjZW5kaWYKICAgICB9CiAKLSAgICAvLyBHaXZlbiB0aGF0IHRoZSBsb2Fk IGlzIGFsbG93ZWQgYnkgdGhlIHNhbWUtb3JpZ2luIHBvbGljeSwgd2Ugc2hvdWxkCi0gICAgLy8g Y2hlY2sgd2hldGhlciB0aGUgbG9hZCBwYXNzZXMgdGhlIG1peGVkLWNvbnRlbnQgcG9saWN5Lgot ICAgIC8vCi0gICAgLy8gRklYTUU6IFNob3VsZCB3ZSBjb25zaWRlciBmb3JQcmVsb2FkIGhlcmU/ Ci0gICAgaWYgKCFjaGVja0luc2VjdXJlQ29udGVudCh0eXBlLCB1cmwpKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KICAgICBzd2l0Y2ggKHR5cGUpIHsKICNpZiBFTkFCTEUoWFNMVCkKICAgICBj YXNlIENhY2hlZFJlc291cmNlOjpYU0xTdHlsZVNoZWV0OgpAQCAtMzYyLDYgKzM1NSwxNCBAQCBi b29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0KENhCiAjZW5kaWYKICAgICB9CiAK KyAgICAvLyBMYXN0IG9mIGFsbCwgY2hlY2sgZm9yIGluc2VjdXJlIGNvbnRlbnQuIFdlIGRvIHRo aXMgbGFzdCBzbyB0aGF0IHdoZW4KKyAgICAvLyBmb2xrcyBibG9jayBpbnNlY3VyZSBjb250ZW50 IHdpdGggYSBDU1AgcG9saWN5LCB0aGV5IGRvbid0IGdldCBhIHdhcm5pbmcuCisgICAgLy8gVGhl eSdsbCBzdGlsbCBnZXQgYSB3YXJuaW5nIGluIHRoZSBjb25zb2xlIGFib3V0IENTUCBibG9ja2lu ZyB0aGUgbG9hZC4KKworICAgIC8vIEZJWE1FOiBTaG91bGQgd2UgY29uc2lkZXIgZm9yUHJlbG9h ZCBoZXJlPworICAgIGlmICghY2hlY2tJbnNlY3VyZUNvbnRlbnQodHlwZSwgdXJsKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKSW5kZXg6IExheW91dFRl c3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlz aW9uIDk5MzE4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTEtMTEtMDQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4K KworICAgICAgICBXaGVuIENTUCBibG9ja3MgbWl4ZWQgY29udGVudCwgd2Ugc2hvdWxkbid0IGFs c28gd2FybiBhYm91dCBtaXhlZCBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MTU4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZXNlIHRlc3RzIGNoZWNrIHdoYXQga2luZHMgb2Ygd2Fybmlu Z3Mgd2UgZ2VuZXJhdGUgd2hlbiBibG9ja2luZyBpbnNlY3VyZSBzY3JpcHRzIHdpdGggQ1NQLgor CisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvYmxv Y2stbWl4ZWQtY29udGVudC1oaWRlcy13YXJuaW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvYmxvY2stbWl4 ZWQtY29udGVudC1oaWRlcy13YXJuaW5nLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVz dHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9hbGVydC1mYWlsLmpz OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBv bGljeS9yZXNvdXJjZXMvbWl4ZWQtY29udGVudC13aXRoLWNzcC5odG1sOiBBZGRlZC4KKwogMjAx MS0xMS0wNCAgRXJpayBBcnZpZHNzb24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIExh eW91dCBUZXN0IHN0b3JhZ2UvaW5kZXhlZGRiL2V4Y2VwdGlvbi1pbi1ldmVudC1hYm9ydHMuaHRt bCBpcyBmYWlsaW5nCkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRl bnRTZWN1cml0eVBvbGljeS9ibG9jay1taXhlZC1jb250ZW50LWhpZGVzLXdhcm5pbmctZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29u dGVudFNlY3VyaXR5UG9saWN5L2Jsb2NrLW1peGVkLWNvbnRlbnQtaGlkZXMtd2FybmluZy1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS9ibG9jay1taXhlZC1jb250ZW50LWhpZGVzLXdhcm5pbmct ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAKK0NPTlNPTEUgTUVTU0FH RTogbGluZSAxOiBSZWZ1c2VkIHRvIGxvYWQgc2NyaXB0IGZyb20gJ2h0dHA6Ly8xMjcuMC4wLjE6 ODA4MC9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvcmVzb3VyY2VzL2FsZXJ0LWZhaWwu anMnIGJlY2F1c2Ugb2YgQ29udGVudC1TZWN1cml0eS1Qb2xpY3kuCisKK1RoaXMgcGFnZSBzaG91 bGQgbmVpdGhlciBhbGVydCAiRkFJTCIgbm9yIGdlbmVyYXRlIGFueSBtaXhlZCBjb250ZW50IHdh cm5pbmdzIGluIHRoZSBjb25zb2xlLiAKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2Jsb2NrLW1peGVkLWNvbnRlbnQtaGlkZXMtd2Fy bmluZy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkv Y29udGVudFNlY3VyaXR5UG9saWN5L2Jsb2NrLW1peGVkLWNvbnRlbnQtaGlkZXMtd2FybmluZy5o dG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250 ZW50U2VjdXJpdHlQb2xpY3kvYmxvY2stbWl4ZWQtY29udGVudC1oaWRlcy13YXJuaW5nLmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNiBAQAorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOwor PC9zY3JpcHQ+CitUaGlzIHBhZ2Ugc2hvdWxkIG5laXRoZXIgYWxlcnQgIkZBSUwiIG5vciBnZW5l cmF0ZSBhbnkgbWl4ZWQgY29udGVudCB3YXJuaW5ncyBpbiB0aGUgY29uc29sZS4KKzxpZnJhbWUg c3JjPSJodHRwczovLzEyNy4wLjAuMTo4NDQzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGlj eS9yZXNvdXJjZXMvbWl4ZWQtY29udGVudC13aXRoLWNzcC5odG1sIj48L2lmcmFtZT4KSW5kZXg6 IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jl c291cmNlcy9hbGVydC1mYWlsLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVz dHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9hbGVydC1mYWlsLmpz CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50 U2VjdXJpdHlQb2xpY3kvcmVzb3VyY2VzL2FsZXJ0LWZhaWwuanMJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEgQEAKK2FsZXJ0KCdGQUlMJyk7CkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Nl Y3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvbWl4ZWQtY29udGVudC13aXRo LWNzcC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkv Y29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9taXhlZC1jb250ZW50LXdpdGgtY3NwLmh0 bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRl bnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvbWl4ZWQtY29udGVudC13aXRoLWNzcC5odG1sCShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAKKzxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNT UCIgY29udGVudD0iZGVmYXVsdC1zcmMgJ3NlbGYnIj4KK1RoaXMgcGFnZSBpbmNsdWRlcyBhbiBp bnNlY3VyZSBzY3JpcHQgdGhhdCBhbGVydHMgIkZBSUwiLCBidXQgdGhhdCBzY3JpcHQgaXMgYmxv Y2tlZCBieSBDU1AuCis8c2NyaXB0IHNyYz0iaHR0cDovLzEyNy4wLjAuMTo4MDgwL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvYWxlcnQtZmFpbC5qcyI+PC9zY3JpcHQ+ Cg==