Merge pull request #164 from lem9/bug_3821

Bug #3821 Safari: white page
phpmyadmin · Feb 12, 2013 · 9702c92 · 9702c92
2 parents a358df5 + c758fda
commit 9702c92
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 3.5.7.0 (not yet released)
 - bug #3779 [core] Problem with backslash in enum fields
 - bug #3816 Missing server_processlist.php
+- bug #3821 Safari: white page
 
 3.5.6.0 (2013-01-28)
 - bug #3593604 [status] Erroneous advisor rule

diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
@@ -23,7 +23,11 @@
 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:");
-    header("X-WebKit-CSP: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
+    if (PMA_USR_BROWSER_AGENT == 'SAFARI') {
+        header("X-WebKit-CSP: allow 'self'; options inline-script eval-script");
+    } else {
+        header("X-WebKit-CSP: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
+    }
 }
 PMA_no_cache_header();
 if (!defined('IS_TRANSFORMATION_WRAPPER')) {