svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqlnd/config.w32 trunk/ext/mysqlnd/config.w32
| From: | Kalle Sommer Nielsen | Date: | Mon, 31 Jan 2011 12:47:28 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqlnd/config.w32 trunk/ext/mysqlnd/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64465@lists.php.net to get a copy of this message | ||
kalle Mon, 31 Jan 2011 12:47:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307880
Log:
Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL)
Bug: http://bugs.php.net/53795 (Assigned) Connect Error from
MySqli (mysqlnd) when using SSL
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32
U php/php-src/trunk/ext/mysqlnd/config.w32
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-01-31 12:44:39 UTC (rev 307879)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-01-31 12:47:28 UTC (rev 307880)
@@ -73,6 +73,8 @@
- MySQL Improved extension:
. Added 'db' and 'catalog' keys to the field fetching functions (FR #39847).
(Kalle)
+ . Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL).
+ (Kalle)
. Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA
query). (Kalle, Andrey)
. Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32 2011-01-31 12:44:39 UTC (rev 307879)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32 2011-01-31 12:47:28 UTC (rev 307880)
@@ -24,6 +24,7 @@
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND))
|| (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
{
AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Compression support");
+ AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
}
PHP_INSTALL_HEADERS("", "ext/mysqlnd");
}
Modified: php/php-src/trunk/ext/mysqlnd/config.w32
===================================================================
--- php/php-src/trunk/ext/mysqlnd/config.w32 2011-01-31 12:44:39 UTC (rev 307879)
+++ php/php-src/trunk/ext/mysqlnd/config.w32 2011-01-31 12:47:28 UTC (rev 307880)
@@ -26,6 +26,7 @@
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND))
|| (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
{
AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Compression support");
+ AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
}
PHP_INSTALL_HEADERS("", "ext/mysqlnd");
}