From 856013827414fb6c9987f156c8b79d47459bc214 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Wed, 22 Jul 2015 20:34:31 +0300 Subject: [PATCH 1/4] Fix 69882 entry --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 6cc46aa5308..9b3734565ec 100644 --- a/NEWS +++ b/NEWS @@ -32,8 +32,8 @@ PHP NEWS columns). (cmb) - OpenSSL: - . Fixed bug #69882 (OpenSSL error “key values mismatch” after - openssl_pkcs12_read with extra cert) (Tomasz Sawicki) + . Fixed bug #69882 (OpenSSL error "key values mismatch" after + openssl_pkcs12_read with extra cert). (Tomasz Sawicki) - Standard: . Fixed bug #70096 (Repeated iptcembed() adds superfluous FF bytes). (cmb) From 6aa44ac73ab1c71026b9cb2a930122cc30929337 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Wed, 22 Jul 2015 20:35:31 +0300 Subject: [PATCH 2/4] Align CVE format for #69669 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9b3734565ec..12e3e6bd383 100644 --- a/NEWS +++ b/NEWS @@ -69,7 +69,7 @@ PHP NEWS number). (Nikita) - Mysqlnd: - . Fixed bug #69669 (mysqlnd is vulnerable to BACKRONYM) (CVE-2015-3152). + . Fixed bug #69669 (mysqlnd is vulnerable to BACKRONYM). (CVE-2015-3152) (Andrey) - PCRE: From 3d38db35763e0ed26a1b5101fd09afb9bcfc4991 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 23 Jul 2015 07:31:54 +0200 Subject: [PATCH 3/4] fix C99 compat --- ext/ldap/ldap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 9c9e28a3d49..cca4b6eaec9 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1924,12 +1924,12 @@ PHP_FUNCTION(ldap_compare) int dn_len, attr_len, value_len; ldap_linkdata *ld; int errno; + struct berval lvalue; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &link, &dn, &dn_len, &attr, &attr_len, &value, &value_len) != SUCCESS) { return; } - struct berval lvalue; lvalue.bv_val = value; lvalue.bv_len = value_len; From 91f985b2f9b5ba03d7b98bdaa710331c115f6a70 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 23 Jul 2015 07:34:31 +0200 Subject: [PATCH 4/4] fix config.w32 --- ext/ldap/config.w32 | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index 2fa05f43834..9102c6c952b 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -22,6 +22,7 @@ if (PHP_LDAP != "no") { AC_DEFINE('HAVE_LDAP_SASL', 1); AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1); AC_DEFINE('LDAP_DEPRECATED', 1); + AC_DEFINE('HAVE_LDAP_CONTROL_FIND', 1); } else { WARNING("ldap not enabled; libraries and headers not found");