From: Pierre Joye <pajoye@php.net>
Date: Sat, 8 Oct 2011 06:17:08 +0000 (+0000)
Subject: - fix bug #55870, PDO ignores all SSL parameters when used with mysql native driver
X-Git-Tag: php-5.3.9RC1~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1ad60d3d5e082253decb6cf2ac6c542a7ed4e05;p=php

- fix bug #55870, PDO ignores all SSL parameters when used with mysql native driver
---

diff --git a/NEWS b/NEWS
index 400c8e1a24..b97f975c38 100644
--- a/NEWS
+++ b/NEWS
@@ -61,8 +61,10 @@ PHP                                                                        NEWS
   . Fixed bug #55776 (PDORow to session bug). (Johannes)
 
 - PDO MySQL driver:
-  . Fixed bug #54158 (MYSQLND+PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE)
-  (Andrey)
+  . Fixed bug #55870 (PDO ignores all SSL parameters when used with mysql 
+    native driver) (Pierre)
+  . Fixed bug #54158 (MYSQLND+PDO MySQL requires #define 
+    MYSQL_OPT_LOCAL_INFILE) (Andrey)
 
 - PDO OCI driver:
   . Fixed bug #55768 (PDO_OCI can't resume Oracle session after it's been killed)
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 170bef6c6c..1cb6674e64 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -627,7 +627,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 		char *default_file = NULL, *default_group = NULL;
 		long compress = 0;
 #endif
-#if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSLQND)
+#if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSQLND)
 		char *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL, *ssl_cipher = NULL;
 #endif
 		H->buffered = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1 TSRMLS_CC);
@@ -716,7 +716,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 			}
 		}
 #endif
-#if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSLQND)
+#if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSQLND)
 		ssl_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_KEY, NULL TSRMLS_CC);
 		ssl_cert = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_CERT, NULL TSRMLS_CC);
 		ssl_ca = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_CA, NULL TSRMLS_CC);