1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00

Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař
2016-06-06 09:33:22 +02:00
2 changed files with 2 additions and 0 deletions

View File

@@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog
- issue #12279 Fixed error reporting on connect problems
- issue #12290 Fixed export of tables without explicitly set engine
- issue #12285 Designer JavaScript error: Show/Hide tables list
- issue #12293 Fix MySQL SSL connection with some PHP versions
4.6.2 (2016-05-25)
- issue [security] User SQL queries can be revealed through URL GET parameters, see PMASA-2016-14

View File

@@ -149,6 +149,7 @@ class DBIMysqli implements DBIExtension
/* Optionally enable SSL */
if ($cfg['Server']['ssl']) {
$client_flags |= MYSQLI_CLIENT_SSL;
mysqli_ssl_set(
$link,
$cfg['Server']['ssl_key'],