[Pkg-php-commits] [php/debian-sid] Cherry pick upstream fix for mysqli_ssl_set (Closes: #572122)

[Raphael Geissert]

---
 debian/patches/series                    |    1 +
 debian/patches/upstream/mysqli_ssl.patch |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/mysqli_ssl.patch

diff --git a/debian/patches/series b/debian/patches/series
index 14f7d0a..37c0c6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,4 @@ fix_broken_gd_bundled-specific_tests.patch
 CVE-2010-0397.patch
 enchant_unaligned_memory_access.patch
 use_system_crypt_fixes.patch
+upstream/mysqli_ssl.patch
diff --git a/debian/patches/upstream/mysqli_ssl.patch b/debian/patches/upstream/mysqli_ssl.patch
new file mode 100644
index 0000000..7bdcd35
--- /dev/null
+++ b/debian/patches/upstream/mysqli_ssl.patch
@@ -0,0 +1,17 @@
+Description: Fix mysqli_ssl_set
+Origin: http://svn.php.net/viewvc?view=revision&revision=297688
+Last-Update: 2010-05-01
+
+Index: php/ext/mysqli/mysqli_api.c
+===================================================================
+--- php.orig/ext/mysqli/mysqli_api.c
++++ php/ext/mysqli/mysqli_api.c
+@@ -2134,7 +2134,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]) {
-- 
1.6.5