summaryrefslogtreecommitdiff
path: root/ext/spl
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-06-103-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.5Stanislav Malyshev2014-06-103-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 Malyshev2014-06-103-1/+28
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-06-013-0/+32
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2014-06-013-0/+32
| |\ \ | | |/
| | * Fixed bug #67359 (Segfault in recursiveDirectoryIterator)Xinchen Hui2014-06-013-0/+32
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-05-292-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.5Adam Harvey2014-05-292-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 Harvey2014-05-292-1/+42
| | | | | | | | | | | | Fixes bug #67360 (Missing element after ArrayObject::getIterator).
* | | Prevent recursion in ZF2 Parameters classTjerk Meesters2014-05-162-22/+10
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-112-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.5Stanislav Malyshev2014-05-112-1/+14
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: Fix bug #67247 spl_fixedarray_resize integer overflow fix news
| | * Fix bug #67247 spl_fixedarray_resize integer overflowStanislav Malyshev2014-05-112-1/+14
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-04-172-4/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-04-172-4/+1
| |\ \ | | |/
| | * These links to ~helly don't work anymore.Levi Morrison2014-04-172-4/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-04-141-3/+20
|\ \ \ | |/ /
* | | Merge branch 'PHP-5.5' into PHP-5.6Etienne Kneuss2014-04-092-1/+42
|\ \ \ | |/ /
| * | fixed bug66702 : regexiterator's invert flag doesn't work as expectedJoshua Thijssen2014-04-092-1/+42
| | |
* | | Call offsetGet() when called with isset() on ArrayObject derivativesTjerk Meesters2014-03-252-38/+217
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-03-072-1/+7
|\ \ \ | |/ /
| * | Fixed null terminationTjerk Meesters2014-03-072-1/+7
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-03-072-0/+49
|\ \ \ | |/ /
| * | Add fread(length) methoddatibbaw2014-03-072-0/+49
| | | | | | | | | | | | | | | | | | Fixed off-by-one write bug Added test
* | | primitive test fixesAnatol Belski2014-02-281-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-02-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
| * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-02-271-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
| | * fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627Ferenc Kovacs2014-02-271-1/+1
| | |
| | * Bump yearXinchen Hui2014-01-0322-22/+22
| | |
| * | Bump yearXinchen Hui2014-01-0322-22/+22
| | |
* | | Bump yearXinchen Hui2014-01-0322-22/+22
| | |
* | | Improved empty string handling. Now ZE uses an interned string instead of ↵Dmitry Stogov2013-12-261-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.6Dmitry Stogov2013-12-022-10/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed tests
| * | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-12-022-10/+10
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fixed tests
| | * Fixed testsDmitry Stogov2013-12-022-10/+10
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2013-11-064-12/+12
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/spl/tests/SplFileObject_rewind_error001.phpt
| | * fix many parallel test issuesptarjan2013-11-064-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 fileChristopher Jones2013-11-061-0/+4
| | |
* | | Standardized usage of zpp_none and the order of the comparison zpp(...) == ↵Levi Morrison2013-10-113-21/+21
| | | | | | | | | | | | FAILURE
* | | Merge branch 'pull-request/473'Sara Golemon2013-09-264-12/+12
|\ \ \
| * | | fix many parallel test issuesptarjan2013-09-264-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.
* | | | Implement variadic function syntaxNikita Popov2013-09-262-2/+3
|/ / / | | | | | | | | | As per RFC: https://wiki.php.net/rfc/variadics
* | | Merge branch 'PHP-5.5'David Soria Parra2013-09-183-31/+2
|\ \ \ | | | | | | | | | | | | | | | | * PHP-5.5: Revert "EmptyIterator now implements Countable; fixes bug 60577"
| * \ \ Merge branch 'PHP-5.4' into PHP-5.5David Soria Parra2013-09-183-31/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Revert "EmptyIterator now implements Countable; fixes bug 60577"
| | * | | Revert "EmptyIterator now implements Countable; fixes bug 60577"David Soria Parra2013-09-183-31/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 8a936e8eb938965b0daaf076c109ec60141e57a7.
* | | | | fix test concurrencyMichael Wallner2013-09-1815-37/+37
| | | | |
* | | | | Merge branch 'PHP-5.5'David Soria Parra2013-09-163-2/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS for #60577 NEWS for bug #64441 Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names) EmptyIterator now implements Countable; fixes bug 60577 News for bugfix #64157 Bug 64157 Changed error message to make sense
| * | | | Merge branch 'PHP-5.4' into PHP-5.5David Soria Parra2013-09-163-2/+31
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: NEWS for #60577 NEWS for bug #64441 Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names) EmptyIterator now implements Countable; fixes bug 60577 News for bugfix #64157 Bug 64157 Changed error message to make sense
| | * | EmptyIterator now implements Countable; fixes bug 60577Levi Morrison2013-09-163-2/+31
| | |/ | | | | | | | | | (cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
* | | Merge branch 'PHP-5.5'Nikita Popov2013-09-121-1/+1
|\ \ \ | |/ /
View Lorry Controller Status