diff --git a/ChangeLog b/ChangeLog index 70aa5b90d6..cee9e06de5 100644 --- 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 index bebce1a91b..c2d59b5139 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -23,7 +23,11 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; 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' http://www.phpmyadmin.net; 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')) {