summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Richter <georg@php.net>2006-05-29 05:38:50 +0000
committerGeorg Richter <georg@php.net>2006-05-29 05:38:50 +0000
commit10ed7a1e0ac0cd502f6ff33181cb57d83fa1f2d7 (patch)
tree688fa093ceacd0c5e33db1720fdadcae0d3ada88
parent7ac96de03938bcce07ed8882b2e66b9f92a3de63 (diff)
downloadphp-git-10ed7a1e0ac0cd502f6ff33181cb57d83fa1f2d7.tar.gz
Fix for bug #37620
-rw-r--r--NEWS3
-rw-r--r--ext/mysqli/mysqli_api.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 5d05b93ffe..d6611ce2ef 100644
--- a/NEWS
+++ b/NEWS
@@ -47,9 +47,10 @@ PHP NEWS
- 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).
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 1dcaec2a5d..b409e56b51 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1759,7 +1759,7 @@ PHP_FUNCTION(mysqli_ssl_set)
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]) {