summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* first show to make 's' work with size_tAnatol Belski2014-08-274-6/+6
* Merge branch 'PHP-5.6'Chris Wright2014-08-272-4/+7
|\
| * 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
* | | | several signature and data type fixesAnatol Belski2014-08-262-3/+3
* | | | fixed several long vs zend_long castsAnatol Belski2014-08-263-3/+3
* | | | Fixed incompatible pointer type (int64)Xinchen Hui2014-08-262-2/+2
* | | | generalize the zend_long stuffAnatol Belski2014-08-251-0/+1
* | | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-253-4/+4
* | | | master renamings phase 5Anatol Belski2014-08-251-1/+1
* | | | master renames phase 4Anatol Belski2014-08-253-12/+4
* | | | master renames phase 3Anatol Belski2014-08-2517-79/+71
* | | | master renames phase 2Anatol Belski2014-08-251-1/+1
* | | | master renames phase 1Anatol Belski2014-08-2520-238/+238
* | | | fixes to %pd format usageAnatol Belski2014-08-241-1/+1
* | | | fix zppAnatol Belski2014-08-201-1/+1
* | | | yet more fixes to zppAnatol Belski2014-08-201-1/+1
* | | | added php_off_t aliasAnatol Belski2014-08-191-0/+1
* | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-191-0/+2
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-08-191-0/+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
| | | | |\
| | | | | * 5.4.32Stanislav Malyshev2014-08-191-2/+2
| | | | | * fix potentially missing NUL terminationStanislav Malyshev2014-08-181-0/+2
| | | | | * 5.4.32 RC1php-5.4.32RC1Stanislav Malyshev2014-08-051-2/+2
| | | | * | 5.4.33-dev nowStanislav Malyshev2014-08-051-3/+3
| | | | |/
| | | | * Undo inadvertent commit of php_versionKeyur Govande2014-07-301-0/+1
| | | | * Corrected patch for bug #60616Keyur Govande2014-07-301-1/+0
| | | | * 5.4.31Stanislav Malyshev2014-07-081-3/+3
| | | * | 5.5.17 nowJulien Pauli2014-08-061-3/+3
| | * | | Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context opt...Ferenc Kovacs2014-08-063-64/+8
| | * | | Add SO_REUSEPORT + SO_BROADCAST support via socket stream context optionDaniel Lowrey2014-08-053-8/+64
* | | | | mostly fixes to spl, but also some otherAnatol Belski2014-08-173-4/+4
* | | | | fix set_time_limit, substr and some moreAnatol Belski2014-08-161-1/+1
* | | | | fix some cases with fast zppAnatol Belski2014-08-161-3/+3
* | | | | first shot on merging the core fro the int64 branchAnatol Belski2014-08-1628-290/+366
|/ / / /
* | | | Bump version to 7.0.0-devDmitry Stogov2014-08-151-4/+4
* | | | Fixed modeDmitry Stogov2014-08-141-0/+0
* | | | Fixed compilation warningsDmitry Stogov2014-08-141-2/+2
* | | | cleanup (we don't have to duplicate elements of stream_filters_hash)Dmitry Stogov2014-08-131-1/+0
* | | | cleanupDmitry Stogov2014-08-133-36/+43
* | | | cleanup (use zend_string* instead of char*)Dmitry Stogov2014-08-135-83/+110
* | | | cleanupDmitry Stogov2014-08-131-2/+0
* | | | Merge branch 'master' into testDmitry Stogov2014-08-113-8/+64
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.6'Daniel Lowrey2014-08-053-8/+64
| |\ \ \ \
| | * | | | Add SO_REUSEPORT + SO_BROADCAST support via socket stream context optionDaniel Lowrey2014-08-053-8/+64
| | |/ / /