summaryrefslogtreecommitdiff
path: root/ext/dom
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* test fails with old libxml2; skip in this caseChristoph M. Becker2015-07-311-1/+4
|
* added regression test for bug #69679Christoph M. Becker2015-06-271-0/+12
| | | | DOMDocument::loadHTML refuses to accept NULL bytes.
* 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
| | * fix testStanislav Malyshev2015-06-091-2/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-091-5/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: 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.
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-091-5/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: 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
| | * Fix #69719 - more checks for nulls in pathsStanislav Malyshev2015-06-091-5/+17
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-04-142-55/+64
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: ext/standard/http_fopen_wrapper.c
| * | Merge branch 'PHp-5.4' into PHP-5.5Stanislav Malyshev2015-04-141-54/+55
| |\ \ | | |/ | | | | | | | | | * PHp-5.4: fix non-standard C
| | * fix non-standard CStanislav Malyshev2015-04-141-54/+55
| | |
| * | Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-112-1/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Fixed bug #68901 (use after free) Fixed bug #68740 (NULL Pointer Dereference) Fix bug #66550 (SQLite prepared statement use-after-free) Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Fix bug #68601 buffer read overflow in gd_gif_in.c Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
| | * Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)Stanislav Malyshev2015-04-112-1/+9
| | |
| * | Bump yearXinchen Hui2015-01-1537-37/+37
| | |
* | | bump yearXinchen Hui2015-01-1537-37/+37
| | |
* | | More fixes for nodelist array accessTjerk Meesters2014-10-122-19/+54
| | | | | | | | | | | | | | | | | | - testing for null property read - no zval copying if the type is already long - memory fix for master
* | | Refactored DOMNodeList array dereferencing implementationTjerk Meesters2014-10-094-111/+96
| | |
* | | DOMNodeList elements are accessible through array notationFlorian MARGAINE2014-09-275-28/+152
| | | | | | | | | | | | Fixes #67949
* | | Make DOMNode::textContent writeableTjerk Meesters2014-09-026-104/+75
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: Correct typo in comments: 'initialized'
| * Correct typo in comments: 'initialized'Lior Kaplan2014-08-171-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2014-06-092-0/+5
|\ \ | |/ | | | | | | * PHP-5.4: Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
| * Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191Matteo Beccati2014-06-092-0/+5
| | | | | | | | | | DOMDocument::substituteEntities needs to be set to true in order for external entities to be parsed.
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-161-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: correct the bug #67081 fix
| * correct the bug #67081 fixAnatol Belski2014-04-161-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-166-13/+88
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
| * Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, ↵Anatol Belski2014-04-166-13/+88
| | | | | | | | not only the subset
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-011-0/+6
|\ \ | |/ | | | | | | | | | | * PHP-5.4: updated NEWS added test for bug #53965 Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
| * Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when ↵Anatol Belski2014-04-011-0/+6
| | | | | | | | loaded w/ "file://"
| * Bump yearXinchen Hui2014-01-0337-37/+37
| |
* | Bump yearXinchen Hui2014-01-0337-37/+37
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-061-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: Fixed bug #61645 (fopen and O_NONBLOCK) fix possibly uninitialized value
| * fix possibly uninitialized valueMichael Wallner2013-12-061-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-022-1/+42
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #65196
| * Fix bug #65196Michael Wallner2013-12-022-1/+42
| | | | | | | | | | | | Passing DOMDocumentFragment to DOMDocument::saveHTML() produces invalid markup, because a DocumentFragment is just a container for child nodes and not a real node itself.
* | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-211-0/+4
|\ \ | |/ | | | | | | | | * PHP-5.4: Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]" Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
| * Suppress compiler warning "warning: variable ‘retcount’ set but not used ↵Christopher Jones2013-08-211-0/+4
| | | | | | | | [-Wunused-but-set-variable]"
* | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-141-1/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
| * Reduce (some) compile noise of 'unused variable' and 'may be used ↵Christopher Jones2013-08-141-1/+1
| | | | | | | | uninitialized' warnings.
* | Embeds the content of the DTD in the DOCTYPE declaration of the XML files.Antonio Diaz Ruiz2013-08-103-3/+24
| |
* | Adds 2 new xml files which include the dtd path relative to the base ↵Antonio Diaz Ruiz2013-08-105-4/+33
| | | | | | | | | | | | directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
* | Adds files: error 1 to 5 and variation 1 to 4Antonio Diaz Ruiz2013-08-1033-0/+628
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests for error1: not well formed xml tests for error2: not well formed xml attribute without colon tests for error2: not well formed xml, typo tests for error4: wrong xml version tests for error5: extra content at the end of the doc tests libxml_dtd_load tests libxml_dtd_valid tests for libdtd_noerror tests for LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS the basic behavior fix comments
* | Merge branch 'pull-request/325' into PHP-5.5Stanislav Malyshev2013-08-109-6/+122
|\ \ | | | | | | | | | | | | * pull-request/325: Add schema default/fixed value support
| * | Add schema default/fixed value supportChris Wright2013-04-1210-10/+126
| | | | | | | | | | | | | | | Added support for adding fixed/default values during XSD validation and added/updated associated tests
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-041-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
| * | non living code related typo fixesVeres Lajos2013-08-041-1/+1
| | |
| * | typo fixesVeres Lajos2013-07-151-4/+4
| | |
| * | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-102-3/+3
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | | typo fixesVeres Lajos2013-07-151-4/+4
| | |