Refactored ext/ldap

5 files changed, 205 insertions, 225 deletions

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index eb7d405b63..6a29355c4e 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -73,14 +73,14 @@
 typedef struct {
 	LDAP *link;
 #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
-	zval *rebindproc;
+	zval rebindproc;
 #endif
 } ldap_linkdata;
 
 typedef struct {
 	LDAPMessage *data;
-	BerElement *ber;
-	int id;
+	BerElement  *ber;
+	zval         res;
 } ldap_resultentry;
 
 ZEND_DECLARE_MODULE_GLOBALS(ldap)
@@ -92,30 +92,27 @@ static int le_link, le_result, le_result_entry;
 ZEND_GET_MODULE(ldap)
 #endif
 
-static void _close_ldap_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _close_ldap_link(zend_resource *rsrc TSRMLS_DC) /* {{{ */
 {
 	ldap_linkdata *ld = (ldap_linkdata *)rsrc->ptr;
 
 	ldap_unbind_s(ld->link);
 #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
-	if (ld->rebindproc != NULL) {
-		zval_dtor(ld->rebindproc);
-		FREE_ZVAL(ld->rebindproc);
-	}
+	zval_ptr_dtor(&ld->rebindproc);
 #endif
 	efree(ld);
 	LDAPG(num_links)--;
 }
 /* }}} */
 
-static void _free_ldap_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _free_ldap_result(zend_resource *rsrc TSRMLS_DC) /* {{{ */
 {
 	LDAPMessage *result = (LDAPMessage *)rsrc->ptr;
 	ldap_msgfree(result);
 }
 /* }}} */
 
-static void _free_ldap_result_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _free_ldap_result_entry(zend_resource *rsrc TSRMLS_DC) /* {{{ */
 {
 	ldap_resultentry *entry = (ldap_resultentry *)rsrc->ptr;
 
@@ -123,7 +120,7 @@ static void _free_ldap_result_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{
 		ber_free(entry->ber, 0);
 		entry->ber = NULL;
 	}
-	zend_list_delete(entry->id);
+	zval_ptr_dtor(&entry->res);
 	efree(entry);
 } 
 /* }}} */
@@ -214,7 +211,7 @@ PHP_MINIT_FUNCTION(ldap)
 	le_result = zend_register_list_destructors_ex(_free_ldap_result, NULL, "ldap result", module_number);
 	le_result_entry = zend_register_list_destructors_ex(_free_ldap_result_entry, NULL, "ldap result entry", module_number);
 
-	Z_TYPE(ldap_module_entry) = type;
+	ldap_module_entry.type = type;
 
 	return SUCCESS;
 }
@@ -415,7 +412,7 @@ PHP_FUNCTION(ldap_bind)
 		RETURN_FALSE;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	if ((rc = ldap_bind_s(ld->link, ldap_bind_dn, ldap_bind_pw, LDAP_AUTH_SIMPLE)) != LDAP_SUCCESS) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to bind to server: %s", ldap_err2string(rc));
@@ -531,7 +528,7 @@ PHP_FUNCTION(ldap_sasl_bind)
 		RETURN_FALSE;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	ctx = _php_sasl_setdefs(ld->link, sasl_mech, sasl_realm, sasl_authc_id, passwd, sasl_authz_id);
 
@@ -562,9 +559,9 @@ PHP_FUNCTION(ldap_unbind)
 		RETURN_FALSE;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
-	zend_list_delete(Z_LVAL_P(link));
+	zend_list_close(Z_RES_P(link));
 	RETURN_TRUE;
 }
 /* }}} */
