diff options
| author | Rob Richards <rrichards@php.net> | 2004-02-15 17:07:34 +0000 |
|---|---|---|
| committer | Rob Richards <rrichards@php.net> | 2004-02-15 17:07:34 +0000 |
| commit | c3a57206cc3ce176befd94865bd078783b9c11b3 (patch) | |
| tree | 4a409b084b6d9f0fa2afe6b79d1dfb9a5929fb1e /ext/dom/php_dom.c | |
| parent | b59989e716c5661059356f9ea61cda2e5cb22ba2 (diff) | |
| download | php-git-c3a57206cc3ce176befd94865bd078783b9c11b3.tar.gz | |
allow certain methods to be called statically again:
domdocument (all load methods)
domimplementation (all methods)
switch to zend_parse_method_parameters for consistancy
insure object parameters are correct class types
convert zvals to correct type if needed for property writes
fix a few segfaults found while testing
Diffstat (limited to 'ext/dom/php_dom.c')
| -rw-r--r-- | ext/dom/php_dom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 492d599ef8..657999f796 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -758,7 +758,6 @@ void dom_objects_free_storage(void *object TSRMLS_DC) if (intern->ptr != NULL && ((php_libxml_node_ptr *)intern->ptr)->node != NULL) { if (((xmlNodePtr) ((php_libxml_node_ptr *)intern->ptr)->node)->type != XML_DOCUMENT_NODE && ((xmlNodePtr) ((php_libxml_node_ptr *)intern->ptr)->node)->type != XML_HTML_DOCUMENT_NODE) { - // php_libxml_node_free_resource(dom_object_get_node(intern) TSRMLS_CC); php_libxml_node_decrement_resource((php_libxml_node_object *) intern TSRMLS_CC); } else { php_libxml_decrement_node_ptr((php_libxml_node_object *) intern TSRMLS_CC); @@ -1070,7 +1069,7 @@ int dom_has_feature(char *feature, char *version) int retval = 0; if (!(strcmp (version, "1.0") && strcmp (version,"2.0") && strcmp(version, ""))) { - if ((!strcasecmp(feature, "Core") && strcmp (version, "1.0")) || !strcasecmp(feature, "XML")) + if ((!strcasecmp(feature, "Core") && !strcmp (version, "1.0")) || !strcasecmp(feature, "XML")) retval = 1; } |