bug #3523499 [core] Make X-WebKit-CSP work better

This seems to work fine in Epiphany and Chromium, I don't have other browsers to test.
phpmyadmin · May 15, 2012 · 4a141a0 · 4a141a0
1 parent 837ccad
commit 4a141a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug [GUI] Invalid HTML code on transformation_overview.php
 - bug #3522930 [browse] Missing validation in Ajax mode
 - bug Fix popup message on build SQL of import
+- bug #3523499 [core] Make X-WebKit-CSP work better
 
 3.5.1.0 (2012-05-03)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
@@ -23,7 +23,7 @@
 if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) {
     header('X-Frame-Options: SAMEORIGIN');
     header("X-Content-Security-Policy: allow 'self'; options inline-script eval-script; frame-ancestors 'self'; img-src 'self' data:; script-src 'self' http://www.phpmyadmin.net");
-    header("X-WebKit-CSP: default-src 'self' 'unsafe-inline'; img-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://www.phpmyadmin.net");
+    header("X-WebKit-CSP: allow 'self' http://www.phpmyadmin.net; options inline-script eval-script");
 }
 PMA_no_cache_header();
 if (!defined('IS_TRANSFORMATION_WRAPPER')) {