summaryrefslogtreecommitdiff
path: root/ext/dom
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | * 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
| | | | |
* | | | | Update exception names in tests after formatting changes.Aaron Piotrowski2015-05-174-4/+4
| | | | |
* | | | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-05-177-7/+7
|\ \ \ \ \ | |/ / / /
| * | | | Tweak uncaught exception message displayNikita Popov2015-05-177-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions.
* | | | | Updated tests to reflect exception class changes.Aaron Piotrowski2015-05-1610-14/+14
|/ / / /
* | | | Display EngineExceptions like ordinary exceptionsNikita Popov2015-05-154-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup.
* | | | improve searchability for libxml2 headersAnatol Belski2015-05-101-1/+4
| | | | | | | | | | | | | | | | and bring the configs inline with the current libxml2 build
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-142-2/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (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: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
| * | | 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
| | | |
* | | | Always throw TypeException on throwing zpp failuresNikita Popov2015-04-0614-87/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to report FAILURE errors using a TypeException instead of a Warning, like it would happen in strict mode. Adds a zend_parse_parameters_throw() convenience function, which invokes zpp with this flag. Converts all cases I could identify, where we currently have throwing zpp usage in constructors and replaces them with this API. Error handling is still replaced to EH_THROW in some cases to handle other, domain-specific errors in constructors.
* | | | Fixed typosXinchen Hui2015-03-302-2/+2
| | | |
* | | | Fixed testsXinchen Hui2015-03-302-0/+2
| | | |
* | | | fix exports and shared compilationAnatol Belski2015-03-233-61/+66
| | | |
* | | | Implement engine exceptionsDmitry Stogov2015-03-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
* | | | Merged zend_array and HashTable into the single data structure.Dmitry Stogov2015-02-131-3/+1
| | | | | | | | | | | | | | | | | | | | Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
* | | | Use new ZEND_HASH_FOREACH_... API.Dmitry Stogov2015-02-102-17/+6
| | | |
* | | | fix wars about importing of locally defined symbolsAnatol Belski2015-02-041-13/+11
| | | |
* | | | Move zend_object->guards into additional slot of ↵Dmitry Stogov2015-02-041-2/+2
| | | | | | | | | | | | | | | | zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
* | | | fix warningsMichael Wallner2015-01-302-2/+2
| | | |
* | | | zend_read_property() has to provide a holder for return value.Dmitry Stogov2015-01-221-1/+2
| | | | | | | | | | | | | | | | Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
* | | | bump yearXinchen Hui2015-01-1537-37/+37
| | | |
* | | | trailing whitespace removalStanislav Malyshev2015-01-1031-348/+348
| | | |
* | | | Adding a note here for my future self so I won'tRasmus Lerdorf2015-01-091-0/+7
| | | | | | | | | | | | | | | | need to look into this again
* | | | Drop duplicate arg from hash_get_current_key_exNikita Popov2014-12-261-1/+1
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-1330-813/+812
| | | |