svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
| From: | Andrey Hristov | Date: | Thu, 08 Apr 2010 09:01:21 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62220@lists.php.net to get a copy of this message | ||
andrey Thu, 08 Apr 2010 09:01:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=297688
Log:
Fix for bug #51026 ssl not working
Bug: http://bugs.php.net/51026 (Assigned) ssl not working
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/trunk/ext/mysqli/mysqli_api.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-04-08 08:39:50 UTC (rev 297687)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-04-08 09:01:21 UTC (rev 297688)
@@ -40,6 +40,7 @@
parsing date strings). (Derick)
- Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8). (Chris Jones)
- Fixed bug #51062 (DBA DB4 uses mismatched headers and libraries). (Chris Jones)
+- Fixed bug #51026 (mysqli_ssl_set not working). (Andrey)
- Fixed bug #51023 (filter doesn't detect int overflows with GCC 4.4).
(Raphael Geissert)
- Fixed bug #50999 (unaligned memory access in dba_fetch()). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-04-08 08:39:50 UTC (rev 297687)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-04-08 09:01:21 UTC (rev 297688)
@@ -2132,7 +2132,7 @@
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osssss",
&mysql_link, mysqli_link_class_entry, &ssl_parm[0], &ssl_parm_len[0], &ssl_parm[1],
&ssl_parm_len[1], &ssl_parm[2], &ssl_parm_len[2], &ssl_parm[3],
&ssl_parm_len[3], &ssl_parm[4], &ssl_parm_len[4]) == FAILURE) {
return;
}
- MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
for (i = 0; i < 5; i++) {
if (!ssl_parm_len[i]) {
Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_api.c 2010-04-08 08:39:50 UTC (rev 297687)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2010-04-08 09:01:21 UTC (rev 297688)
@@ -2132,7 +2132,7 @@
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osssss",
&mysql_link, mysqli_link_class_entry, &ssl_parm[0], &ssl_parm_len[0], &ssl_parm[1],
&ssl_parm_len[1], &ssl_parm[2], &ssl_parm_len[2], &ssl_parm[3],
&ssl_parm_len[3], &ssl_parm[4], &ssl_parm_len[4]) == FAILURE) {
return;
}
- MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
for (i = 0; i < 5; i++) {
if (!ssl_parm_len[i]) {