Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.6' | Anatol Belski | 2014-10-30 | 2 | -2/+2 |
|\ | |||||
| * | add DLL export to the output globals | Anatol Belski | 2014-10-30 | 2 | -2/+2 |
* | | Save memory allocating | Xinchen Hui | 2014-10-30 | 2 | -12/+20 |
* | | Fixed memory leak in ZEND_JMPZ_EX (op1 and result may share same slot) | Xinchen Hui | 2014-10-30 | 2 | -9/+14 |
* | | Merge branch 'PHP-5.6' | Xinchen Hui | 2014-10-30 | 2 | -10/+2 |
|\ \ | |/ | |||||
| * | Use macro | Xinchen Hui | 2014-10-30 | 2 | -10/+2 |
* | | Merge branch 'PHP-5.6' | Xinchen Hui | 2014-10-30 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Fixed build.... (shouldn't it be zend_output_globals?) | Xinchen Hui | 2014-10-30 | 2 | -2/+2 |
* | | Merge branch 'PHP-5.6' | Anatol Belski | 2014-10-29 | 10 | -12/+23 |
|\ \ | |/ | |||||
| * | fix output globals importing | Anatol Belski | 2014-10-29 | 2 | -2/+0 |
| * | export output globals | Anatol Belski | 2014-10-29 | 2 | -1/+11 |
| * | use portable strndup implementation | Anatol Belski | 2014-10-29 | 1 | -1/+1 |
| * | unix sockets aren't available on windows | Anatol Belski | 2014-10-29 | 1 | -0/+2 |
| * | dll export APIs needed by phpdbg | Anatol Belski | 2014-10-29 | 3 | -5/+6 |
| * | fix sapi/phpdbg/config.w32 | Anatol Belski | 2014-10-29 | 1 | -3/+3 |
| * | Don't treat warnings as failures in the junit output | Matteo Beccati | 2014-10-29 | 1 | -1/+4 |
* | | fix datatype mismatches | Anatol Belski | 2014-10-29 | 1 | -4/+4 |
* | | fix datatype mismatches | Anatol Belski | 2014-10-29 | 1 | -17/+17 |
* | | fix datatype mismatch | Anatol Belski | 2014-10-29 | 1 | -1/+1 |
* | | fix datatype mismatches | Anatol Belski | 2014-10-29 | 2 | -7/+10 |
* | | fix datatype mismatches | Anatol Belski | 2014-10-29 | 2 | -35/+35 |
* | | fix the comparison return value | Anatol Belski | 2014-10-29 | 1 | -3/+3 |
* | | fix datatype mismatch | Anatol Belski | 2014-10-29 | 1 | -6/+6 |
* | | fix datatype mismatches | Anatol Belski | 2014-10-29 | 1 | -3/+3 |
* | | fix datatype mismatch warning | Anatol Belski | 2014-10-29 | 1 | -1/+1 |
* | | fix datatype mismatches | Anatol Belski | 2014-10-29 | 1 | -13/+15 |
* | | fix datatype mismatch warnings | Anatol Belski | 2014-10-29 | 1 | -4/+4 |
* | | fix datatype mismatch warns | Anatol Belski | 2014-10-29 | 1 | -3/+3 |
* | | fix datatype mismatch warn | Anatol Belski | 2014-10-29 | 1 | -1/+2 |
* | | fix datatype mismatch warnings | Anatol Belski | 2014-10-29 | 1 | -4/+4 |
* | | fix "inconsistent dll linkage" warning caused by bison | Anatol Belski | 2014-10-29 | 2 | -0/+10 |
* | | fix datatype mismatch warnings | Anatol Belski | 2014-10-29 | 6 | -362/+366 |
* | | Don't treat warnings as failures in the junit output | Matteo Beccati | 2014-10-29 | 1 | -1/+4 |
* | | Merge remote-tracking branch 'origin/PHP-5.6' | Bob Weinand | 2014-10-29 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Merge phpdbg into PHP-5.6 | Bob Weinand | 2014-10-29 | 1 | -0/+4 |
| |\ | |||||
| | * | Merge php-src into phpdbg | Bob Weinand | 2014-10-29 | 1 | -1/+0 |
| | |\ | |||||
| | | * | cleanup uneeded json | Remi Collet | 2014-10-29 | 1 | -1/+0 |
| | | * | Merge phpdbg into PHP-5.6 | Bob Weinand | 2014-10-28 | 1 | -2/+0 |
| | | * | Merge phpdbg into PHP-5.6 | Bob Weinand | 2014-10-28 | 3 | -0/+5 |
| | | * | Merge ../phpdbg into PHP-5.6 | Bob Weinand | 2014-10-28 | 4 | -19/+26 |
| | * | | Enable shared builds for webhelper | Bob Weinand | 2014-10-29 | 1 | -0/+4 |
* | | | | Merge branch 'PHP-5.6' | Matteo Beccati | 2014-10-29 | 1 | -71/+63 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2014-10-29 | 1 | -71/+63 |
| |\ \ \ | |||||
| | * | | | Fixed test to work with recent libcurl versions | Matteo Beccati | 2014-10-29 | 1 | -71/+63 |
| | * | | | PHP 5.5.20 now | Julien Pauli | 2014-10-28 | 3 | -4/+7 |
* | | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-10-29 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | cleanup uneeded json | Remi Collet | 2014-10-29 | 1 | -1/+0 |
* | | | | | Merge remote-tracking branch 'origin/PHP-5.6' | Bob Weinand | 2014-10-28 | 1 | -2/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge phpdbg into PHP-5.6 | Bob Weinand | 2014-10-28 | 1 | -2/+0 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Removed last HAVE_JSON check | Bob Weinand | 2014-10-28 | 1 | -2/+0 |