Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 66c0fbd6319e639b0ae752e2d0d292773c00bc7b https://github.com/phpmyadmin/phpmyadmin/commit/66c0fbd6319e639b0ae752e2d0d2... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M libraries/dbi/DBIMysqli.php Log Message: ----------- Simplify SSL setup Simplify setup to follow current PHP documentation: - the MYSQLI_CLIENT_SSL flag should not be needed - there is mysqli_option flag to turn of certificate verification - remove check for defined constants, all should be there in PHP versions we support Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 7413208ce723d7d1c315a70b8789de91b0c202f8 https://github.com/phpmyadmin/phpmyadmin/commit/7413208ce723d7d1c315a70b8789... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/dbi/DBIMysqli.php Log Message: ----------- Merge pull request #12157 from nijel/ssl Simplify SSL setup Commit: 2c1b18a75b420aabd0a1052220460f56281199fd https://github.com/phpmyadmin/phpmyadmin/commit/2c1b18a75b420aabd0a105222046... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/dbi/DBIMysqli.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e875d4b50b55...2c1b18a75b42