summaryrefslogtreecommitdiff
path: root/ext/spl
Commit message (Collapse)AuthorAgeFilesLines
* Happy New YearXinchen Hui2013-01-0122-22/+22
|
* Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-12-131-1/+1
|\
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-12-131-1/+1
| |\
| | * MFHXinchen Hui2012-12-131-1/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-051-12/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Use get_gc instead of hacks of get_properties
| * | Use get_gc instead of hacks of get_propertiesDmitry Stogov2012-12-051-12/+5
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-052-1/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #63680 (Memleak in splfixedarray with cycle reference) Conflicts: NEWS
| * | Fixed bug #63680 (Memleak in splfixedarray with cycle reference)Dmitry Stogov2012-12-052-1/+35
| | |
* | | commented out the HHC_LOCATION line, as there are no easy to use ↵Ferenc Kovacs2012-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alternatives for hhc.exe on linux. we should either run the chm build on a windows box(maybe on the replacement of oti1), or look into running it through wine see http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm for details. I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot file cannot be found.
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-1040-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-1040-0/+0
| |\ \ | | |/
| | * Remove executable permission on incXinchen Hui2012-10-1040-0/+0
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-10140-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-10140-0/+0
| |\ \ | | |/
| | * Remove executable permission on phptXinchen Hui2012-10-10141-0/+0
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-0916-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-0916-0/+0
| |\ \ | | |/
| | * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-0916-0/+0
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-011-1/+1
|\ \ \ | |/ /
| * | Fixed bug #63184 test ↵Xinchen Hui2012-10-011-1/+1
| | | | | | | | | | | | (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-011-2/+0
|\ \ \ | |/ /
| * | Fix testXinchen Hui2012-10-011-2/+0
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-292-31/+29
|\ \ \ | |/ /
| * | Remove meaningless md5 string && Attempt to fix #63184Xinchen Hui2012-09-292-31/+29
| | |
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-09-272-11/+11
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fix unix/win dir separators
| * | fix unix/win dir separatorsAnatoliy Belsky2012-09-272-11/+11
| | |
* | | Merge branch 'PHP-5.4'Lars Strojny2012-09-182-0/+110
|\ \ \ | |/ /
| * | Merging PR #116Lars Strojny2012-09-182-0/+110
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-0118-56/+56
|\ \ \ | |/ /
| * | Remove extra blank in notice message, should act as same as vmXinchen Hui2012-09-0118-56/+56
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-012-37/+87
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-012-37/+87
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/spl/spl_array.c
| | * Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all ↵Xinchen Hui2012-09-012-32/+88
| | | | | | | | | | | | | | | | | | undefined variables) The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
| | * Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)Xinchen Hui2012-08-232-4/+27
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-232-4/+27
|\ \ \ | |/ /
| * | Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)Xinchen Hui2012-08-232-4/+27
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-213-22/+70
|\ \ \ | |/ /
| * | Implemented FR #62840 (Add sort flag to ArrayObject::ksort)Xinchen Hui2012-08-213-22/+70
| | |
* | | Merge branch 'PHP-5.4'Felipe Pena2012-08-191-1/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Value stored to var is never used
| * | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-1/+0
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: - Value stored to var is never used
| | * - Value stored to var is never usedFelipe Pena2012-08-191-1/+0
| | |
| | * missed the test scriptXinchen Hui2012-07-211-0/+15
| | |
| | * Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance ↵Xinchen Hui2012-07-211-0/+2
| | | | | | | | | | | | gives Segmentation fault)
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-131-0/+24
|\ \ \ | |/ /
| * | more test script for #62328Xinchen Hui2012-08-131-0/+24
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-07-212-0/+17
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
| * | Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance ↵Xinchen Hui2012-07-212-0/+17
| | | | | | | | | | | | gives Segmentation fault)
* | | test script for bug #61697Xinchen Hui2012-07-181-0/+26
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-07-142-55/+126
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
| * | Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array ↵Stanislav Malyshev2012-07-142-55/+126
| | | | | | | | | | | | empty or moved to the end)