7 files changed, 19 insertions, 19 deletions
diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index 13238c9bdd..930a2de827 100644
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -171,7 +171,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval)
 
 	xmlNodeSetContentLen((xmlNodePtr) attrp, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str) + 1);
 
-	zend_string_release(str);
+	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index 671f4033ee..bd801733c4 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -110,7 +110,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval)
 
 	xmlNodeSetContentLen(nodep, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str) + 1);
 
-	zend_string_release(str);
+	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 2d70338994..262a88896e 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -353,7 +353,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval)
 		php_error_docref(NULL, E_WARNING, "Invalid Document Encoding");
     }
 
-	zend_string_release(str);
+	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
@@ -441,7 +441,7 @@ int dom_document_version_write(dom_object *obj, zval *newval)
 
 	docp->version = xmlStrdup((const xmlChar *) ZSTR_VAL(str));
 
-	zend_string_release(str);
+	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
@@ -669,7 +669,7 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval)
 
 	docp->URL = xmlStrdup((const xmlChar *) ZSTR_VAL(str));
 
-	zend_string_release(str);
+	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 7d640ff6c5..3048ecef07 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -347,7 +347,7 @@ int dom_node_node_value_write(dom_object *obj, zval *newval)
 			{
 				zend_string *str = zval_get_string(newval);
 				xmlNodeSetContentLen(nodep, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str) + 1);
-				zend_string_release(str);
+				zend_string_release_ex(str, 0);
 				break;
 			}
 		default:
@@ -748,14 +748,14 @@ int dom_node_prefix_write(dom_object *obj, zval *newval)
 				}
 
 				if (ns == NULL) {
-					zend_string_release(str);
+					zend_string_release_ex(str, 0);
 					php_dom_throw_error(NAMESPACE_ERR, dom_get_strict_error(obj->document));
 					return FAILURE;
 				}
 
 				xmlSetNs(nodep, ns);
 			}
-			zend_string_release(str);
+			zend_string_release_ex(str, 0);
 			break;
 		default:
 			break;
@@ -868,7 +868,7 @@ int dom_node_text_content_write(dom_object *obj, zval *newval)
 	/* we have to use xmlNodeAddContent() to get the same behavior as with xmlNewText() */
 	xmlNodeSetContent(nodep, (xmlChar *) "");
 	xmlNodeAddContent(nodep, (xmlChar *) ZSTR_VAL(str));
-	zend_string_release(str);
+	zend_string_release_ex(str, 0);
 
 	return SUCCESS;
 }
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 69da603247..61346cd590 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -308,7 +308,7 @@ static void dom_register_prop_handler(HashTable *prop_handler, char *name, size_
 	hnd.write_func = write_func ? write_func : dom_write_na;
 	str = zend_string_init_interned(name, name_len, 1);
 	zend_hash_add_mem(prop_handler, str, &hnd, sizeof(dom_prop_handler));
-	zend_string_release(str);
+	zend_string_release_ex(str, 1);
 }
 /* }}} */
 
@@ -323,7 +323,7 @@ static zval *dom_get_property_ptr_ptr(zval *object, zval *member, int type, void
 		retval = std_hnd->get_property_ptr_ptr(object, member, type, cache_slot);
 	}
 
-	zend_string_release(member_str);
+	zend_string_release_ex(member_str, 0);
 	return retval;
 }
 /* }}} */
@@ -354,7 +354,7 @@ zval *dom_read_property(zval *object, zval *member, int type, void **cache_slot,
 		retval = std_hnd->read_property(object, member, type, cache_slot, rv);
 	}
 
-	zend_string_release(member_str);
+	zend_string_release_ex(member_str, 0);
 	return retval;
 }
 /* }}} */
@@ -376,7 +376,7 @@ void dom_write_property(zval *object, zval *member, zval *value, void **cache_sl
 		std_hnd->write_property(object, member, value, cache_slot);
 	}
 
-	zend_string_release(member_str);
+	zend_string_release_ex(member_str, 0);
 }
 /* }}} */
 
@@ -409,7 +409,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, void
 		retval = std_hnd->has_property(object, member, check_empty, cache_slot);
 	}
 
-	zend_string_release(member_str);
+	zend_string_release_ex(member_str, 0);
 	return retval;
 }
 /* }}} */
@@ -451,7 +451,7 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp) /* {{{ *
 		zend_hash_add(debug_info, string_key, &value);
 	} ZEND_HASH_FOREACH_END();
 
-	zend_string_release(object_str);
+	zend_string_release_ex(object_str, 0);
 
 	return debug_info;
 }
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index dca6c2e8f7..f8fde2b807 100644
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -145,7 +145,7 @@ int dom_processinginstruction_data_write(dom_object *obj, zval *newval)
 
 	xmlNodeSetContentLen(nodep, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str) + 1);
 
-	zend_string_release(str);
+	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 27d88055d0..a63abaf6cd 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -221,12 +221,12 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
 			} else {
 				zend_string *str = zval_get_string(&retval);
 				valuePush(ctxt, xmlXPathNewString((xmlChar *) ZSTR_VAL(str)));
-				zend_string_release(str);
+				zend_string_release_ex(str, 0);
 			}
 			zval_ptr_dtor(&retval);
 		}
 	}
-	zend_string_release(callable);
+	zend_string_release_ex(callable, 0);
 	zval_dtor(&fci.function_name);
 	if (fci.param_count > 0) {
 		for (i = 0; i < nargs - 1; i++) {
@@ -520,7 +520,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions)
 			zend_string *str = zval_get_string(entry);
 			ZVAL_LONG(&new_string,1);
 			zend_hash_update(intern->registered_phpfunctions, str, &new_string);
-			zend_string_release(str);
+			zend_string_release_ex(str, 0);
 		} ZEND_HASH_FOREACH_END();
 		intern->registerPhpFunctions = 2;
 		RETURN_TRUE;