svn: /php/php-src/branches/PHP_5_3/ NEWS ext/pdo_mysql/mysql_driver.c

pajoye Sat, 08 Oct 2011 06:17:08 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=317882 Log: - fix bug #55870, PDO ignores all SSL parameters when used with mysql native driver Bug: https://bugs.php.net/55870 (Open) PDO ignores all SSL parameters when used with mysql native driver Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-10-07 22:51:50 UTC (rev 317881) +++ php/php-src/branches/PHP_5_3/NEWS 2011-10-08 06:17:08 UTC (rev 317882) @@ -61,8 +61,10 @@ . 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) Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2011-10-07 22:51:50 UTC (rev 317881) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2011-10-08 06:17:08 UTC (rev 317882) @@ -627,7 +627,7 @@ 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 @@ } } #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);