Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix SPL objects initialization checks | Stanislav Malyshev | 2014-07-26 | 3 | -23/+178 |
| | |||||
* | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-07-02 | 4 | -2/+44 |
|\ | |||||
| * | Fixed bug #67539 (ArrayIterator use-after-free due to object change during ↵ | Xinchen Hui | 2014-07-02 | 2 | -0/+22 |
| | | | | | | | | sorting) | ||||
| * | Fixed Bug #67538 (SPL Iterators use-after-free) | Xinchen Hui | 2014-07-02 | 2 | -2/+22 |
| | | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-06-24 | 3 | -3/+6 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.30 Better fix for bug #67072 with more BC provisions Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability update CVE Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) Fix bug #67349: Locale::parseLocale Double Free add CVEs Fix potential segfault in dns_get_record() Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.30 rc1 Conflicts: ext/intl/locale/locale_methods.c | ||||
| | * | Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion | Stanislav Malyshev | 2014-06-21 | 3 | -3/+6 |
| | | | |||||
| | * | Fix bug #66127 (Segmentation fault with ArrayObject unset)php-5.4.30RC1 | Stanislav Malyshev | 2014-06-10 | 3 | -1/+28 |
| | | | |||||
* | | | Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion | Stanislav Malyshev | 2014-06-24 | 3 | -3/+6 |
| | | | |||||
* | | | new test, missing in ea466a3 | Remi Collet | 2014-06-18 | 1 | -0/+43 |
| | | | |||||
* | | | Fix Request #67453 Allow to unserialize empty data. | Remi Collet | 2014-06-17 | 5 | -12/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty constructor (no arg), so it make sense to allow to unserialize empty data. This allow the hack (used in various place, including PHPUnit) to instanciate class without call to constructor to work. | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-06-10 | 3 | -1/+28 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-06-10 | 3 | -1/+28 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Conflicts: configure.in main/php_version.h | ||||
| | * | | Fix bug #66127 (Segmentation fault with ArrayObject unset) | Stanislav Malyshev | 2014-06-10 | 3 | -1/+28 |
| | |/ | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-06-01 | 3 | -0/+32 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2014-06-01 | 3 | -0/+32 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #67359 (Segfault in recursiveDirectoryIterator) | Xinchen Hui | 2014-06-01 | 3 | -0/+32 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-05-29 | 2 | -1/+42 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: Check for zero-length keys in spl_array_skip_protected and don't skip them. added CVEs in NEWS | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-05-29 | 2 | -1/+42 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Check for zero-length keys in spl_array_skip_protected and don't skip them. | ||||
| | * | Check for zero-length keys in spl_array_skip_protected and don't skip them. | Adam Harvey | 2014-05-29 | 2 | -1/+42 |
| | | | | | | | | | | | | Fixes bug #67360 (Missing element after ArrayObject::getIterator). | ||||
* | | | Prevent recursion in ZF2 Parameters class | Tjerk Meesters | 2014-05-16 | 2 | -22/+10 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-05-11 | 2 | -1/+14 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow fix news add tests stuff to README Updated NEWS Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions... | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-05-11 | 2 | -1/+14 |
| |\ \ | | |/ | | | | | | | | | | | | | * PHP-5.4: Fix bug #67247 spl_fixedarray_resize integer overflow fix news | ||||
| | * | Fix bug #67247 spl_fixedarray_resize integer overflow | Stanislav Malyshev | 2014-05-11 | 2 | -1/+14 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Bob Weinand | 2014-04-17 | 2 | -4/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2014-04-17 | 2 | -4/+1 |
| |\ \ | | |/ | |||||
| | * | These links to ~helly don't work anymore. | Levi Morrison | 2014-04-17 | 2 | -4/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Bob Weinand | 2014-04-14 | 1 | -3/+20 |
|\ \ \ | |/ / | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Etienne Kneuss | 2014-04-09 | 2 | -1/+42 |
|\ \ \ | |/ / | |||||
| * | | fixed bug66702 : regexiterator's invert flag doesn't work as expected | Joshua Thijssen | 2014-04-09 | 2 | -1/+42 |
| | | | |||||
* | | | Call offsetGet() when called with isset() on ArrayObject derivatives | Tjerk Meesters | 2014-03-25 | 2 | -38/+217 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-03-07 | 2 | -1/+7 |
|\ \ \ | |/ / | |||||
| * | | Fixed null termination | Tjerk Meesters | 2014-03-07 | 2 | -1/+7 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-03-07 | 2 | -0/+49 |
|\ \ \ | |/ / | |||||
| * | | Add fread(length) method | datibbaw | 2014-03-07 | 2 | -0/+49 |
| | | | | | | | | | | | | | | | | | | Fixed off-by-one write bug Added test | ||||
* | | | primitive test fixes | Anatol Belski | 2014-02-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-02-27 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627 | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-02-27 | 1 | -1/+1 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627 | ||||
| | * | fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627 | Ferenc Kovacs | 2014-02-27 | 1 | -1/+1 |
| | | | |||||
| | * | Bump year | Xinchen Hui | 2014-01-03 | 22 | -22/+22 |
| | | | |||||
| * | | Bump year | Xinchen Hui | 2014-01-03 | 22 | -22/+22 |
| | | | |||||
* | | | Bump year | Xinchen Hui | 2014-01-03 | 22 | -22/+22 |
| | | | |||||
* | | | Improved empty string handling. Now ZE uses an interned string instead of ↵ | Dmitry Stogov | 2013-12-26 | 1 | -1/+1 |
| | | | | | | | | | | | | allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings). | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2013-12-02 | 2 | -10/+10 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fixed tests | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2013-12-02 | 2 | -10/+10 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Fixed tests | ||||
| | * | Fixed tests | Dmitry Stogov | 2013-12-02 | 2 | -10/+10 |
| | | | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2013-11-06 | 4 | -12/+12 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: ext/spl/tests/SplFileObject_rewind_error001.phpt | ||||
| | * | fix many parallel test issues | ptarjan | 2013-11-06 | 4 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While running these on HHVM I've run into a lot of parallelism issues. I'm backporting all the fixes I had to do in https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650 to php core. Most of these changes were just filenames that were shared between tests, but I did more surgery on the fixed ports. I can apreciate port 31337 as much as the next nerd, but random ports are better for tests. | ||||
| | * | Cleanup temp test file | Christopher Jones | 2013-11-06 | 1 | -0/+4 |
| | | | |||||
* | | | Standardized usage of zpp_none and the order of the comparison zpp(...) == ↵ | Levi Morrison | 2013-10-11 | 3 | -21/+21 |
| | | | | | | | | | | | | FAILURE | ||||
* | | | Merge branch 'pull-request/473' | Sara Golemon | 2013-09-26 | 4 | -12/+12 |
|\ \ \ |