com php-src: Merge branch 'PHP-5.6': ext/dom/node.c
| From: | Tjerk Anne Meesters | Date: | Mon, 01 Sep 2014 22:54:52 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/dom/node.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81355@lists.php.net to get a copy of this message | ||
Commit: 297a9b1f759dd6b027ee48869175eee470d830e9
Author: Tjerk Meesters <datibbaw@php.net> Tue, 2 Sep 2014 06:54:52 +0800
Parents: d5b0606a6246eee293e7ac937fcb5fdc231f61dd f54451cf399ebba0e52b42ab45de52f0f4bc3afb
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=297a9b1f759dd6b027ee48869175eee470d830e9
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Make DOMNode::textContent writeable
Updated UPGRADING
Updated NEWS
Conflicts:
ext/dom/attr.c
ext/dom/characterdata.c
ext/dom/document.c
ext/dom/node.c
Changed paths:
MM ext/dom/node.c
Diff:
diff --cc ext/dom/node.c
index 6821348,2c484ad..4ed0392
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@@ -845,6 -928,23 +845,21 @@@ int dom_node_text_content_read(dom_obje
int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC)
{
+ xmlNode *nodep = dom_object_get_node(obj);
- zval value_copy;
++ zend_string *str;
+ xmlChar *enc_str;
+
+ if (nodep == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
- convert_to_string_copy(newval, value_copy);
- enc_str = xmlEncodeEntitiesReentrant(nodep->doc, Z_STRVAL_P(newval));
++ str = zval_get_string(newval);
++ enc_str = xmlEncodeEntitiesReentrant(nodep->doc, str->val);
+ xmlNodeSetContent(nodep, enc_str);
+ xmlFree(enc_str);
- if (newval == &value_copy) {
- zval_dtor(newval);
- }
++ zend_string_release(str);
+
return SUCCESS;
}