Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Happy New Year | Xinchen Hui | 2013-01-01 | 22 | -22/+22 |
| | |||||
* | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2012-12-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-12-13 | 1 | -1/+1 |
| |\ | |||||
| | * | MFH | Xinchen Hui | 2012-12-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2012-12-05 | 1 | -12/+5 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Use get_gc instead of hacks of get_properties | ||||
| * | | Use get_gc instead of hacks of get_properties | Dmitry Stogov | 2012-12-05 | 1 | -12/+5 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2012-12-05 | 2 | -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 Stogov | 2012-12-05 | 2 | -1/+35 |
| | | | |||||
* | | | commented out the HHC_LOCATION line, as there are no easy to use ↵ | Ferenc Kovacs | 2012-10-25 | 1 | -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 Hui | 2012-10-10 | 40 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 40 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Remove executable permission on inc | Xinchen Hui | 2012-10-10 | 40 | -0/+0 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-10 | 140 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 140 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 141 | -0/+0 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-09 | 16 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-09 | 16 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #63236 (Executable permission on various source files) | Xinchen Hui | 2012-10-09 | 16 | -0/+0 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #63184 test ↵ | Xinchen Hui | 2012-10-01 | 1 | -1/+1 |
| | | | | | | | | | | | | (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed) | ||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-01 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | Fix test | Xinchen Hui | 2012-10-01 | 1 | -2/+0 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-09-29 | 2 | -31/+29 |
|\ \ \ | |/ / | |||||
| * | | Remove meaningless md5 string && Attempt to fix #63184 | Xinchen Hui | 2012-09-29 | 2 | -31/+29 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Anatoliy Belsky | 2012-09-27 | 2 | -11/+11 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: fix unix/win dir separators | ||||
| * | | fix unix/win dir separators | Anatoliy Belsky | 2012-09-27 | 2 | -11/+11 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Lars Strojny | 2012-09-18 | 2 | -0/+110 |
|\ \ \ | |/ / | |||||
| * | | Merging PR #116 | Lars Strojny | 2012-09-18 | 2 | -0/+110 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-09-01 | 18 | -56/+56 |
|\ \ \ | |/ / | |||||
| * | | Remove extra blank in notice message, should act as same as vm | Xinchen Hui | 2012-09-01 | 18 | -56/+56 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-09-01 | 2 | -37/+87 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-09-01 | 2 | -37/+87 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: ext/spl/spl_array.c | ||||
| | * | Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all ↵ | Xinchen Hui | 2012-09-01 | 2 | -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 Hui | 2012-08-23 | 2 | -4/+27 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-08-23 | 2 | -4/+27 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) | Xinchen Hui | 2012-08-23 | 2 | -4/+27 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-08-21 | 3 | -22/+70 |
|\ \ \ | |/ / | |||||
| * | | Implemented FR #62840 (Add sort flag to ArrayObject::ksort) | Xinchen Hui | 2012-08-21 | 3 | -22/+70 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Felipe Pena | 2012-08-19 | 1 | -1/+0 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: - Value stored to var is never used | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Felipe Pena | 2012-08-19 | 1 | -1/+0 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.3: - Value stored to var is never used | ||||
| | * | - Value stored to var is never used | Felipe Pena | 2012-08-19 | 1 | -1/+0 |
| | | | |||||
| | * | missed the test script | Xinchen Hui | 2012-07-21 | 1 | -0/+15 |
| | | | |||||
| | * | Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance ↵ | Xinchen Hui | 2012-07-21 | 1 | -0/+2 |
| | | | | | | | | | | | | gives Segmentation fault) | ||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-08-13 | 1 | -0/+24 |
|\ \ \ | |/ / | |||||
| * | | more test script for #62328 | Xinchen Hui | 2012-08-13 | 1 | -0/+24 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-07-21 | 2 | -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 Hui | 2012-07-21 | 2 | -0/+17 |
| | | | | | | | | | | | | gives Segmentation fault) | ||||
* | | | test script for bug #61697 | Xinchen Hui | 2012-07-18 | 1 | -0/+26 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Stanislav Malyshev | 2012-07-14 | 2 | -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 Malyshev | 2012-07-14 | 2 | -55/+126 |
| | | | | | | | | | | | | empty or moved to the end) |