change from feedback

Author: devnexen

ext/ldap/ldap.c

@@ -984,62 +984,59 @@ PHP_FUNCTION(ldap_connect)
 		RETURN_FALSE;
 	}
 
-	object_init_ex(return_value, ldap_link_ce);
-	ld = Z_LDAP_LINK_P(return_value);
-
-	{
-		int rc = LDAP_SUCCESS;
-		char	*url = host;
-		if (url && !ldap_is_ldap_url(url)) {
-			size_t urllen = hostlen + sizeof( "ldap://:65535" );
 
-			if (port <= 0 || port > 65535) {
-				zval_ptr_dtor(return_value);
-				zend_argument_value_error(2, "must be between 1 and 65535");
-				RETURN_THROWS();
-			}
+	int rc = LDAP_SUCCESS;
+	char	*url = host;
+	if (url && !ldap_is_ldap_url(url)) {
+		size_t urllen = hostlen + sizeof( "ldap://:65535" );
 
-			url = emalloc(urllen);
-			snprintf( url, urllen, "ldap://%s:" ZEND_LONG_FMT, host, port );
+		if (port <= 0 || port > 65535) {
+			zend_argument_value_error(2, "must be between 1 and 65535");
+			RETURN_THROWS();
 		}
 
+		url = emalloc(urllen);
+		snprintf( url, urllen, "ldap://%s:" ZEND_LONG_FMT, host, port );
+	}
+
 #ifdef LDAP_OPT_X_TLS_NEWCTX
-		if (LDAPG(tls_newctx) && url && !strncmp(url, "ldaps:", 6)) {
-			int val = 0;
+	if (LDAPG(tls_newctx) && url && !strncmp(url, "ldaps:", 6)) {
+		int val = 0;
 
-			/* ensure all pending TLS options are applied in a new context */
-			if (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {
-				zval_ptr_dtor(return_value);
-				php_error_docref(NULL, E_WARNING, "Could not create new security context");
-				RETURN_FALSE;
-			}
-			LDAPG(tls_newctx) = false;
+		/* ensure all pending TLS options are applied in a new context */
+		if (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {
+			zval_ptr_dtor(return_value);
+			php_error_docref(NULL, E_WARNING, "Could not create new security context");
+			RETURN_FALSE;
 		}
+		LDAPG(tls_newctx) = false;
+	}
 #endif
+	object_init_ex(return_value, ldap_link_ce);
+	ld = Z_LDAP_LINK_P(return_value);
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP
-		/* ldap_init() is deprecated, use ldap_initialize() instead.
-		 */
-		rc = ldap_initialize(&ldap, url);
+	/* ldap_init() is deprecated, use ldap_initialize() instead.
+	*/
+	rc = ldap_initialize(&ldap, url);
 #else /* ! LDAP_API_FEATURE_X_OPENLDAP */
-		/* ldap_init does not support URLs.
-		 * We must try the original host and port information.
-		 */
-		ldap = ldap_init(host, port);
-		if (ldap == NULL) {
-			zval_ptr_dtor(return_value);
-			php_error_docref(NULL, E_WARNING, "Could not create session handle");
-			RETURN_FALSE;
-		}
+	/* ldap_init does not support URLs.
+	 * We must try the original host and port information.
+	 */
+	ldap = ldap_init(host, port);
+	if (ldap == NULL) {
+		zval_ptr_dtor(return_value);
+		php_error_docref(NULL, E_WARNING, "Could not create session handle");
+		RETURN_FALSE;
+	}
 #endif /* ! LDAP_API_FEATURE_X_OPENLDAP */
-		if (url != host) {
-			efree(url);
-		}
-		if (rc != LDAP_SUCCESS) {
-			zval_ptr_dtor(return_value);
-			php_error_docref(NULL, E_WARNING, "Could not create session handle: %s", ldap_err2string(rc));
-			RETURN_FALSE;
-		}
+	if (url != host) {
+		efree(url);
+	}
+	if (rc != LDAP_SUCCESS) {
+		zval_ptr_dtor(return_value);
+		php_error_docref(NULL, E_WARNING, "Could not create session handle: %s", ldap_err2string(rc));
+		RETURN_FALSE;
 	}
 
 	if (ldap == NULL) {