From f97b2ee8d2d9506e63ff12db61d2c3e9946a3608 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 25 Mar 2013 19:50:24 -0400
Subject: [PATCH] Bug #3854 Incorrect header for Safari 6.0

---
 ChangeLog                     | 1 +
 libraries/Config.class.php    | 4 ++--
 libraries/header_http.inc.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a241cb36d..00e550c756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 3.5.8.0 (not yet released)
 - bug #3828 MariaDB reported as MySQL
+- bug #3854 Incorrect header for Safari 6.0
 
 3.5.7.0 (2013-02-15)
 - bug #3779 [core] Problem with backslash in enum fields
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 34bb504d5b..5f764e9ff5 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -221,9 +221,9 @@ class PMA_Config
             '@Mozilla/([0-9].[0-9]{1,2})@',
             $HTTP_USER_AGENT,
             $log_version)
-            && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)
+            && preg_match('@Version/(.*) Safari@', $HTTP_USER_AGENT, $log_version2)
         ) {
-            $this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]);
+            $this->set('PMA_USR_BROWSER_VER', $log_version2[1]);
             $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
         } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) {
             $this->set('PMA_USR_BROWSER_VER', '1.9');
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index 818185137d..156ac2da08 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -23,7 +23,7 @@ $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:");
-    if (PMA_USR_BROWSER_AGENT == 'SAFARI') {
+    if (PMA_USR_BROWSER_AGENT == 'SAFARI' && PMA_USR_BROWSER_VER < '6.0.0') {
         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'");