summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-01-291-2/+2
|\
| * Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-01-291-2/+2
| |\
| | * Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3Johannes Schlüter2013-01-294-70/+99
| | |\
| | * | Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)Johannes Schlüter2013-01-291-2/+2
* | | | fix bug #60833 - self, parent, static behave inconsistently case-sensitiveStanislav Malyshev2013-01-272-98/+138
* | | | Merge branch 'PHP-5.4' into PHP-5.5Gustavo Lopes2013-01-232-75/+15
|\ \ \ \ | |/ / /
| * | | Merge branch 'bug64023' into PHP-5.4Gustavo Lopes2013-01-222-75/+15
| |\ \ \ | | | |/ | | |/|
| | * | Fix bug #64023 (__toString() & SplFileInfo)Gustavo Lopes2013-01-222-70/+15
* | | | - Fixed ZTS buildFelipe Pena2013-01-181-1/+1
* | | | Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5Lars Strojny2013-01-192-0/+84
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Stanislav Malyshev2013-01-184-17/+56
| |\ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-182-0/+84
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-01-182-0/+84
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | fix bug #63462 (Magic methods called twice for unset protected properties)Stanislav Malyshev2013-01-182-0/+84
| | | | |/ | | | |/|
* | | | | Class Name Resolution As Scalar Via "class" KeywordLars Strojny2013-01-1912-0/+220
| |_|_|/ |/| | |
* | | | Merge remote-tracking branch 'cataphract/zpp_improv' into PHP-5.5Gustavo Lopes2013-01-162-14/+45
|\ \ \ \
| * | | | Export zend_parse_parameter()Gustavo Lopes2013-01-092-2/+2
| * | | | Expose zend_parse_arg() as zend_parse_parameter()Gustavo André dos Santos Lopes2012-07-182-0/+15
| * | | | zend_parse_parameters: allow ! for non pointersGustavo André dos Santos Lopes2012-07-181-14/+30
* | | | | Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5Gustavo Lopes2013-01-152-3/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add zend_qsort_r & use it in strtrGustavo Lopes2013-01-142-3/+11
* | | | | Fix compile failure introduced by the fix for bug #46408.Adam Harvey2013-01-151-1/+1
* | | | | Bug #46408: Fix double formatting for PostgreSQL bound parametersLars Strojny2013-01-142-0/+20
|/ / / /
* | | | Use zend_unmangle_property_name_ex to save strlenXinchen Hui2013-01-142-5/+5
* | | | Fixed bug #63980 (object members get trimmed by zero bytes)Xinchen Hui2013-01-146-14/+27
* | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-134-4/+19
|\ \ \ \ | | |/ / | |/| |
| * | | fix bug #63982: isset() inconsistently produces a fatal error on protected pr...Stanislav Malyshev2013-01-132-1/+16
| * | | different OSes have different messages, and that's not what the test is about...Stanislav Malyshev2013-01-132-3/+3
* | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-01-092-3/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-01-092-3/+4
| |\ \ \ | | | |/ | | |/|
| | * | Fixed compilator bug that might cause jump depended on unitialized valueDmitry Stogov2013-01-092-3/+4
* | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-01-094-0/+43
|\ \ \ \ | |/ / /
| * | | Fixed bug #63882 (zend_std_compare_objects crash on recursion)Dmitry Stogov2013-01-094-0/+43
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-01-041-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-01-041-1/+1
| |\ \ \ | | |/ /
| | * | Fixed bug #63899 (Use after scope error in zend_compile)Xinchen Hui2013-01-041-1/+1
| | * | Happy New YearXinchen Hui2013-01-0196-98/+98
* | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-011-1/+7
|\ \ \ \ | |/ / /
| * | | Bug #43177: If an eval() has a parse error, the overall exit status and retur...Stanislav Malyshev2013-01-011-1/+7
| * | | Happy New YearXinchen Hui2013-01-0196-98/+98
| * | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-261-1/+3
| |\ \ \ | | |/ /
| | * | Revert "Remove a useless memory write in zend_llist_del_element"Pierrick Charron2012-12-261-1/+3
* | | | Happy New YearXinchen Hui2013-01-0198-100/+100
* | | | Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)Pierrick Charron2012-12-291-1/+0
* | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-251-3/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-251-3/+1
| |\ \ \ | | |/ /
| | * | Remove a useless memory write in zend_llist_del_elementPierrick Charron2012-12-251-3/+1
* | | | spellingDmitry Stogov2012-12-251-3/+3
* | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-252-5/+5
|\ \ \ \ | |/ / /
| * | | spellingDmitry Stogov2012-12-252-5/+5