@@ -612,7 +609,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in
  */
 static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 {
-	zval *link, *base_dn, **filter, *attrs = NULL, **attr;
+	zval *link, *base_dn, *filter, *attrs = NULL, *attr;
 	long attrsonly, sizelimit, timelimit, deref;
 	char *ldap_base_dn = NULL, *ldap_filter = NULL, **ldap_attrs = NULL; 
 	ldap_linkdata *ld = NULL;
@@ -621,7 +618,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 	int old_ldap_sizelimit = -1, old_ldap_timelimit = -1, old_ldap_deref = -1;	 
 	int num_attribs = 0, ret = 1, i, errno, argcount = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(argcount TSRMLS_CC, "zzZ|allll", &link, &base_dn, &filter, &attrs, &attrsonly,
+	if (zend_parse_parameters(argcount TSRMLS_CC, "zzz|allll", &link, &base_dn, &filter, &attrs, &attrsonly,
 		&sizelimit, &timelimit, &deref) == FAILURE) {
 		return;
 	}
@@ -641,7 +638,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 			ldap_attrs = safe_emalloc((num_attribs+1), sizeof(char *), 0);
 
 			for (i = 0; i<num_attribs; i++) {
-				if (zend_hash_index_find(Z_ARRVAL_P(attrs), i, (void **) &attr) != SUCCESS) {
+				if ((attr = zend_hash_index_find(Z_ARRVAL_P(attrs), i)) == NULL) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array initialization wrong");
 					ret = 0;
 					goto cleanup;
@@ -649,7 +646,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 
 				SEPARATE_ZVAL(attr);
 				convert_to_string_ex(attr);
-				ldap_attrs[i] = Z_STRVAL_PP(attr);
+				ldap_attrs[i] = Z_STRVAL_P(attr);
 			}
 			ldap_attrs[num_attribs] = NULL;
 		default:
@@ -660,7 +657,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 	if (Z_TYPE_P(link) == IS_ARRAY) {
 		int i, nlinks, nbases, nfilters, *rcs;
 		ldap_linkdata **lds;
-		zval **entry, *resource;
+		zval *entry, resource;
 		
 		nlinks = zend_hash_num_elements(Z_ARRVAL_P(link));
 		if (nlinks == 0) {
@@ -687,18 +684,18 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 			}
 		}
 
-		if (Z_TYPE_PP(filter) == IS_ARRAY) {
-			nfilters = zend_hash_num_elements(Z_ARRVAL_PP(filter));
+		if (Z_TYPE_P(filter) == IS_ARRAY) {
+			nfilters = zend_hash_num_elements(Z_ARRVAL_P(filter));
 			if (nfilters != nlinks) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filter must either be a string, or an array with the same number of elements as the links array");
 				ret = 0;
 				goto cleanup;
 			}
-			zend_hash_internal_pointer_reset(Z_ARRVAL_PP(filter));
+			zend_hash_internal_pointer_reset(Z_ARRVAL_P(filter));
 		} else {
 			nfilters = 0; /* this means string, not array */
 			convert_to_string_ex(filter);
-			ldap_filter = Z_STRVAL_PP(filter);
+			ldap_filter = Z_STRVAL_P(filter);
 		}
 
 		lds = safe_emalloc(nlinks, sizeof(ldap_linkdata), 0);
@@ -706,7 +703,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 		
 		zend_hash_internal_pointer_reset(Z_ARRVAL_P(link));
 		for (i=0; i<nlinks; i++) {
-			zend_hash_get_current_data(Z_ARRVAL_P(link), (void **)&entry);
+			entry = zend_hash_get_current_data(Z_ARRVAL_P(link));
 
 			ld = (ldap_linkdata *) zend_fetch_resource(entry TSRMLS_CC, -1, "ldap link", NULL, 1, le_link);
 			if (ld == NULL) {
@@ -714,21 +711,21 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 				goto cleanup_parallel;
 			}
 			if (nbases != 0) { /* base_dn an array? */
-				zend_hash_get_current_data(Z_ARRVAL_P(base_dn), (void **)&entry);
+				entry = zend_hash_get_current_data(Z_ARRVAL_P(base_dn));
 				zend_hash_move_forward(Z_ARRVAL_P(base_dn));
 
 				/* If anything else than string is passed, ldap_base_dn = NULL */
-				if (Z_TYPE_PP(entry) == IS_STRING) {
-					ldap_base_dn = Z_STRVAL_PP(entry);
+				if (Z_TYPE_P(entry) == IS_STRING) {
+					ldap_base_dn = Z_STRVAL_P(entry);
 				} else {
 					ldap_base_dn = NULL;
 				}
 			}
 			if (nfilters != 0) { /* filter an array? */
-				zend_hash_get_current_data(Z_ARRVAL_PP(filter), (void **)&entry);
-				zend_hash_move_forward(Z_ARRVAL_PP(filter));
+				entry = zend_hash_get_current_data(Z_ARRVAL_P(filter));
+				zend_hash_move_forward(Z_ARRVAL_P(filter));
 				convert_to_string_ex(entry);
-				ldap_filter = Z_STRVAL_PP(entry);
+				ldap_filter = Z_STRVAL_P(entry);
 			}
 
 			php_set_opts(ld->link, ldap_sizelimit, ldap_timelimit, ldap_deref, &old_ldap_sizelimit, &old_ldap_timelimit, &old_ldap_deref);
@@ -743,13 +740,12 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 
 		/* Collect results from the searches */
 		for (i=0; i<nlinks; i++) {
-			MAKE_STD_ZVAL(resource);
 			if (rcs[i] != -1) {
 				rcs[i] = ldap_result(lds[i]->link, LDAP_RES_ANY, 1 /* LDAP_MSG_ALL */, NULL, &ldap_res);
 			}
 			if (rcs[i] != -1) {
-				ZEND_REGISTER_RESOURCE(resource, ldap_res, le_result);
-				add_next_index_zval(return_value, resource);
+				ZEND_REGISTER_RESOURCE(&resource, ldap_res, le_result);
+				add_next_index_zval(return_value, &resource);
 			} else {
 				add_next_index_bool(return_value, 0);
 			}
@@ -760,14 +756,14 @@ cleanup_parallel:
 		efree(rcs);
 	} else {
 		convert_to_string_ex(filter);
-		ldap_filter = Z_STRVAL_PP(filter);
+		ldap_filter = Z_STRVAL_P(filter);
 
 		/* If anything else than string is passed, ldap_base_dn = NULL */
 		if (Z_TYPE_P(base_dn) == IS_STRING) {
 			ldap_base_dn = Z_STRVAL_P(base_dn);
 		}
 
-		ld = (ldap_linkdata *) zend_fetch_resource(&link TSRMLS_CC, -1, "ldap link", NULL, 1, le_link);
+		ld = (ldap_linkdata *) zend_fetch_resource(link TSRMLS_CC, -1, "ldap link", NULL, 1, le_link);
 		if (ld == NULL) {
 			ret = 0;
 			goto cleanup;
@@ -852,9 +848,9 @@ PHP_FUNCTION(ldap_free_result)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, &result, -1, "ldap result", le_result);
+	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
 
-	zend_list_delete(Z_LVAL_P(result));  /* Delete list entry */
+	zend_list_close(Z_RES_P(result));  /* Delete list entry */
 	RETVAL_TRUE;
 }
 /* }}} */
@@ -871,8 +867,8 @@ PHP_FUNCTION(ldap_count_entries)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, &result, -1, "ldap result", le_result);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
 
 	RETURN_LONG(ldap_count_entries(ld->link, ldap_result));
 }
@@ -891,16 +887,15 @@ PHP_FUNCTION(ldap_first_entry)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, &result, -1, "ldap result", le_result);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
 
 	if ((entry = ldap_first_entry(ld->link, ldap_result)) == NULL) {
 		RETVAL_FALSE;
 	} else {
 		resultentry = emalloc(sizeof(ldap_resultentry));
 		ZEND_REGISTER_RESOURCE(return_value, resultentry, le_result_entry);
-		resultentry->id = Z_LVAL_P(result);
-		zend_list_addref(resultentry->id);
+		ZVAL_COPY(&resultentry->res, result);
 		resultentry->data = entry;
 		resultentry->ber = NULL;
 	}
@@ -920,16 +915,15 @@ PHP_FUNCTION(ldap_next_entry)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	if ((entry_next = ldap_next_entry(ld->link, resultentry->data)) == NULL) {
 		RETVAL_FALSE;
 	} else {
 		resultentry_next = emalloc(sizeof(ldap_resultentry));
 		ZEND_REGISTER_RESOURCE(return_value, resultentry_next, le_result_entry);
-		resultentry_next->id = resultentry->id;
-		zend_list_addref(resultentry->id);
+		ZVAL_COPY(&resultentry_next->res, &resultentry->res);
 		resultentry_next->data = entry_next;
 		resultentry_next->ber = NULL;
 	}
@@ -942,7 +936,7 @@ PHP_FUNCTION(ldap_get_entries)
 {
 	zval *link, *result;
 	LDAPMessage *ldap_result, *ldap_result_entry;
-	zval *tmp1, *tmp2;
+	zval tmp1, tmp2;
 	ldap_linkdata *ld;
 	LDAP *ldap;
 	int num_entries, num_attrib, num_values, i;
@@ -956,8 +950,8 @@ PHP_FUNCTION(ldap_get_entries)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, &result, -1, "ldap result", le_result);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
 
 	ldap = ld->link;
 	num_entries = ldap_count_entries(ldap, ldap_result);
@@ -977,8 +971,7 @@ PHP_FUNCTION(ldap_get_entries)
 
 	num_entries = 0;
 	while (ldap_result_entry != NULL) {
-		MAKE_STD_ZVAL(tmp1);
-		array_init(tmp1);
+		array_init(&tmp1);
 
 		num_attrib = 0;
 		attribute = ldap_first_attribute(ldap, ldap_result_entry, &ber);
@@ -987,17 +980,16 @@ PHP_FUNCTION(ldap_get_entries)
 			ldap_value = ldap_get_values_len(ldap, ldap_result_entry, attribute);
 			num_values = ldap_count_values_len(ldap_value);
 
-			MAKE_STD_ZVAL(tmp2);
-			array_init(tmp2);
-			add_assoc_long(tmp2, "count", num_values);
+			array_init(&tmp2);
+			add_assoc_long(&tmp2, "count", num_values);
 			for (i = 0; i < num_values; i++) {
-				add_index_stringl(tmp2, i, ldap_value[i]->bv_val, ldap_value[i]->bv_len);
+				add_index_stringl(&tmp2, i, ldap_value[i]->bv_val, ldap_value[i]->bv_len);
 			}	
 			ldap_value_free_len(ldap_value);
 
 			attr_len = strlen(attribute);
-			zend_hash_update(Z_ARRVAL_P(tmp1), php_strtolower(attribute, attr_len), attr_len+1, (void *) &tmp2, sizeof(zval *), NULL);
-			add_index_string(tmp1, num_attrib, attribute);
+			zend_hash_str_update(Z_ARRVAL(tmp1), php_strtolower(attribute, attr_len), attr_len, &tmp2);
+			add_index_string(&tmp1, num_attrib, attribute);
 
 			num_attrib++;
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP || WINDOWS
@@ -1011,16 +1003,16 @@ PHP_FUNCTION(ldap_get_entries)
 		}
 #endif
 
-		add_assoc_long(tmp1, "count", num_attrib);
+		add_assoc_long(&tmp1, "count", num_attrib);
 		dn = ldap_get_dn(ldap, ldap_result_entry);
-		add_assoc_string(tmp1, "dn", dn);
+		add_assoc_string(&tmp1, "dn", dn);
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP || WINDOWS
 		ldap_memfree(dn);
 #else
 		free(dn);
 #endif
 
-		zend_hash_index_update(Z_ARRVAL_P(return_value), num_entries, (void *) &tmp1, sizeof(zval *), NULL);
+		zend_hash_index_update(Z_ARRVAL_P(return_value), num_entries, &tmp1);
 		
 		num_entries++;
 		ldap_result_entry = ldap_next_entry(ldap, ldap_result_entry);
@@ -1045,13 +1037,13 @@ PHP_FUNCTION(ldap_first_attribute)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	if ((attribute = ldap_first_attribute(ld->link, resultentry->data, &resultentry->ber)) == NULL) {
 		RETURN_FALSE;
 	} else {
-		RETVAL_STRING(attribute, 1);
+		RETVAL_STRING(attribute);
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP || WINDOWS
 		ldap_memfree(attribute);
 #endif
@@ -1073,8 +1065,8 @@ PHP_FUNCTION(ldap_next_attribute)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	if (resultentry->ber == NULL) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "called before calling ldap_first_attribute() or no attributes found in result entry");
@@ -1090,7 +1082,7 @@ PHP_FUNCTION(ldap_next_attribute)
 #endif
 		RETURN_FALSE;
 	} else {
-		RETVAL_STRING(attribute, 1);
+		RETVAL_STRING(attribute);
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP || WINDOWS
 		ldap_memfree(attribute);
 #endif
@@ -1103,7 +1095,7 @@ PHP_FUNCTION(ldap_next_attribute)
 PHP_FUNCTION(ldap_get_attributes)
 {
 	zval *link, *result_entry;
-	zval *tmp;
+	zval tmp;
 	ldap_linkdata *ld;
 	ldap_resultentry *resultentry;
 	char *attribute;
@@ -1115,8 +1107,8 @@ PHP_FUNCTION(ldap_get_attributes)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	array_init(return_value);
 	num_attrib = 0;
@@ -1126,15 +1118,14 @@ PHP_FUNCTION(ldap_get_attributes)
 		ldap_value = ldap_get_values_len(ld->link, resultentry->data, attribute);
 		num_values = ldap_count_values_len(ldap_value);
 
-		MAKE_STD_ZVAL(tmp);
-		array_init(tmp);
-		add_assoc_long(tmp, "count", num_values);
+		array_init(&tmp);
+		add_assoc_long(&tmp, "count", num_values);
 		for (i = 0; i < num_values; i++) {
-			add_index_stringl(tmp, i, ldap_value[i]->bv_val, ldap_value[i]->bv_len);
+			add_index_stringl(&tmp, i, ldap_value[i]->bv_val, ldap_value[i]->bv_len);
 		}
 		ldap_value_free_len(ldap_value);
 
-		zend_hash_update(Z_ARRVAL_P(return_value), attribute, strlen(attribute)+1, (void *) &tmp, sizeof(zval *), NULL);
+		zend_hash_str_update(Z_ARRVAL_P(return_value), attribute, strlen(attribute), &tmp);
 		add_index_string(return_value, num_attrib, attribute);
 
 		num_attrib++;
@@ -1168,8 +1159,8 @@ PHP_FUNCTION(ldap_get_values_len)
 		return;
 	}
 	
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	if ((ldap_value_len = ldap_get_values_len(ld->link, resultentry->data, attr)) == NULL) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot get the value(s) of attribute %s", ldap_err2string(_get_lderrno(ld->link)));
@@ -1202,12 +1193,12 @@ PHP_FUNCTION(ldap_get_dn)
 		return;
 	}
 	
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	text = ldap_get_dn(ld->link, resultentry->data);
 	if (text != NULL) {
-		RETVAL_STRING(text, 1);
+		RETVAL_STRING(text);
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP || WINDOWS
 		ldap_memfree(text);
 #else
@@ -1265,7 +1256,7 @@ PHP_FUNCTION(ldap_dn2ufn)
 	ufn = ldap_dn2ufn(dn);
 	
 	if (ufn != NULL) {
-		RETVAL_STRING(ufn, 1);
+		RETVAL_STRING(ufn);
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP || WINDOWS
 		ldap_memfree(ufn);
 #endif
@@ -1282,13 +1273,13 @@ PHP_FUNCTION(ldap_dn2ufn)
  */
 static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
 {
-	zval *link, *entry, **value, **ivalue;
+	zval *link, *entry, *value, *ivalue;
 	ldap_linkdata *ld;
 	char *dn;
 	LDAPMod **ldap_mods;
 	int i, j, num_attribs, num_values, dn_len;
 	int *num_berval;
-	char *attribute;
+	zend_string *attribute;
 	ulong index;
 	int is_full_add=0; /* flag for full add operation so ldap_mod_add can be put back into oper, gerrit THomson */
 
@@ -1296,7 +1287,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
 		return;
 	}	
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	num_attribs = zend_hash_num_elements(Z_ARRVAL_P(entry));
 	ldap_mods = safe_emalloc((num_attribs+1), sizeof(LDAPMod *), 0);
@@ -1316,7 +1307,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
 		ldap_mods[i]->mod_type = NULL;
 
 		if (zend_hash_get_current_key(Z_ARRVAL_P(entry), &attribute, &index, 0) == HASH_KEY_IS_STRING) {
-			ldap_mods[i]->mod_type = estrdup(attribute);
+			ldap_mods[i]->mod_type = estrndup(attribute->val, attribute->len);
 		} else {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown attribute in the data");
 			/* Free allocated memory */
@@ -1332,26 +1323,26 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
 			RETURN_FALSE;
 		}
 
-		zend_hash_get_current_data(Z_ARRVAL_P(entry), (void **)&value);
+		value = zend_hash_get_current_data(Z_ARRVAL_P(entry));
 
-		if (Z_TYPE_PP(value) != IS_ARRAY) {
+		if (Z_TYPE_P(value) != IS_ARRAY) {
 			num_values = 1;
 		} else {
-			num_values = zend_hash_num_elements(Z_ARRVAL_PP(value));
+			num_values = zend_hash_num_elements(Z_ARRVAL_P(value));
 		}
 		
 		num_berval[i] = num_values;
 		ldap_mods[i]->mod_bvalues = safe_emalloc((num_values + 1), sizeof(struct berval *), 0);
 
 /* allow for arrays with one element, no allowance for arrays with none but probably not required, gerrit thomson. */
-		if ((num_values == 1) && (Z_TYPE_PP(value) != IS_ARRAY)) {
+		if ((num_values == 1) && (Z_TYPE_P(value) != IS_ARRAY)) {
 			convert_to_string_ex(value);
 			ldap_mods[i]->mod_bvalues[0] = (struct berval *) emalloc (sizeof(struct berval));
-			ldap_mods[i]->mod_bvalues[0]->bv_len = Z_STRLEN_PP(value);
-			ldap_mods[i]->mod_bvalues[0]->bv_val = Z_STRVAL_PP(value);
+			ldap_mods[i]->mod_bvalues[0]->bv_len = Z_STRLEN_P(value);
+			ldap_mods[i]->mod_bvalues[0]->bv_val = Z_STRVAL_P(value);
 		} else {	
 			for (j = 0; j < num_values; j++) {
-				if (zend_hash_index_find(Z_ARRVAL_PP(value), j, (void **) &ivalue) != SUCCESS) {
+				if ((ivalue = zend_hash_index_find(Z_ARRVAL_P(value), j)) == NULL) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Value array must have consecutive indices 0, 1, ...");
 					num_berval[i] = j;
 					num_attribs = i + 1;
@@ -1360,8 +1351,8 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
 				}
 				convert_to_string_ex(ivalue);
 				ldap_mods[i]->mod_bvalues[j] = (struct berval *) emalloc (sizeof(struct berval));
-				ldap_mods[i]->mod_bvalues[j]->bv_len = Z_STRLEN_PP(ivalue);
-				ldap_mods[i]->mod_bvalues[j]->bv_val = Z_STRVAL_PP(ivalue);
+				ldap_mods[i]->mod_bvalues[j]->bv_len = Z_STRLEN_P(ivalue);
+				ldap_mods[i]->mod_bvalues[j]->bv_val = Z_STRVAL_P(ivalue);
 			}
 		}
 		ldap_mods[i]->mod_bvalues[num_values] = NULL;
@@ -1446,7 +1437,7 @@ PHP_FUNCTION(ldap_delete)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	if ((rc = ldap_delete_s(ld->link, dn)) != LDAP_SUCCESS) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Delete: %s", ldap_err2string(rc));
@@ -1496,13 +1487,7 @@ static int _ldap_strlen_max(const char *str, uint max_len)
  */
 static void _ldap_hash_fetch(zval *hashTbl, const char *key, zval **out)
 {
-	zval **fetched;
-	if (zend_hash_find(Z_ARRVAL_P(hashTbl), key, strlen(key)+1, (void **) &fetched) == SUCCESS) {
-		*out = *fetched;
-	}
-	else {
-		*out = NULL;
-	}
+	*out = zend_hash_str_find(Z_ARRVAL_P(hashTbl), key, strlen(key));
 }
 /* }}} */
 
@@ -1513,7 +1498,7 @@ PHP_FUNCTION(ldap_modify_batch)
 	ldap_linkdata *ld;
 	zval *link, *mods, *mod, *modinfo, *modval;
 	zval *attrib, *modtype, *vals;
-	zval **fetched;
+	zval *fetched;
 	char *dn;
 	int dn_len;
 	int i, j, k;
@@ -1549,12 +1534,11 @@ PHP_FUNCTION(ldap_modify_batch)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	/* perform validation */
 	{
-		char *modkey;
-		uint modkeylen;
+		zend_string *modkey;
 		long modtype;
 
 		/* to store the wrongly-typed keys */
@@ -1577,11 +1561,11 @@ PHP_FUNCTION(ldap_modify_batch)
 
 		for (i = 0; i < num_mods; i++) {
 			/* is the numbering consecutive? */
-			if (zend_hash_index_find(Z_ARRVAL_P(mods), i, (void **) &fetched) != SUCCESS) {
+			if ((fetched = zend_hash_index_find(Z_ARRVAL_P(mods), i)) == NULL) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Modifications array must have consecutive indices 0, 1, ...");
 				RETURN_FALSE;
 			}
-			mod = *fetched;
+			mod = fetched;
 
 			/* is it an array? */
 			if (Z_TYPE_P(mod) != IS_ARRAY) {
@@ -1595,29 +1579,26 @@ PHP_FUNCTION(ldap_modify_batch)
 
 			for (j = 0; j < num_modprops; j++) {
 				/* are the keys strings? */
-				if (zend_hash_get_current_key_ex(Z_ARRVAL_P(mod), &modkey, &modkeylen, &tmpUlong, 0, NULL) != HASH_KEY_IS_STRING) {
+				if (zend_hash_get_current_key(Z_ARRVAL_P(mod), &modkey, &tmpUlong, 0) != HASH_KEY_IS_STRING) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Each entry of modifications array must be string-indexed");
 					RETURN_FALSE;
 				}
 
-				/* modkeylen includes the terminating NUL byte; remove that */
-				--modkeylen;
-
 				/* is this a valid entry? */
 				if (
-					!_ldap_str_equal_to_const(modkey, modkeylen, LDAP_MODIFY_BATCH_ATTRIB) &&
-					!_ldap_str_equal_to_const(modkey, modkeylen, LDAP_MODIFY_BATCH_MODTYPE) &&
-					!_ldap_str_equal_to_const(modkey, modkeylen, LDAP_MODIFY_BATCH_VALUES)
+					!_ldap_str_equal_to_const(modkey->val, modkey->len, LDAP_MODIFY_BATCH_ATTRIB) &&
+					!_ldap_str_equal_to_const(modkey->val, modkey->len, LDAP_MODIFY_BATCH_MODTYPE) &&
+					!_ldap_str_equal_to_const(modkey->val, modkey->len, LDAP_MODIFY_BATCH_VALUES)
 				) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "The only allowed keys in entries of the modifications array are '" LDAP_MODIFY_BATCH_ATTRIB "', '" LDAP_MODIFY_BATCH_MODTYPE "' and '" LDAP_MODIFY_BATCH_VALUES "'");
 					RETURN_FALSE;
 				}
 
-				zend_hash_get_current_data(Z_ARRVAL_P(mod), (void **) &fetched);
-				modinfo = *fetched;
+				fetched = zend_hash_get_current_data(Z_ARRVAL_P(mod));
+				modinfo = fetched;
 
 				/* does the value type match the key? */
-				if (_ldap_str_equal_to_const(modkey, modkeylen, LDAP_MODIFY_BATCH_ATTRIB)) {
+				if (_ldap_str_equal_to_const(modkey->val, modkey->len, LDAP_MODIFY_BATCH_ATTRIB)) {
 					if (Z_TYPE_P(modinfo) != IS_STRING) {
 						php_error_docref(NULL TSRMLS_CC, E_WARNING, "A '" LDAP_MODIFY_BATCH_ATTRIB "' value must be a string");
 						RETURN_FALSE;
@@ -1628,7 +1609,7 @@ PHP_FUNCTION(ldap_modify_batch)
 						RETURN_FALSE;
 					}
 				}
-				else if (_ldap_str_equal_to_const(modkey, modkeylen, LDAP_MODIFY_BATCH_MODTYPE)) {
+				else if (_ldap_str_equal_to_const(modkey->val, modkey->len, LDAP_MODIFY_BATCH_MODTYPE)) {
 					if (Z_TYPE_P(modinfo) != IS_LONG) {
 						php_error_docref(NULL TSRMLS_CC, E_WARNING, "A '" LDAP_MODIFY_BATCH_MODTYPE "' value must be a long");
 						RETURN_FALSE;
@@ -1648,19 +1629,19 @@ PHP_FUNCTION(ldap_modify_batch)
 
 					/* if it's REMOVE_ALL, there must not be a values array; otherwise, there must */
 					if (modtype == LDAP_MODIFY_BATCH_REMOVE_ALL) {
-						if (zend_hash_exists(Z_ARRVAL_P(mod), LDAP_MODIFY_BATCH_VALUES, strlen(LDAP_MODIFY_BATCH_VALUES) + 1)) {
+						if (zend_hash_str_exists(Z_ARRVAL_P(mod), LDAP_MODIFY_BATCH_VALUES, strlen(LDAP_MODIFY_BATCH_VALUES))) {
 							php_error_docref(NULL TSRMLS_CC, E_WARNING, "If '" LDAP_MODIFY_BATCH_MODTYPE "' is LDAP_MODIFY_BATCH_REMOVE_ALL, a '" LDAP_MODIFY_BATCH_VALUES "' array must not be provided");
 							RETURN_FALSE;
 						}
 					}
 					else {
-						if (!zend_hash_exists(Z_ARRVAL_P(mod), LDAP_MODIFY_BATCH_VALUES, strlen(LDAP_MODIFY_BATCH_VALUES) + 1)) {
+						if (!zend_hash_str_exists(Z_ARRVAL_P(mod), LDAP_MODIFY_BATCH_VALUES, strlen(LDAP_MODIFY_BATCH_VALUES))) {
 							php_error_docref(NULL TSRMLS_CC, E_WARNING, "If '" LDAP_MODIFY_BATCH_MODTYPE "' is not LDAP_MODIFY_BATCH_REMOVE_ALL, a '" LDAP_MODIFY_BATCH_VALUES "' array must be provided");
 							RETURN_FALSE;
 						}
 					}
 				}
-				else if (_ldap_str_equal_to_const(modkey, modkeylen, LDAP_MODIFY_BATCH_VALUES)) {
+				else if (_ldap_str_equal_to_const(modkey->val, modkey->len, LDAP_MODIFY_BATCH_VALUES)) {
 					if (Z_TYPE_P(modinfo) != IS_ARRAY) {
 						php_error_docref(NULL TSRMLS_CC, E_WARNING, "A '" LDAP_MODIFY_BATCH_VALUES "' value must be an array");
 						RETURN_FALSE;
@@ -1682,11 +1663,11 @@ PHP_FUNCTION(ldap_modify_batch)
 
 					/* are the keys consecutive? */
 					for (k = 0; k < num_modvals; k++) {
-						if (zend_hash_index_find(Z_ARRVAL_P(modinfo), k, (void **) &fetched) != SUCCESS) {
+						if ((fetched = zend_hash_index_find(Z_ARRVAL_P(modinfo), k)) == NULL) {
 							php_error_docref(NULL TSRMLS_CC, E_WARNING, "A '" LDAP_MODIFY_BATCH_VALUES "' array must have consecutive indices 0, 1, ...");
 							RETURN_FALSE;
 						}
-						modval = *fetched;
+						modval = fetched;
 
 						/* is the data element a string? */
 						if (Z_TYPE_P(modval) != IS_STRING) {
@@ -1711,8 +1692,8 @@ PHP_FUNCTION(ldap_modify_batch)
 		ldap_mods[i] = safe_emalloc(1, sizeof(LDAPMod), 0);
 
 		/* fetch the relevant data */
-		zend_hash_index_find(Z_ARRVAL_P(mods), i, (void **) &fetched);
-		mod = *fetched;
+		fetched = zend_hash_index_find(Z_ARRVAL_P(mods), i);
+		mod = fetched;
 
 		_ldap_hash_fetch(mod, LDAP_MODIFY_BATCH_ATTRIB, &attrib);
 		_ldap_hash_fetch(mod, LDAP_MODIFY_BATCH_MODTYPE, &modtype);
@@ -1751,8 +1732,8 @@ PHP_FUNCTION(ldap_modify_batch)
 			/* for each value */
 			for (j = 0; j < num_modvals; j++) {
 				/* fetch it */
-				zend_hash_index_find(Z_ARRVAL_P(vals), j, (void **) &fetched);
-				modval = *fetched;
+				fetched = zend_hash_index_find(Z_ARRVAL_P(vals), j);
+				modval = fetched;
 
 				/* allocate the data struct */
 				ldap_mods[i]->mod_bvalues[j] = safe_emalloc(1, sizeof(struct berval), 0);
@@ -1817,7 +1798,7 @@ PHP_FUNCTION(ldap_errno)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	RETURN_LONG(_get_lderrno(ld->link));
 }
@@ -1833,7 +1814,7 @@ PHP_FUNCTION(ldap_err2str)
 		return;
 	}
 
-	RETURN_STRING(ldap_err2string(perrno), 1);
+	RETURN_STRING(ldap_err2string(perrno));
 }
 /* }}} */
 
@@ -1849,11 +1830,11 @@ PHP_FUNCTION(ldap_error)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	ld_errno = _get_lderrno(ld->link);
 
-	RETURN_STRING(ldap_err2string(ld_errno), 1);
+	RETURN_STRING(ldap_err2string(ld_errno));
 }
 /* }}} */
 
@@ -1871,7 +1852,7 @@ PHP_FUNCTION(ldap_compare)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	errno = ldap_compare_s(ld->link, dn, attr, value);
 
@@ -1898,15 +1879,15 @@ PHP_FUNCTION(ldap_sort)
 	ldap_linkdata *ld;
 	char *sortfilter;
 	int sflen;
-	zend_rsrc_list_entry *le;
+	zend_resource *le;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrs", &link, &result, &sortfilter, &sflen) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
-	if (zend_hash_index_find(&EG(regular_list), Z_LVAL_P(result), (void **) &le) != SUCCESS || le->type != le_result) {
+	if ((le = zend_hash_index_find_ptr(&EG(regular_list), Z_RES_HANDLE_P(result))) == NULL || le->type != le_result) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Supplied resource is not a valid ldap result resource");
 		RETURN_FALSE;
 	}
@@ -1933,8 +1914,9 @@ PHP_FUNCTION(ldap_get_option)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
+	ZVAL_DEREF(retval);
 	switch (option) {
 	/* options with int value */
 	case LDAP_OPT_DEREF:
@@ -1952,7 +1934,7 @@ PHP_FUNCTION(ldap_get_option)
 			if (ldap_get_option(ld->link, option, &val)) {
 				RETURN_FALSE;
 			}
-			zval_dtor(retval);
+			zval_ptr_dtor(retval);
 			ZVAL_LONG(retval, val);
 		} break;
 #ifdef LDAP_OPT_NETWORK_TIMEOUT
@@ -1969,7 +1951,7 @@ PHP_FUNCTION(ldap_get_option)
 			if (!timeout) {
 				RETURN_FALSE;
 			}
-			zval_dtor(retval);
+			zval_ptr_dtor(retval);
 			ZVAL_LONG(retval, timeout->tv_sec);
 			ldap_memfree(timeout);
 		} break;
@@ -1981,7 +1963,7 @@ PHP_FUNCTION(ldap_get_option)
 			if (ldap_get_option(ld->link, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout)) {
 				RETURN_FALSE;
 			}			
-			zval_dtor(retval);
+			zval_ptr_dtor(retval);
 			ZVAL_LONG(retval, (timeout / 1000));
 		} break;
 #endif
@@ -2008,8 +1990,8 @@ PHP_FUNCTION(ldap_get_option)
 				}
 				RETURN_FALSE;
 			}
-			zval_dtor(retval);
-			ZVAL_STRING(retval, val, 1);
+			zval_ptr_dtor(retval);
+			ZVAL_STRING(retval, val);
 			ldap_memfree(val);
 		} break;
 /* options not implemented
@@ -2029,19 +2011,19 @@ PHP_FUNCTION(ldap_get_option)
    Set the value of various session-wide parameters */
 PHP_FUNCTION(ldap_set_option) 
 {
-	zval *link, **newval;
+	zval *link, *newval;
 	ldap_linkdata *ld;
 	LDAP *ldap;
 	long option;
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zlZ", &link, &option, &newval) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zlz", &link, &option, &newval) != SUCCESS) {
 		return;
 	}
 
 	if (Z_TYPE_P(link) == IS_NULL) {
 		ldap = NULL;
 	} else {
-		ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+		ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 		ldap = ld->link;
 	}
 
@@ -2059,7 +2041,7 @@ PHP_FUNCTION(ldap_set_option)
 			int val;
 
 			convert_to_long_ex(newval);
-			val = Z_LVAL_PP(newval);
+			val = Z_LVAL_P(newval);
 			if (ldap_set_option(ldap, option, &val)) {
 				RETURN_FALSE;
 			}
@@ -2070,7 +2052,7 @@ PHP_FUNCTION(ldap_set_option)
 			struct timeval timeout;
 
 			convert_to_long_ex(newval);
-			timeout.tv_sec = Z_LVAL_PP(newval);
+			timeout.tv_sec = Z_LVAL_P(newval);
 			timeout.tv_usec = 0;
 			if (ldap_set_option(ldap, LDAP_OPT_NETWORK_TIMEOUT, (void *) &timeout)) {
 				RETURN_FALSE;
@@ -2082,7 +2064,7 @@ PHP_FUNCTION(ldap_set_option)
 			int timeout;
 
 			convert_to_long_ex(newval);
-			timeout = 1000 * Z_LVAL_PP(newval); /* Convert to milliseconds */
+			timeout = 1000 * Z_LVAL_P(newval); /* Convert to milliseconds */
 			if (ldap_set_option(ldap, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout)) {
 				RETURN_FALSE;
 			}			
@@ -2105,7 +2087,7 @@ PHP_FUNCTION(ldap_set_option)
 		{
 			char *val;
 			convert_to_string_ex(newval);
-			val = Z_STRVAL_PP(newval);
+			val = Z_STRVAL_P(newval);
 			if (ldap_set_option(ldap, option, val)) {
 				RETURN_FALSE;
 			}
@@ -2118,7 +2100,7 @@ PHP_FUNCTION(ldap_set_option)
 		{
 			void *val;
 			convert_to_boolean_ex(newval);
-			val = Z_TYPE_PP(newval) == IS_TRUE
+			val = Z_TYPE_P(newval) == IS_TRUE
 				? LDAP_OPT_ON : LDAP_OPT_OFF;
 			if (ldap_set_option(ldap, option, val)) {
 				RETURN_FALSE;
@@ -2129,50 +2111,50 @@ PHP_FUNCTION(ldap_set_option)
 	case LDAP_OPT_CLIENT_CONTROLS:
 		{
 			LDAPControl *ctrl, **ctrls, **ctrlp;
-			zval **ctrlval, **val;
+			zval *ctrlval, *val;
 			int ncontrols;
 			char error=0;
 
-			if ((Z_TYPE_PP(newval) != IS_ARRAY) || !(ncontrols = zend_hash_num_elements(Z_ARRVAL_PP(newval)))) {
+			if ((Z_TYPE_P(newval) != IS_ARRAY) || !(ncontrols = zend_hash_num_elements(Z_ARRVAL_P(newval)))) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected non-empty array value for this option");
 				RETURN_FALSE;
 			}
 			ctrls = safe_emalloc((1 + ncontrols), sizeof(*ctrls), 0);
 			*ctrls = NULL;
 			ctrlp = ctrls;
-			zend_hash_internal_pointer_reset(Z_ARRVAL_PP(newval));
-			while (zend_hash_get_current_data(Z_ARRVAL_PP(newval), (void**)&ctrlval) == SUCCESS) {
-				if (Z_TYPE_PP(ctrlval) != IS_ARRAY) {
+			zend_hash_internal_pointer_reset(Z_ARRVAL_P(newval));
+			while ((ctrlval = zend_hash_get_current_data(Z_ARRVAL_P(newval))) != NULL) {
+				if (Z_TYPE_P(ctrlval) != IS_ARRAY) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "The array value must contain only arrays, where each array is a control");
 					error = 1;
 					break;
 				}
-				if (zend_hash_find(Z_ARRVAL_PP(ctrlval), "oid", sizeof("oid"), (void **) &val) != SUCCESS) {
+				if ((val = zend_hash_str_find(Z_ARRVAL_P(ctrlval), "oid", sizeof("oid") - 1)) == NULL) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Control must have an oid key");
 					error = 1;
 					break;
 				}
 				ctrl = *ctrlp = emalloc(sizeof(**ctrlp));
 				convert_to_string_ex(val);
-				ctrl->ldctl_oid = Z_STRVAL_PP(val);
-				if (zend_hash_find(Z_ARRVAL_PP(ctrlval), "value", sizeof("value"), (void **) &val) == SUCCESS) {
+				ctrl->ldctl_oid = Z_STRVAL_P(val);
+				if ((val = zend_hash_str_find(Z_ARRVAL_P(ctrlval), "value", sizeof("value") - 1)) != NULL) {
 					convert_to_string_ex(val);
-					ctrl->ldctl_value.bv_val = Z_STRVAL_PP(val);
-					ctrl->ldctl_value.bv_len = Z_STRLEN_PP(val);
+					ctrl->ldctl_value.bv_val = Z_STRVAL_P(val);
+					ctrl->ldctl_value.bv_len = Z_STRLEN_P(val);
 				} else {
 					ctrl->ldctl_value.bv_val = NULL;
 					ctrl->ldctl_value.bv_len = 0;
 				}
-				if (zend_hash_find(Z_ARRVAL_PP(ctrlval), "iscritical", sizeof("iscritical"), (void **) &val) == SUCCESS) {
+				if ((val = zend_hash_str_find(Z_ARRVAL_P(ctrlval), "iscritical", sizeof("iscritical") - 1)) != NULL) {
 					convert_to_boolean_ex(val);
-					ctrl->ldctl_iscritical = Z_TYPE_PP(val) == IS_TRUE;
+					ctrl->ldctl_iscritical = Z_TYPE_P(val) == IS_TRUE;
 				} else {
 					ctrl->ldctl_iscritical = 0;
 				}
 				
 				++ctrlp;
 				*ctrlp = NULL;
-				zend_hash_move_forward(Z_ARRVAL_PP(newval));
+				zend_hash_move_forward(Z_ARRVAL_P(newval));
 			}
 			if (!error) {
 				error = ldap_set_option(ldap, option, ctrls);
@@ -2210,8 +2192,8 @@ PHP_FUNCTION(ldap_parse_result)
 		return; 
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, &result, -1, "ldap result", le_result);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
 
 	rc = ldap_parse_result(ld->link, ldap_result, &lerrcode,
 				myargcount > 3 ? &lmatcheddn : NULL,
@@ -2224,13 +2206,15 @@ PHP_FUNCTION(ldap_parse_result)
 		RETURN_FALSE;
 	}
 
-	zval_dtor(errcode);
+	ZVAL_DEREF(errcode);
+	zval_ptr_dtor(errcode);
 	ZVAL_LONG(errcode, lerrcode);
 
 	/* Reverse -> fall through */
 	switch (myargcount) {
 		case 6:
-			zval_dtor(referrals);
+			ZVAL_DEREF(referrals);
+			zval_ptr_dtor(referrals);
 			array_init(referrals);
 			if (lreferrals != NULL) {
 				refp = lreferrals;
@@ -2241,19 +2225,21 @@ PHP_FUNCTION(ldap_parse_result)
 				ldap_value_free(lreferrals);
 			}
 		case 5:
-			zval_dtor(errmsg);
+			ZVAL_DEREF(errmsg);
+			zval_ptr_dtor(errmsg);
 			if (lerrmsg == NULL) {
 				ZVAL_EMPTY_STRING(errmsg);
 			} else {
-				ZVAL_STRING(errmsg, lerrmsg, 1);
+				ZVAL_STRING(errmsg, lerrmsg);
 				ldap_memfree(lerrmsg);
 			}
 		case 4: 
-			zval_dtor(matcheddn);
+			ZVAL_DEREF(matcheddn);
+			zval_ptr_dtor(matcheddn);
 			if (lmatcheddn == NULL) {
 				ZVAL_EMPTY_STRING(matcheddn);
 			} else {
-				ZVAL_STRING(matcheddn, lmatcheddn, 1);
+				ZVAL_STRING(matcheddn, lmatcheddn);
 				ldap_memfree(lmatcheddn);
 			}
 	}
@@ -2275,16 +2261,15 @@ PHP_FUNCTION(ldap_first_reference)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, &result, -1, "ldap result", le_result);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
 
 	if ((entry = ldap_first_reference(ld->link, ldap_result)) == NULL) {
 		RETVAL_FALSE;
 	} else {
 		resultentry = emalloc(sizeof(ldap_resultentry));
 		ZEND_REGISTER_RESOURCE(return_value, resultentry, le_result_entry);
-		resultentry->id = Z_LVAL_P(result);
-		zend_list_addref(resultentry->id);
+		ZVAL_COPY(&resultentry->res, result);
 		resultentry->data = entry;
 		resultentry->ber = NULL;
 	}
@@ -2304,16 +2289,15 @@ PHP_FUNCTION(ldap_next_reference)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	if ((entry_next = ldap_next_reference(ld->link, resultentry->data)) == NULL) {
 		RETVAL_FALSE;
 	} else {
 		resultentry_next = emalloc(sizeof(ldap_resultentry));
 		ZEND_REGISTER_RESOURCE(return_value, resultentry_next, le_result_entry);
-		resultentry_next->id = resultentry->id;
-		zend_list_addref(resultentry->id);
+		ZVAL_COPY(&resultentry_next->res, &resultentry->res);
 		resultentry_next->data = entry_next;
 		resultentry_next->ber = NULL;
 	}
@@ -2334,14 +2318,15 @@ PHP_FUNCTION(ldap_parse_reference)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, &result_entry, -1, "ldap result entry", le_result_entry);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
 	if (ldap_parse_reference(ld->link, resultentry->data, &lreferrals, NULL /* &serverctrls */, 0) != LDAP_SUCCESS) {
 		RETURN_FALSE;
 	}
 
-	zval_dtor(referrals);
+	ZVAL_DEREF(referrals);
+	zval_ptr_dtor(referrals);
 	array_init(referrals);
 	if (lreferrals != NULL) {
 		refp = lreferrals;
@@ -2371,7 +2356,7 @@ PHP_FUNCTION(ldap_rename)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	if (newparent_len == 0) {
 		newparent = NULL;
@@ -2408,7 +2393,7 @@ PHP_FUNCTION(ldap_start_tls)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	if (((rc = ldap_set_option(ld->link, LDAP_OPT_PROTOCOL_VERSION, &protocol)) != LDAP_SUCCESS) ||
 		((rc = ldap_start_tls_s(ld->link, NULL, NULL)) != LDAP_SUCCESS)
@@ -2430,35 +2415,31 @@ int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgi
 {
 	ldap_linkdata *ld;
 	int retval;
-	zval *cb_url;
-	zval **cb_args[2];
-	zval *cb_retval;
+	zval cb_args[2];
+	zval cb_retval;
 	zval *cb_link = (zval *) params;
 	TSRMLS_FETCH();
 
-	ld = (ldap_linkdata *) zend_fetch_resource(&cb_link TSRMLS_CC, -1, "ldap link", NULL, 1, le_link);
+	ld = (ldap_linkdata *) zend_fetch_resource(cb_link TSRMLS_CC, -1, "ldap link", NULL, 1, le_link);
 
 	/* link exists and callback set? */
-	if (ld == NULL || ld->rebindproc == NULL) {
+	if (ld == NULL || Z_ISUNDEF(ld->rebindproc)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Link not found or no callback set");
 		return LDAP_OTHER;
 	}
 
 	/* callback */
-	MAKE_STD_ZVAL(cb_url);
-	ZVAL_STRING(cb_url, estrdup(url), 0);
-	cb_args[0] = &cb_link;
-	cb_args[1] = &cb_url;
-	if (call_user_function_ex(EG(function_table), NULL, ld->rebindproc, &cb_retval, 2, cb_args, 0, NULL TSRMLS_CC) == SUCCESS && cb_retval) {
+	ZVAL_COPY_VALUE(&cb_args[0], cb_link);
+	ZVAL_STRING(&cb_args[1], url);
+	if (call_user_function_ex(EG(function_table), NULL, &ld->rebindproc, &cb_retval, 2, cb_args, 0, NULL TSRMLS_CC) == SUCCESS && !Z_ISUNDEF(cb_retval)) {
 		convert_to_long_ex(&cb_retval);
-		retval = Z_LVAL_P(cb_retval);
+		retval = Z_LVAL(cb_retval);
 		zval_ptr_dtor(&cb_retval);
 	} else {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "rebind_proc PHP callback failed");
 		retval = LDAP_OTHER;
 	}
-	zval_dtor(cb_url);
-	FREE_ZVAL(cb_url);
+	zval_ptr_dtor(&cb_args[1]);
 	return retval;
 }
 /* }}} */
@@ -2469,20 +2450,19 @@ PHP_FUNCTION(ldap_set_rebind_proc)
 {
 	zval *link, *callback;
 	ldap_linkdata *ld;
-	char *callback_name;
+	zend_string *callback_name;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &link, &callback) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 
 	if (Z_TYPE_P(callback) == IS_STRING && Z_STRLEN_P(callback) == 0) {
 		/* unregister rebind procedure */
-		if (ld->rebindproc != NULL) {
-			zval_dtor(ld->rebindproc);
-			FREE_ZVAL(ld->rebindproc);
-			ld->rebindproc = NULL;
+		if (!Z_ISUNDEF(ld->rebindproc)) {
+			zval_ptr_dtor(&ld->rebindproc);
+			ZVAL_UNDEF(&ld->rebindproc);
 			ldap_set_rebind_proc(ld->link, NULL, NULL);
 		}
 		RETURN_TRUE;
@@ -2490,22 +2470,20 @@ PHP_FUNCTION(ldap_set_rebind_proc)
 
 	/* callable? */
 	if (!zend_is_callable(callback, 0, &callback_name TSRMLS_CC)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Two arguments expected for '%s' to be a valid callback", callback_name);
-		efree(callback_name);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Two arguments expected for '%s' to be a valid callback", callback_name->val);
+		STR_RELEASE(callback_name);
 		RETURN_FALSE;
 	}
-	efree(callback_name);
+	STR_RELEASE(callback_name);
 
 	/* register rebind procedure */
-	if (ld->rebindproc == NULL) {
+	if (Z_ISUNDEF(ld->rebindproc)) {
 		ldap_set_rebind_proc(ld->link, _ldap_rebind_proc, (void *) link);
 	} else {
-		zval_dtor(ld->rebindproc);
+		zval_ptr_dtor(&ld->rebindproc);
 	}
 
-	ALLOC_ZVAL(ld->rebindproc);
-	*ld->rebindproc = *callback;
-	zval_copy_ctor(ld->rebindproc);
+	ZVAL_COPY(&ld->rebindproc, callback);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -2585,7 +2563,8 @@ PHP_FUNCTION(ldap_escape)
 
 	php_ldap_do_escape(map, value, valuelen, &result, &resultlen);
 
-	RETURN_STRINGL(result, resultlen, 0);
+	RETVAL_STRINGL(result, resultlen);
+	efree(result);
 }
 
 #ifdef STR_TRANSLATION
@@ -2611,7 +2590,7 @@ static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way)
 	}
 
 	if (result == LDAP_SUCCESS) {
-		RETVAL_STRINGL(value, value_len, 1);
+		RETVAL_STRINGL(value, value_len);
 		free(value);
 	} else {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Conversion from iso-8859-1 to t61 failed: %s", ldap_err2string(result));
@@ -2661,7 +2640,7 @@ PHP_FUNCTION(ldap_control_paged_result)
 	if (Z_TYPE_P(link) == IS_NULL) {
 		ldap = NULL;
 	} else {
-		ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
+		ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 		ldap = ld->link;
 	}
 
@@ -2748,8 +2727,8 @@ PHP_FUNCTION(ldap_control_paged_result_response)
 		return;
 	}
 
-	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
-	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, &result, -1, "ldap result", le_result);
+	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+	ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result);
 
 	rc = ldap_parse_result(ld->link,
 				ldap_result,
@@ -2810,11 +2789,12 @@ PHP_FUNCTION(ldap_control_paged_result_response)
 		ZVAL_LONG(estimated, lestimated);
 	}
 
-	zval_dtor(cookie);
+	ZVAL_DEREF(cookie);
+	zval_ptr_dtor(cookie);
  	if (lcookie.bv_len == 0) {
 		ZVAL_EMPTY_STRING(cookie);
  	} else {
-		ZVAL_STRINGL(cookie, lcookie.bv_val, lcookie.bv_len, 1);
+		ZVAL_STRINGL(cookie, lcookie.bv_val, lcookie.bv_len);
  	}
  	ldap_memfree(lcookie.bv_val);
 
diff --git a/ext/ldap/tests/ldap_unbind_error.phpt b/ext/ldap/tests/ldap_unbind_error.phpt
index 19b4ad5948..b0c0dab09c 100644
--- a/ext/ldap/tests/ldap_unbind_error.phpt
+++ b/ext/ldap/tests/ldap_unbind_error.phpt
@@ -37,6 +37,6 @@ Warning: ldap_unbind() expects parameter 1 to be resource, %unicode_string_optio
 bool(false)
 bool(true)
 
-Warning: ldap_unbind(): %d is not a valid ldap link resource in %s on line %d
+Warning: ldap_unbind(): supplied resource is not a valid ldap link resource in %s on line %d
 bool(false)
 ===DONE===
diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt
index 1ea558b766..cebb5873ec 100644
--- a/ext/pdo/tests/pdo_005.phpt
+++ b/ext/pdo/tests/pdo_005.phpt
@@ -46,7 +46,7 @@ $stmt->execute();
 var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestBase'));
 
 $stmt->execute();
-var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', array(0)));
+var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', array("")));
 
 ?>
 --EXPECTF--
@@ -151,4 +151,4 @@ array(3) {
     ["val2"]=>
     string(2) "CC"
   }
-}
\ No newline at end of file
+}
diff --git a/ext/pdo_pgsql/tests/common.phpt b/ext/pdo_pgsql/tests/common.phpt
index 2ecc2025f0..c5a2f2bbf3 100644
--- a/ext/pdo_pgsql/tests/common.phpt
+++ b/ext/pdo_pgsql/tests/common.phpt
@@ -18,7 +18,7 @@ if (false !== getenv('PDO_PGSQL_TEST_DSN')) {
 		$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_PGSQL_TEST_ATTR');
 	}
 } else {
-	$config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=root password=';
+	$config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres';
 }
 	
 return $config;
diff --git a/ext/pdo_pgsql/tests/config.inc b/ext/pdo_pgsql/tests/config.inc
index 6d616cddb5..a86c82094f 100644
--- a/ext/pdo_pgsql/tests/config.inc
+++ b/ext/pdo_pgsql/tests/config.inc
@@ -6,7 +6,7 @@ if (false !== getenv('PDO_PGSQL_TEST_DSN')) {
 		$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_PGSQL_TEST_ATTR');
 	}
 } else {
-	$config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=root password=';
+	$config['ENV']['PDOTEST_DSN'] = 'pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres';
 }
 
 foreach ($config['ENV'] as $k => $v) {