The branch, master has been updated
via 2154120e3a3e3eb111772c69ddc1eec72c0345f1 (commit)
from ec263b9170f89b033374ae8a1281d779693d8200 (commit)
- Log -----------------------------------------------------------------
commit 2154120e3a3e3eb111772c69ddc1eec72c0345f1
Author: Michal Čihař <michal(a)cihar.com>
Date: Sun Apr 25 16:51:53 2010 +0200
[core] Include Content Security Policy HTTP headers.
See <https://wiki.mozilla.org/Security/CSP/Specification> for more
details. I hope current rule is flexible enough to avoid impact on
existing functionality.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/header_http.inc.php | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 06d98cb..40fa43b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,7 @@ $Id$
+ rfe #2983207, patch #2988715 [interface] Use jQuery calendar dialog, thanks
to Muhammad Adnan.
+ [doc] Incorporate synchronisation docs into main document.
++ [core] Include Content Security Policy HTTP headers.
3.3.3.0 (not yet released)
- patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index 2a1c445..46f8017 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -23,6 +23,7 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
/* Prevent against ClickJacking by allowing frames only from same origin */
if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) {
header('X-Frame-Options: SAMEORIGIN');
+ header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'');
}
header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
header('Last-Modified: ' . $GLOBALS['now']);
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via ec263b9170f89b033374ae8a1281d779693d8200 (commit)
via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit)
from bd90d40defef2384145517c75cf1b185656327c9 (commit)
- Log -----------------------------------------------------------------
commit ec263b9170f89b033374ae8a1281d779693d8200
Merge: bd90d40defef2384145517c75cf1b185656327c9 e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Apr 25 07:10:20 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_operations.php | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8b1906e..06d98cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,7 @@ $Id$
- bug #2983062, patch #2989408 [engines] Fix warnings when changing table
engine to Maria, thanks to Madhura Jayaratne.
- bug #2974067 [display] non-binary fields shown as hex
+- bug #2983065 [operations] Error when changing from Maria to MyISAM engine
3.3.2.0 (2010-04-13)
- patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/tbl_operations.php b/tbl_operations.php
index 87ccce9..04fd618 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -157,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) {
$reread_info = true;
unset($table_alters);
foreach (PMA_DBI_get_warnings() as $warning) {
- $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
- . ' ' . $warning['Message'];
+ // In MariaDB 5.1.44, when altering a table from Maria to MyISAM
+ // and if TRANSACTIONAL was set, the system reports an error;
+ // I discussed with a Maria developer and he agrees that this
+ // should not be reported with a Level of Error, so here
+ // I just ignore it. But there are other 1478 messages
+ // that it's better to show.
+ if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) {
+ $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
+ . ' ' . $warning['Message'];
+ }
}
}
}
hooks/post-receive
--
phpMyAdmin
The branch, QA_3_3 has been updated
via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit)
from acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit)
- Log -----------------------------------------------------------------
commit e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Apr 25 07:09:39 2010 -0400
bug #2983065 Error when changing from Maria to MyISAM engine
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_operations.php | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4bda4f7..0679157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2983062, patch #2989408 [engines] Fix warnings when changing table
engine to Maria, thanks to Madhura Jayaratne.
- bug #2974067 [display] non-binary fields shown as hex
+- bug #2983065 [operations] Error when changing from Maria to MyISAM engine
3.3.2.0 (2010-04-13)
- patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/tbl_operations.php b/tbl_operations.php
index e859b3c..98e5f1b 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -157,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) {
$reread_info = true;
unset($table_alters);
foreach (PMA_DBI_get_warnings() as $warning) {
- $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
- . ' ' . $warning['Message'];
+ // In MariaDB 5.1.44, when altering a table from Maria to MyISAM
+ // and if TRANSACTIONAL was set, the system reports an error;
+ // I discussed with a Maria developer and he agrees that this
+ // should not be reported with a Level of Error, so here
+ // I just ignore it. But there are other 1478 messages
+ // that it's better to show.
+ if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) {
+ $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
+ . ' ' . $warning['Message'];
+ }
}
}
}
hooks/post-receive
--
phpMyAdmin