Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak

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