summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-7/+7
* Merge branch 'pull-request/341'Stanislav Malyshev2013-06-109-10/+10
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-101-2/+2
|\
| * typo fixes (argument)Veres Lajos2013-06-101-2/+2
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-102-2/+32
|\ \ | |/
| * Fixed bug #64988 (Class loading order affects E_STRICT warning)Xinchen Hui2013-06-102-2/+32
| * Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Dmitry Stogov2013-06-101-2/+2
| |\
| | * Fix spelling and correct typo.Carson McDonald2013-06-101-2/+2
* | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-06-101-2/+2
|\ \ \
| * \ \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-101-2/+2
| |\ \ \
| | * | | Fix spelling and correct typo.Carson McDonald2013-06-101-2/+2
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-06-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-06-101-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Fixed test scriptDmitry Stogov2013-06-101-1/+1
| * | | Fixed merge wronglyXinchen Hui2013-06-092-2/+2
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-093-0/+34
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-06-093-0/+34
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)Xinchen Hui2013-06-093-0/+34
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-052-4/+42
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-06-052-4/+42
| |\ \ | | |/
| | * Fixed bug #64960 (Segfault in gc_zval_possible_root)Xinchen Hui2013-06-052-4/+42
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-05-291-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-05-291-1/+1
| |\ \ | | |/
| | * Fixed incorrect argument numberDmitry Stogov2013-05-291-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Sara Golemon2013-05-191-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Sara Golemon2013-05-191-1/+1
| |\ \ | | |/
| | * Don't double-quote name of namespaced function.Sara Golemon2013-05-191-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-05-213-1/+58
|\ \ \ | |/ /
| * | Fixed bug #64720 (SegFault on zend_deactivate)Dmitry Stogov2013-05-213-1/+58
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-05-203-4/+15
|\ \ \ | |/ /
| * | fix bug #64660 - yyparse can return 2, not only 1Stanislav Malyshev2013-05-203-5/+16
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-05-124-1/+70
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-05-124-1/+70
| |\ \ | | |/
| | * Fixed bug #64821 Custom Exceptions crash when internal properties overriddenAnatol Belski2013-05-124-1/+70
* | | Fix #64780 (PHP 5.5 builds are broken with GCC 3)Ard Biesheuvel2013-05-071-1/+5
* | | Fix #64749 (warning: cast from pointer to integer of different size)Xinchen Hui2013-05-041-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Gustavo Lopes2013-04-302-6/+15
|\ \ \ | |/ /
| * | Fix bug #64729: compilation failure on x32Gustavo Lopes2013-04-302-6/+16
* | | Fix implicit uint* to int* conversion warningDavid Soria Parra2013-04-261-1/+1
* | | Fixed float precision change under Windows x64Anatol Belski2013-04-251-2/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-04-232-3/+9
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-04-232-3/+9
| |\ \ | | |/
| | * Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(funct...Dmitry Stogov2013-04-232-3/+9
* | | Fixed linkage with C++Dmitry Stogov2013-04-221-1/+3
* | | Fixed bug #64677 (execution operator `` stealing surrounding arguments)Xinchen Hui2013-04-202-0/+22
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-04-112-2/+2
|\ \ \ | |/ /
| * | Fixed bug (Wrong ce cached)Xinchen Hui2013-04-112-2/+2
* | | Fixed typo - inconsistent notice for undefined property (introduced by fix fo...Michael Moravec2013-04-104-9/+9
* | | Drop support for bison < 2.4 when building PHP from GIT sourceXinchen Hui2013-04-051-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-04-041-1/+2
|\ \ \ | |/ /