summaryrefslogtreecommitdiff
path: root/ext/dom
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0'Christoph M. Becker2016-07-151-0/+20
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-151-0/+20
| |\
| | * Fix bug #66502: DOM document dangling referenceChristoph M. Becker2016-07-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we decrement the refcount of a node's document, we state that we won't need it anymore. Therefore we can *always* set the pointer to the document to NULL, what avoids invalid memory accesses for some edge cases as demonstrated with the PHPT. Original patch provided by Sean Heelan.
* | | Merge branch 'throw-error-in-extensions'Aaron Piotrowski2016-07-053-15/+10
|\ \ \
| * | | Replace zend_ce_error with NULL and replace more E_ERROR with thrown ErrorAaron Piotrowski2016-06-132-5/+5
| | | |
| * | | Merge branch 'master' into throw-error-in-extensionsAaron Piotrowski2016-06-1040-74/+139
| |\ \ \
| * | | | Update memory freeing and other issues, revert some changesAaron Piotrowski2015-07-053-13/+6
| | | | |
| * | | | Convert E_ERROR to thrown Error in extensionsAaron Piotrowski2015-07-052-4/+6
| | | | |
* | | | | Fixed compilation warningsDmitry Stogov2016-06-281-4/+5
| | | | |
* | | | | Fixed compilation warningsDmitry Stogov2016-06-224-3/+4
| |/ / / |/| | |
* | | | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵Dmitry Stogov2016-04-271-1/+0
| | | | | | | | | | | | | | | | but is never used.
* | | | Removed zend_fcall_info.symbol_tableDmitry Stogov2016-03-021-1/+0
| | | |
* | | | Missed semicolonXinchen Hui2016-02-181-1/+1
| |/ / |/| |
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-0137-37/+37
|\ \ \ | | |/ | |/| | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-0137-37/+37
| | |
* | | These function docs are referencing zend_object_value but this should be ↵Tom Van Looy2015-12-241-1/+1
| | | | | | | | | | | | zend_object
* | | Internal function argumensts cleanup (strict_types)Xinchen Hui2015-12-121-2/+2
| | |
* | | add ovfl check, fix warningsAnatol Belski2015-09-241-3/+3
| | |
* | | Cleanup: replace removed condition with ZEND_ASSERT()Dmitry Stogov2015-09-241-1/+2
| | |
* | | Fixed Bug #70558 ("Couldn't fetch" error in DOMDocument::registerNodeClass())Xinchen Hui2015-09-232-1/+20
| | |
* | | add range checkAnatol Belski2015-09-161-0/+5
| | |
* | | add overflow checkAnatol Belski2015-09-121-1/+6
| | |
* | | fix data typesAnatol Belski2015-09-121-3/+3
| | |
* | | add range checksAnatol Belski2015-09-121-11/+11
| | |
* | | Revert "Fix #70029: nodeValue of DOMElement list content of children nodes"Christoph M. Becker2015-09-066-101/+95
| | | | | | | | | | | | This reverts commit 25a52d98d7cb2d4f3b3636eac45c71a1ae03c760.
* | | Fix #70029: nodeValue of DOMElement list content of children nodesChristoph M. Becker2015-09-056-95/+101
| | | | | | | | | | | | | | | | | | | | | According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is supposed to yield null, but currently the DOM extension yield the result of calling xmlNodeGetContent(), what is the concatenation of the values of the children of the element. This patch fixes the non standard behavior.
* | | Merge branch 'PHP-5.6'Christoph M. Becker2015-09-052-4/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix #70001: Assigning to DOMNode::textContent does additional entity encoding Resolved conflicts: ext/dom/node.c
| * | Fix #70001: Assigning to DOMNode::textContent does additional entity encodingChristoph M. Becker2015-09-052-4/+20
| | | | | | | | | | | | | | | | | | Assigning to DOMNode::textContent encodes entities, what does not match the behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch changes the behavior of DOMNode::textContent in this regard.
* | | add some range checks to ext/domAnatol Belski2015-08-261-2/+19
| | |
* | | Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.Dmitry Stogov2015-08-131-1/+1
| | | | | | | | | | | | | | | | | | This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c. Now explicit type casting may be required on call site. This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
* | | Remove unneded space(s)Dmitry Patsura2015-08-031-2/+2
| | |
* | | remove TSRMLS_*Anatol Belski2015-08-021-2/+2
| | | | | | | | | | | | either remains or merged in from PHP5
* | | Merge branch 'PHP-5.6'Christoph M. Becker2015-07-311-1/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: test fails with old libxml2; skip in this case
| * | test fails with old libxml2; skip in this caseChristoph M. Becker2015-07-311-1/+4
| | |
* | | Various warning fixesNikita Popov2015-07-171-1/+1
| | |
* | | DOMDocument::saveXML has a 2nd optional argRasmus Lerdorf2015-07-101-0/+1
| |/ |/|
* | Switch position of ce in exception ce variable namesAaron Piotrowski2015-07-031-1/+1
| |
* | Change zend_exception_get_default() to zend_exception_ceAaron Piotrowski2015-07-031-1/+1
| |
* | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-309-18/+18
| | | | | | | | semantick changes).
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-271-0/+12
|\ \ | |/ | | | | | | * PHP-5.6: added regression test for bug #69679
| * added regression test for bug #69679Christoph M. Becker2015-06-271-0/+12
| | | | | | | | DOMDocument::loadHTML refuses to accept NULL bytes.
* | Fix more minor mistakes in the proto commentsRasmus Lerdorf2015-06-237-39/+39
| |
* | more precise way to destroy iterator objectAnatol Belski2015-06-191-1/+3
| | | | | | | | which also fixes the iterator_to_array test
* | added test for bug #69846Anatol Belski2015-06-191-0/+162
| |
* | better approach to fix bug #69846Anatol Belski2015-06-192-4/+7
| | | | | | | | don't destroy the current iterator object too early
* | partial fix to bug #69846Anatol Belski2015-06-181-1/+2
| |
* | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-06-142-9/+21
|\ \ | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt
| * \ Merge branch 'PHP-5.6'Stanislav Malyshev2015-06-092-9/+21
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: add NEWS Fixed bug #68776 fix test update NEWS Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value. Conflicts: ext/dom/document.c ext/gd/gd.c ext/standard/exec.c
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-091-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix test update NEWS
| | | * Merge branch 'PHp-5.4' into PHP-5.5Stanislav Malyshev2015-06-091-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * PHp-5.4: fix test update NEWS
View Lorry Controller Status