summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* 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 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.5' into PHP-5.6Anatol Belski2014-12-062-0/+32
|\ \ | |/
| * Fixed bug #65230 setting locale randomly brokenAnatol Belski2014-12-062-0/+32
* | 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
* | 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.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
* | add DLL export to the output globalsAnatol Belski2014-10-302-2/+2
* | Use macroXinchen Hui2014-10-302-10/+2
* | Fixed build.... (shouldn't it be zend_output_globals?)Xinchen Hui2014-10-302-2/+2
* | 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
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-10-271-0/+8
|\ \ | |/
| * Fix bug #68095 - invalid read in php_getopt()Stanislav Malyshev2014-10-271-0/+8
| * 5.5.19 nowJulien Pauli2014-10-011-3/+3
* | export functions needed for phpdbgAnatol Belski2014-10-182-4/+4
* | Revert "Merge branch 'PHP-5.4' into PHP-5.5"Ferenc Kovacs2014-10-152-7/+4
* | PHP-5.6.3 is nextFerenc Kovacs2014-10-151-3/+3
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-291-1/+1
|\ \ | |/
| * increase the polling period to not to break existing behavioursAnatol Belski2014-09-291-1/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-291-0/+28
|\ \ | |/
| * Fixed bug #51800 proc_open on Windows hangs foreverAnatol Belski2014-09-291-0/+28
| * 5.5.18 nowJulien Pauli2014-09-031-3/+3
* | 5.6.2 nowJulien Pauli2014-09-111-3/+3
* | duplicate value's string for the SAPI filterMichael Wallner2014-09-091-5/+7
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-09-021-6/+0
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-021-6/+0
| |\
| | * Revert "Fix bug #67644 - Memory corruption & crash during ob_start function c...Stanislav Malyshev2014-09-021-6/+0
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-09-021-0/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-021-0/+6
| |\ \ | | |/
| | * Fix bug #67644 - Memory corruption & crash during ob_start function callbackStanislav Malyshev2014-09-021-0/+6
* | | Merge branch 'PHP-5.5' into PHP-5.6Chris Wright2014-08-272-4/+7
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Chris Wright2014-08-272-4/+7
| |\ \ | | |/
| | * Fix stream_select() issue with OpenSSL bufferChris Wright2014-08-272-4/+7
* | | almost forgot to bump thisFerenc Kovacs2014-08-271-1/+1
* | | from now on, this should be 5.6.1-devFerenc Kovacs2014-08-271-2/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-191-0/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-191-0/+2
| |\ \ | | |/
| | * Merge tag 'PHP-5.4.32' into PHP-5.4Stanislav Malyshev2014-08-191-0/+2
| | |\