Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-05-13 | 2 | -13/+18 |
* | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-04-28 | 1 | -1/+1 |
|\ | |||||
* \ | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-04-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Remove tail blank which is committed by accident | Xinchen Hui | 2015-04-21 | 1 | -1/+1 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-04-21 | 2 | -2/+24 |
|\ \ | |/ | |||||
| * | Fixed Bug #69467 (Wrong checked for the interface by using Trait) | Xinchen Hui | 2015-04-21 | 2 | -2/+24 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-04-15 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | Fixed res leak | Xinchen Hui | 2015-04-15 | 1 | -3/+4 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2015-04-14 | 3 | -6/+28 |
|\ \ | |/ | |||||
| * | Fixed bug #69419 | Nikita Popov | 2015-04-14 | 3 | -6/+28 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2015-04-14 | 1 | -5/+3 |
|\ \ | |/ | |||||
| * | Bug #63336 is not a bug | Dmitry Stogov | 2015-04-14 | 1 | -5/+3 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-04-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | codes standard | Xinchen Hui | 2015-04-14 | 1 | -1/+1 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-04-14 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.5.24' into PHP-5.5 | Stanislav Malyshev | 2015-04-14 | 1 | -0/+3 |
| |\ | |||||
| | * | Merge branch 'PHP-5.5-security' into PHP-5.5.24 | Stanislav Malyshev | 2015-04-12 | 2 | -8/+3 |
| | |\ | |||||
| | * \ | Merge branch 'PHP-5.4.40' into PHP-5.5.24 | Stanislav Malyshev | 2015-04-11 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * | | More fixes for bug #69152 | Stanislav Malyshev | 2015-04-11 | 1 | -0/+3 |
| | | * | | Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into... | Stanislav Malyshev | 2015-04-01 | 1 | -1/+0 |
| | | * | | Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 | Xinchen Hui | 2015-03-25 | 5 | -3/+36 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'arginfo' of https://github.com/realityking/php-src into PHP-5.4 | Xinchen Hui | 2015-03-08 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against ca... | Rouven Weßling | 2014-01-25 | 1 | -0/+1 |
* | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-04-10 | 2 | -0/+31 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixed bug #69420 (Invalid read in zend_std_get_method) | Xinchen Hui | 2015-04-10 | 2 | -0/+31 |
* | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2015-04-08 | 2 | -0/+26 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer) | Dmitry Stogov | 2015-04-08 | 2 | -0/+26 |
* | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2015-04-06 | 4 | -24/+26 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix bug #60022 | Nikita Popov | 2015-04-06 | 4 | -7/+9 |
* | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2015-04-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix static member destruction | Nikita Popov | 2015-04-06 | 1 | -1/+1 |
* | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2015-04-06 | 2 | -7/+47 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixed bug #68652 (segmentation fault in destructor) | Dmitry Stogov | 2015-04-06 | 2 | -7/+47 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2015-04-02 | 1 | -7/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Prevent GC from changing zval or object 'color' before they are actually inse... | Dmitry Stogov | 2015-04-02 | 1 | -7/+2 |
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2015-04-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix typo: unitialized -> uninitialized | Lior Kaplan | 2015-04-01 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2015-03-13 | 4 | -7/+51 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed bug #69221 | Nikita Popov | 2015-03-13 | 4 | -7/+51 |
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-03-11 | 1 | -0/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Improve test script for #69212 | Xinchen Hui | 2015-03-11 | 1 | -0/+16 |
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2015-03-10 | 3 | -0/+35 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed bug #69212 | Nikita Popov | 2015-03-10 | 3 | -0/+35 |
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-03-10 | 2 | -16/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Typo | Xinchen Hui | 2015-03-10 | 2 | -16/+16 |
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-03-10 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed test | Xinchen Hui | 2015-03-10 | 1 | -1/+2 |
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-03-10 | 3 | -39/+176 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed bug #66609 (php crashes with __get() and ++ operator in some cases) | Xinchen Hui | 2015-03-10 | 3 | -39/+176 |
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-03-08 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |