Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak

diff --cc ext/ldap/ldap.c
index 48a925cc1c275aebdf6b61f30ec9e7be796cc257,e384f3c044b57ae590d48d1349dc1c478db63a22..0f82354ac9a0aaea23809d237e9f75e99b647142
--- 1/ext/ldap/ldap.c
--- 2/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@@ -419,7 -370,8 +419,8 @@@ PHP_FUNCTION(ldap_connect
                        int     urllen = hostlen + sizeof( "ldap://:65535" );
  
                        if (port <= 0 || port > 65535) {
 -                              php_error_docref(NULL, E_WARNING, "invalid port number: %ld", port);
+                               efree(ld);
 +                              php_error_docref(NULL, E_WARNING, "invalid port number: " ZEND_LONG_FMT, port);
                                RETURN_FALSE;
                        }