summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Anatol Belski2014-10-302-2/+2
|\
| * add DLL export to the output globalsAnatol Belski2014-10-302-2/+2
* | Save memory allocatingXinchen Hui2014-10-302-12/+20
* | Fixed memory leak in ZEND_JMPZ_EX (op1 and result may share same slot)Xinchen Hui2014-10-302-9/+14
* | Merge branch 'PHP-5.6'Xinchen Hui2014-10-302-10/+2
|\ \ | |/
| * Use macroXinchen Hui2014-10-302-10/+2
* | Merge branch 'PHP-5.6'Xinchen Hui2014-10-302-2/+2
|\ \ | |/
| * Fixed build.... (shouldn't it be zend_output_globals?)Xinchen Hui2014-10-302-2/+2
* | Merge branch 'PHP-5.6'Anatol Belski2014-10-2910-12/+23
|\ \ | |/
| * fix output globals importingAnatol Belski2014-10-292-2/+0
| * export output globalsAnatol Belski2014-10-292-1/+11
| * use portable strndup implementationAnatol Belski2014-10-291-1/+1
| * unix sockets aren't available on windowsAnatol Belski2014-10-291-0/+2
| * dll export APIs needed by phpdbgAnatol Belski2014-10-293-5/+6
| * fix sapi/phpdbg/config.w32Anatol Belski2014-10-291-3/+3
| * Don't treat warnings as failures in the junit outputMatteo Beccati2014-10-291-1/+4
* | fix datatype mismatchesAnatol Belski2014-10-291-4/+4
* | fix datatype mismatchesAnatol Belski2014-10-291-17/+17
* | fix datatype mismatchAnatol Belski2014-10-291-1/+1
* | fix datatype mismatchesAnatol Belski2014-10-292-7/+10
* | fix datatype mismatchesAnatol Belski2014-10-292-35/+35
* | fix the comparison return valueAnatol Belski2014-10-291-3/+3
* | fix datatype mismatchAnatol Belski2014-10-291-6/+6
* | fix datatype mismatchesAnatol Belski2014-10-291-3/+3
* | fix datatype mismatch warningAnatol Belski2014-10-291-1/+1
* | fix datatype mismatchesAnatol Belski2014-10-291-13/+15
* | fix datatype mismatch warningsAnatol Belski2014-10-291-4/+4
* | fix datatype mismatch warnsAnatol Belski2014-10-291-3/+3
* | fix datatype mismatch warnAnatol Belski2014-10-291-1/+2
* | fix datatype mismatch warningsAnatol Belski2014-10-291-4/+4
* | fix "inconsistent dll linkage" warning caused by bisonAnatol Belski2014-10-292-0/+10
* | fix datatype mismatch warningsAnatol Belski2014-10-296-362/+366
* | Don't treat warnings as failures in the junit outputMatteo Beccati2014-10-291-1/+4
* | Merge remote-tracking branch 'origin/PHP-5.6'Bob Weinand2014-10-291-0/+4
|\ \ | |/
| * Merge phpdbg into PHP-5.6Bob Weinand2014-10-291-0/+4
| |\
| | * Merge php-src into phpdbgBob Weinand2014-10-291-1/+0
| | |\
| | | * cleanup uneeded jsonRemi Collet2014-10-291-1/+0
| | | * Merge phpdbg into PHP-5.6Bob Weinand2014-10-281-2/+0
| | | * Merge phpdbg into PHP-5.6Bob Weinand2014-10-283-0/+5
| | | * Merge ../phpdbg into PHP-5.6Bob Weinand2014-10-284-19/+26
| | * | Enable shared builds for webhelperBob Weinand2014-10-291-0/+4
* | | | Merge branch 'PHP-5.6'Matteo Beccati2014-10-291-71/+63
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-10-291-71/+63
| |\ \ \
| | * | | Fixed test to work with recent libcurl versionsMatteo Beccati2014-10-291-71/+63
| | * | | PHP 5.5.20 nowJulien Pauli2014-10-283-4/+7
* | | | | Merge branch 'PHP-5.6'Remi Collet2014-10-291-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | cleanup uneeded jsonRemi Collet2014-10-291-1/+0
* | | | | Merge remote-tracking branch 'origin/PHP-5.6'Bob Weinand2014-10-281-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge phpdbg into PHP-5.6Bob Weinand2014-10-281-2/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Removed last HAVE_JSON checkBob Weinand2014-10-281-2/+0