summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Anatol Belski2014-10-2910-12/+23
|\ | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix output globals importing export output globals use portable strndup implementation unix sockets aren't available on windows dll export APIs needed by phpdbg fix sapi/phpdbg/config.w32 Don't treat warnings as failures in the junit output
| * fix output globals importingAnatol Belski2014-10-292-2/+0
| |
| * export output globalsAnatol Belski2014-10-292-1/+11
| | | | | | | | needed by phpdbg
| * 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
| | | | | | | | This matches Travis and the actual return code.
* | fix datatype mismatchesAnatol Belski2014-10-291-4/+4
| |
* | fix datatype mismatchesAnatol Belski2014-10-291-17/+17
| | | | | | | | sizeof(struct _string) doesn't increase.
* | fix datatype mismatchAnatol Belski2014-10-291-1/+1
| |
* | fix datatype mismatchesAnatol Belski2014-10-292-7/+10
| | | | | | | | | | especially spl_dual_it_object current.pos should have the same datatype as limit.offset, also this doesn't increase the struct size.
* | fix datatype mismatchesAnatol Belski2014-10-292-35/+35
| | | | | | | | PCRE uses plain datatypes, no typedefs.
* | 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
| | | | | | | | | | stdlib.h might not be always using _STDLIB_H, that will move bison to redeclare the malloc/free prototypes.
* | fix datatype mismatch warningsAnatol Belski2014-10-296-362/+366
| |
* | Don't treat warnings as failures in the junit outputMatteo Beccati2014-10-291-1/+4
| | | | | | | | This matches Travis and the actual return code.
* | 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
| | | | | | | | | | | | | | | | | | | | Conflicts: sapi/phpdbg/config.m4
| | * | Enable shared builds for webhelperBob Weinand2014-10-291-0/+4
| | | |
* | | | Merge branch 'PHP-5.6'Matteo Beccati2014-10-291-71/+63
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.6: Fixed test to work with recent libcurl versions PHP 5.5.20 now
| * | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-10-291-71/+63
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed test to work with recent libcurl versions PHP 5.5.20 now Conflicts: configure.in main/php_version.h
| | * | | 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
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.6: cleanup uneeded json
| * | | | 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
| | | | |
* | | | | Move missing zend_hash_* macros from phpdbg.h to zend_hash.hBob Weinand2014-10-282-18/+18
| | | | |
* | | | | Merge remote-tracking branch 'origin/PHP-5.6'Bob Weinand2014-10-284-18/+25
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: sapi/phpdbg/phpdbg_wait.c sapi/phpdbg/phpdbg_webdata_transfer.c
| * | | | Merge phpdbg into PHP-5.6Bob Weinand2014-10-283-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Fix versions & config.m4Bob Weinand2014-10-283-0/+5
| | | | |
| * | | | Merge ../phpdbg into PHP-5.6Bob Weinand2014-10-284-19/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: sapi/phpdbg/config.m4
| | * | | Use serialize instead of json for transferBob Weinand2014-10-283-19/+21
| | | | |
| | * | | Add webhelper in config.w32Bob Weinand2014-10-281-0/+5
| | | | |
| | * | | Merge php-src into phpdbgBob Weinand2014-10-281-2/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: config.m4
View Lorry Controller Status