fix config.w32

fix C99 compat
5.6.12RC1
2026-11-12 19:50:50 +00:00 · 2015-07-23 09:26:34 +02:00 · 2015-07-23 09:26:24 +02:00 · 2015-07-22 09:43:46 +02:00
5 changed files with 6 additions and 5 deletions
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Jul 2015, PHP 5.6.12
+23 Jul 2015, PHP 5.6.12RC1

 - Core:
  . Fixed bug #70012 (Exception lost with nested finally block). (Laruence)
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=6
 PHP_RELEASE_VERSION=12
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION="RC1"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`

@@ -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");
@@ -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;

@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 6
 #define PHP_RELEASE_VERSION 12
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.12-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.6.12RC1"
 #define PHP_VERSION_ID 50612
Author	SHA1	Message	Date
Anatol Belski	e851133882	fix config.w32	2015-07-23 09:26:34 +02:00
Anatol Belski	e85f8e112d	fix C99 compat	2015-07-23 09:26:24 +02:00
Julien Pauli	b5275ff36a	5.6.12RC1	2015-07-22 09:43:46 +02:00