From 1c715f79b4e3fdc3b80d27f8fc0bcdde2b0dfed8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 24 Feb 2014 14:14:19 +0100
Subject: Fix some PDO::MYSQL_* constants (wrongly described in PHP manual
 before 5.3.21)

---
 INSTALL                                  | 2 +-
 program/lib/Roundcube/rcube_db_mysql.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4671d80d9..4eb75307e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ REQUIREMENTS
 * PHP Version 5.2.1 or greater including
    - PCRE, DOM, JSON, XML, Session, Sockets (required)
    - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required)
-     Note: MySQL database driver requires PHP 5.3 or newer.
+     Note: MySQL database driver requires PHP 5.3.7 or newer.
    - Libiconv, Zip (recommended)
    - Fileinfo, Mcrypt, mbstring (optional)
 * PEAR packages distributed with Roundcube or external:
diff --git a/program/lib/Roundcube/rcube_db_mysql.php b/program/lib/Roundcube/rcube_db_mysql.php
index d3d0ac5c8..e6417cc0a 100644
--- a/program/lib/Roundcube/rcube_db_mysql.php
+++ b/program/lib/Roundcube/rcube_db_mysql.php
@@ -128,11 +128,11 @@ class rcube_db_mysql extends rcube_db
         $result = array();
 
         if (!empty($dsn['key'])) {
-            $result[PDO::MYSQL_ATTR_KEY] = $dsn['key'];
+            $result[PDO::MYSQL_ATTR_SSL_KEY] = $dsn['key'];
         }
 
         if (!empty($dsn['cipher'])) {
-            $result[PDO::MYSQL_ATTR_CIPHER] = $dsn['cipher'];
+            $result[PDO::MYSQL_ATTR_SSL_CIPHER] = $dsn['cipher'];
         }
 
         if (!empty($dsn['cert'])) {
-- 
cgit v1.2.3