147693 2015-08-05 14:41:04 -0700 [Win] Allow display of mixed content on Windows (by default) 2015-08-05 16:55:32 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue oldest_to_newest 1115119 0 bfulgham 2015-08-05 14:41:04 -0700 In r183023: <http://trac.webkit.org/changeset/183023>, mixed content blocking was disabled for WK1 clients. This is also needed for our Windows clients: 1. If the preference is set to block (or allow), we honor that setting. 2. If the preference has never been set, we allow mixed content to match existing behavior. Security-Conscious WebKit Windows clients should be sure to set this preference to FALSE in new applications. 1115140 1 bfulgham 2015-08-05 15:39:56 -0700 <rdar://problem/22059707> 1115141 2 258309 bfulgham 2015-08-05 15:42:33 -0700 Created attachment 258309 Patch 1115183 3 bfulgham 2015-08-05 16:50:29 -0700 Committed r188005: <http://trac.webkit.org/changeset/188005> 258309 2015-08-05 15:42:33 -0700 2015-08-05 16:24:23 -0700 Patch bug-147693-20150805155720.patch text/plain 4965 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Nzk5MykKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTA1 ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEFs bG93IGRpc3BsYXkgb2YgbWl4ZWQgY29udGVudCBvbiBXaW5kb3dzIGJ5IGRlZmF1bHQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzY5MworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMjIwNTk3MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBJbnRlcmZhY2VzL0lXZWJQcmVmZXJlbmNlc1ByaXZhdGUu aWRsOiBBZGQgcHJlZmVyZW5jZSBhY2Nlc3NvcgorICAgICAgICB0byBhbGxvdyBnZXR0aW5nL3Nl dHRpbmcgdXNlIG9mIGluc2VjdXJlIGNvbnRlbnQuCisgICAgICAgICogV2ViUHJlZmVyZW5jZUtl eXNQcml2YXRlLmg6IEFkZCBuZXcga2V5IGZvciBwcmVmZXJlbmNlLgorICAgICAgICAqIFdlYlBy ZWZlcmVuY2VzLmNwcDogSW1wbGVtZW50IHByZWZlcmVuY2UgYWNjZXNzb3IuCisgICAgICAgICog V2ViUHJlZmVyZW5jZXMuaDoKKyAgICAgICAgKiBXZWJWaWV3LmNwcDogU2V0IFdlYkNvcmUgc2V0 dGluZ3MgdG8gbWF0Y2ggcHJlZmVybmNlcyBmb3IKKyAgICAgICAgbG9hZGluZyBtaXhlZCBjb250 ZW50LgorCiAyMDE1LTA4LTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIEZpeCBXaW5kb3dzIGJ1aWxkLgpJbmRleDogU291cmNlL1dlYktpdC93aW4v V2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93 aW4vV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgJKHJldmlzaW9uIDE4Nzk2NCkKKysrIFNvdXJj ZS9XZWJLaXQvd2luL1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNjMsMyArMTYzLDUgQEAKICNkZWZpbmUgV2ViS2l0TW9ja1Njcm9sbGJhcnNFbmFibGVkUHJl ZmVyZW5jZUtleSAiV2ViS2l0TW9ja1Njcm9sbGJhcnNFbmFibGVkIgogCiAjZGVmaW5lIFdlYktp dEVuYWJsZUluaGVyaXRVUklRdWVyeUNvbXBvbmVudFByZWZlcmVuY2VLZXkgIldlYktpdEVuYWJs ZUluaGVyaXRVUklRdWVyeUNvbXBvbmVudCIKKworI2RlZmluZSBXZWJLaXRBbGxvd0Rpc3BsYXlB bmRSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnRQcmVmZXJlbmNlS2V5ICJXZWJLaXRBbGxvd0Rpc3Bs YXlBbmRSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnQiCkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9X ZWJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViUHJl ZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAxODc5NjQpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJQ cmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29w eXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5LCAyMDEwLCAyMDExLCAyMDE0IEFwcGxl IEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYtMjAxMSwg MjAxNC0yMDE1IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTI5Myw2ICsyOTMsOCBAQCB2b2lkIFdlYlByZWZlcmVuY2Vz Ojppbml0aWFsaXplRGVmYXVsdFNlCiAKICAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0 cywgQ0ZTVFIoV2ViS2l0UmVxdWVzdEFuaW1hdGlvbkZyYW1lRW5hYmxlZFByZWZlcmVuY2VLZXkp LCBrQ0ZCb29sZWFuRmFsc2UpOwogCisgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVmYXVsdHMs IENGU1RSKFdlYktpdEFsbG93RGlzcGxheUFuZFJ1bm5pbmdPZkluc2VjdXJlQ29udGVudFByZWZl cmVuY2VLZXkpLCBrQ0ZCb29sZWFuVHJ1ZSk7CisKICAgICBkZWZhdWx0U2V0dGluZ3MgPSBkZWZh dWx0czsKIH0KIApAQCAtMTg0MiwzICsxODQ0LDE1IEBAIEhSRVNVTFQgV2ViUHJlZmVyZW5jZXM6 OnNldEVuYWJsZUluaGVyaXQKICAgICBzZXRCb29sVmFsdWUoV2ViS2l0RW5hYmxlSW5oZXJpdFVS SVF1ZXJ5Q29tcG9uZW50UHJlZmVyZW5jZUtleSwgZW5hYmxlZCk7CiAgICAgcmV0dXJuIFNfT0s7 CiB9CisKK0hSRVNVTFQgV2ViUHJlZmVyZW5jZXM6OmFsbG93RGlzcGxheUFuZFJ1bm5pbmdPZklu c2VjdXJlQ29udGVudChCT09MKiBlbmFibGVkKQoreworICAgICplbmFibGVkID0gYm9vbFZhbHVl Rm9yS2V5KFdlYktpdEFsbG93RGlzcGxheUFuZFJ1bm5pbmdPZkluc2VjdXJlQ29udGVudFByZWZl cmVuY2VLZXkpOworICAgIHJldHVybiBTX09LOworfQorCitIUkVTVUxUIFdlYlByZWZlcmVuY2Vz OjpzZXRBbGxvd0Rpc3BsYXlBbmRSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnQoQk9PTCBlbmFibGVk KQoreworICAgIHNldEJvb2xWYWx1ZShXZWJLaXRBbGxvd0Rpc3BsYXlBbmRSdW5uaW5nT2ZJbnNl Y3VyZUNvbnRlbnRQcmVmZXJlbmNlS2V5LCBlbmFibGVkKTsKKyAgICByZXR1cm4gU19PSzsKK30K SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC93aW4vV2ViUHJlZmVyZW5jZXMuaAkocmV2aXNpb24gMTg3OTY0KQorKysg U291cmNlL1dlYktpdC93aW4vV2ViUHJlZmVyZW5jZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNDkw LDYgKzQ5MCw4IEBAIHB1YmxpYzoKICAgICAvLyBJV2ViUHJlZmVyZW5jZXNQcml2YXRlMgogICAg IHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBqYXZhU2NyaXB0UnVudGltZUZsYWdz KHVuc2lnbmVkKik7CiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHNldEph dmFTY3JpcHRSdW50aW1lRmxhZ3ModW5zaWduZWQpOworICAgIHZpcnR1YWwgSFJFU1VMVCBTVERN RVRIT0RDQUxMVFlQRSBhbGxvd0Rpc3BsYXlBbmRSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnQoQk9P TCopOworICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBzZXRBbGxvd0Rpc3Bs YXlBbmRSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnQoQk9PTCk7CiAKICAgICAvLyBXZWJQcmVmZXJl bmNlcwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gMTg3OTY0KQorKysgU291 cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUyNDcsNiArNTI0 NywxMiBAQCBIUkVTVUxUIFdlYlZpZXc6Om5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlCiAgICAgICAg IHJldHVybiBocjsKICAgICBzZXR0aW5ncy5zZXRFbmFibGVJbmhlcml0VVJJUXVlcnlDb21wb25l bnQoZW5hYmxlZCk7CiAKKyAgICBociA9IHByZWZzUHJpdmF0ZS0+YWxsb3dEaXNwbGF5QW5kUnVu bmluZ09mSW5zZWN1cmVDb250ZW50KCZlbmFibGVkKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkKKyAg ICAgICAgcmV0dXJuIGhyOworICAgIHNldHRpbmdzLnNldEFsbG93RGlzcGxheU9mSW5zZWN1cmVD b250ZW50KCEhZW5hYmxlZCk7CisgICAgc2V0dGluZ3Muc2V0QWxsb3dSdW5uaW5nT2ZJbnNlY3Vy ZUNvbnRlbnQoISFlbmFibGVkKTsKKwogICAgIGhyID0gcHJlZnNQcml2YXRlLT5qYXZhU2NyaXB0 UnVudGltZUZsYWdzKCZqYXZhU2NyaXB0UnVudGltZUZsYWdzKTsKICAgICBpZiAoRkFJTEVEKGhy KSkKICAgICAgICAgcmV0dXJuIGhyOwpJbmRleDogU291cmNlL1dlYktpdC93aW4vSW50ZXJmYWNl cy9JV2ViUHJlZmVyZW5jZXNQcml2YXRlLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3dpbi9JbnRlcmZhY2VzL0lXZWJQcmVmZXJlbmNlc1ByaXZhdGUuaWRsCShyZXZpc2lvbiAxODc5 NjQpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJQcmVmZXJlbmNlc1ByaXZh dGUuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsNCArMTY2LDYgQEAgaW50ZXJmYWNlIElXZWJQ cmVmZXJlbmNlc1ByaXZhdGUyIDogSVdlYgogewogICAgIEhSRVNVTFQgamF2YVNjcmlwdFJ1bnRp bWVGbGFncyhbb3V0LCByZXR2YWxdIHVuc2lnbmVkKiBmbGFncyk7CiAgICAgSFJFU1VMVCBzZXRK YXZhU2NyaXB0UnVudGltZUZsYWdzKFtpbl0gdW5zaWduZWQgZmxhZ3MpOworICAgIEhSRVNVTFQg YWxsb3dEaXNwbGF5QW5kUnVubmluZ09mSW5zZWN1cmVDb250ZW50KFtvdXQsIHJldHZhbF0gQk9P TCogZW5hYmxlZCk7CisgICAgSFJFU1VMVCBzZXRBbGxvd0Rpc3BsYXlBbmRSdW5uaW5nT2ZJbnNl Y3VyZUNvbnRlbnQoW2luXSBCT09MIGVuYWJsZWQpOwogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUK