georg Mon May 29 05:38:50 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/mysqli mysqli_api.c
Log:
Fix for bug #37620
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.59&r2=1.2027.2.547.2.60&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.59 php-src/NEWS:1.2027.2.547.2.60
--- php-src/NEWS:1.2027.2.547.2.59 Sun May 28 20:34:10 2006
+++ php-src/NEWS Mon May 29 05:38:50 2006
@@ -47,9 +47,10 @@
- Added RFC2397 (data: stream) support. (Marcus)
- Fixed memory leaks in openssl streams context options (Pierre)
- Fixed handling of extremely long paths inside tempnam() function. (Ilia)
+- Fixed bug #37620 (mysqli_ssl_set validation is innappropriate). (Georg)
- Fixed bug #37614 (Class name lowercased in error message). (Johannes)
- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
-- Fixed bug #37586 (Bumped minimum PCRE version to 6.6, needed for recurssion
+- Fixed bug #37586 (Bumped minimum PCRE version to 6.6, needed for recursion
limit support). (Ilia)
- Fixed bug #37569 (WDDX incorrectly encodes high-ascii characters). (Ilia)
- Fixed bug #37565 (Using reflection::export with simplexml causing a crash).
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.2&r2=1.118.2.22.2.3&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.2
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.3
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.2 Wed May 10 11:53:13 2006
+++ php-src/ext/mysqli/mysqli_api.c Mon May 29 05:38:50 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.22.2.2 2006/05/10 11:53:13 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.3 2006/05/29 05:38:50 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1759,7 +1759,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]) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
