Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.4' into PHP-5.5 | Johannes Schlüter | 2013-01-29 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2013-01-29 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 | Johannes Schlüter | 2013-01-29 | 4 | -70/+99 |
| | |\ | |||||
| | * | | Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias) | Johannes Schlüter | 2013-01-29 | 1 | -2/+2 |
* | | | | fix bug #60833 - self, parent, static behave inconsistently case-sensitive | Stanislav Malyshev | 2013-01-27 | 2 | -98/+138 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Gustavo Lopes | 2013-01-23 | 2 | -75/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'bug64023' into PHP-5.4 | Gustavo Lopes | 2013-01-22 | 2 | -75/+15 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix bug #64023 (__toString() & SplFileInfo) | Gustavo Lopes | 2013-01-22 | 2 | -70/+15 |
* | | | | - Fixed ZTS build | Felipe Pena | 2013-01-18 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5 | Lars Strojny | 2013-01-19 | 2 | -0/+84 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Stanislav Malyshev | 2013-01-18 | 4 | -17/+56 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-18 | 2 | -0/+84 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Stanislav Malyshev | 2013-01-18 | 2 | -0/+84 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | fix bug #63462 (Magic methods called twice for unset protected properties) | Stanislav Malyshev | 2013-01-18 | 2 | -0/+84 |
| | | | |/ | | | |/| | |||||
* | | | | | Class Name Resolution As Scalar Via "class" Keyword | Lars Strojny | 2013-01-19 | 12 | -0/+220 |
| |_|_|/ |/| | | | |||||
* | | | | Merge remote-tracking branch 'cataphract/zpp_improv' into PHP-5.5 | Gustavo Lopes | 2013-01-16 | 2 | -14/+45 |
|\ \ \ \ | |||||
| * | | | | Export zend_parse_parameter() | Gustavo Lopes | 2013-01-09 | 2 | -2/+2 |
| * | | | | Expose zend_parse_arg() as zend_parse_parameter() | Gustavo André dos Santos Lopes | 2012-07-18 | 2 | -0/+15 |
| * | | | | zend_parse_parameters: allow ! for non pointers | Gustavo André dos Santos Lopes | 2012-07-18 | 1 | -14/+30 |
* | | | | | Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5 | Gustavo Lopes | 2013-01-15 | 2 | -3/+11 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add zend_qsort_r & use it in strtr | Gustavo Lopes | 2013-01-14 | 2 | -3/+11 |
* | | | | | Fix compile failure introduced by the fix for bug #46408. | Adam Harvey | 2013-01-15 | 1 | -1/+1 |
* | | | | | Bug #46408: Fix double formatting for PostgreSQL bound parameters | Lars Strojny | 2013-01-14 | 2 | -0/+20 |
|/ / / / | |||||
* | | | | Use zend_unmangle_property_name_ex to save strlen | Xinchen Hui | 2013-01-14 | 2 | -5/+5 |
* | | | | Fixed bug #63980 (object members get trimmed by zero bytes) | Xinchen Hui | 2013-01-14 | 6 | -14/+27 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-13 | 4 | -4/+19 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | fix bug #63982: isset() inconsistently produces a fatal error on protected pr... | Stanislav Malyshev | 2013-01-13 | 2 | -1/+16 |
| * | | | different OSes have different messages, and that's not what the test is about... | Stanislav Malyshev | 2013-01-13 | 2 | -3/+3 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2013-01-09 | 2 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | Dmitry Stogov | 2013-01-09 | 2 | -3/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed compilator bug that might cause jump depended on unitialized value | Dmitry Stogov | 2013-01-09 | 2 | -3/+4 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2013-01-09 | 4 | -0/+43 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug #63882 (zend_std_compare_objects crash on recursion) | Dmitry Stogov | 2013-01-09 | 4 | -0/+43 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-01-04 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-01-04 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug #63899 (Use after scope error in zend_compile) | Xinchen Hui | 2013-01-04 | 1 | -1/+1 |
| | * | | Happy New Year | Xinchen Hui | 2013-01-01 | 96 | -98/+98 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-01 | 1 | -1/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug #43177: If an eval() has a parse error, the overall exit status and retur... | Stanislav Malyshev | 2013-01-01 | 1 | -1/+7 |
| * | | | Happy New Year | Xinchen Hui | 2013-01-01 | 96 | -98/+98 |
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | Pierrick Charron | 2012-12-26 | 1 | -1/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Revert "Remove a useless memory write in zend_llist_del_element" | Pierrick Charron | 2012-12-26 | 1 | -1/+3 |
* | | | | Happy New Year | Xinchen Hui | 2013-01-01 | 98 | -100/+100 |
* | | | | Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc) | Pierrick Charron | 2012-12-29 | 1 | -1/+0 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Pierrick Charron | 2012-12-25 | 1 | -3/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | Pierrick Charron | 2012-12-25 | 1 | -3/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Remove a useless memory write in zend_llist_del_element | Pierrick Charron | 2012-12-25 | 1 | -3/+1 |
* | | | | spelling | Dmitry Stogov | 2012-12-25 | 1 | -3/+3 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2012-12-25 | 2 | -5/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | spelling | Dmitry Stogov | 2012-12-25 | 2 | -5/+5 |