summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-1347-1706/+1683
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-131-8/+12
|\
| * Merge branch 'PHP-5.6'Julien Pauli2014-12-121-8/+12
| |\
| | * Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-121-8/+12
| | |\
| | | * Fix bug #68532: convert.base64-encode omits padding bytesmcq82014-12-121-8/+12
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-063-4/+34
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-12-062-0/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-062-0/+2
| | |\ \ | | | |/
| | | * add include for missing localeconv_r protoAnatol Belski2014-12-062-0/+2
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-12-062-0/+32
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-062-0/+32
| | |\ \ | | | |/
| | | * Fixed bug #65230 setting locale randomly brokenAnatol Belski2014-12-062-0/+32
| * | | Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)Andrea Faulds2014-12-051-4/+0
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-055-41/+26
|\ \ \ \ | |/ / /
| * | | Fix zend_fcall_info_arg*() to use ZVAL_COPYMichael Wallner2014-12-041-0/+1
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-12-031-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-031-2/+2
| | |\ \ | | | |/
| | | * Fixed bug #55541 errors spawn MessageBox, which blocks test automationAnatol Belski2014-12-031-2/+2
| * | | fix datatype mismatchesAnatol Belski2014-12-022-6/+6
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-12-011-4/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-011-4/+2
| | |\ \ | | | |/
| | | * add include for missing usleep protoAnatol Belski2014-12-011-0/+1
| | | * C89 compatAnatol Belski2014-12-011-4/+1
| * | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-11-301-29/+16
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-301-29/+16
| | |\ \ | | | |/
| | | * Added test and review suggestionmcq82014-11-301-34/+14
| | | * Fix bug #68335: rmdir doesnt work with file:// stream wrappermcq82014-11-301-0/+7
| | | * 5.5.21 nowJulien Pauli2014-11-261-3/+3
| | | * PHP 5.5.20 nowJulien Pauli2014-10-281-3/+3
| | * | PHP-5.6.5 is nextFerenc Kovacs2014-11-261-3/+3
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-203-3/+3
|\ \ \ \ | |/ / /
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-193-3/+3
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-1822-128/+142
|\ \ \ \ | |/ / /
| * | | proper dllexportAnatol Belski2014-11-181-1/+1
| * | | fix datatype mismatchesAnatol Belski2014-11-181-2/+2
| * | | add missing type specifierAnatol Belski2014-11-181-1/+1
| * | | fix unused var warningAnatol Belski2014-11-141-1/+2
| * | | fix datatype mismatch and unused var warningAnatol Belski2014-11-111-3/+5
| * | | adjust pid_t declaration so it doesn't conflict with apache oneAnatol Belski2014-11-071-1/+1
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-10-302-2/+2
| |\ \ \ | | |/ /
| | * | add DLL export to the output globalsAnatol Belski2014-10-302-2/+2
| * | | 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-293-4/+11
| |\ \ \ | | |/ /
| | * | export output globalsAnatol Belski2014-10-292-1/+11
| | * | dll export APIs needed by phpdbgAnatol Belski2014-10-291-3/+0
| | * | 5.6.4 nowJulien Pauli2014-10-281-3/+3
| * | | fix datatype mismatch warnsAnatol Belski2014-10-281-7/+7
View Lorry Controller Status