Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)

Author: laruence

ext/ldap/ldap.c

@@ -1476,7 +1476,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
 	zend_ulong index;
 	int is_full_add=0; /* flag for full add operation so ldap_mod_add can be put back into oper, gerrit THomson */
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsa", &link, &dn, &dn_len, &entry) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsa/", &link, &dn, &dn_len, &entry) != SUCCESS) {
 		return;
 	}
 
@@ -1524,6 +1524,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
 		if (Z_TYPE_P(value) != IS_ARRAY) {
 			num_values = 1;
 		} else {
+			SEPARATE_ARRAY(value);
 			num_values = zend_hash_num_elements(Z_ARRVAL_P(value));
 		}
 

ext/ldap/tests/bug73933.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #73933 (error/segfault with ldap_mod_replace and opcache)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+?>
+--FILE--
+<?php
+/* We are assuming 3333 is not connectable */
+$ldap = ldap_connect('127.0.0.1', 3333);
+
+ldap_mod_replace($ldap, null, array(
+	'lockoutTime' => array(0),
+));
+
+ldap_close($ldap);
+
+?>
+--EXPECTF--
+Warning: ldap_mod_replace(): Modify: Can't contact LDAP server in %sbug73933.php on line %d