summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
| | |/ / /
* | | | | update zend_make_printable_zval to take TSRM contextkrakjoe2014-08-112-6/+10
* | | | | cleanupDmitry Stogov2014-08-082-3/+0
* | | | | Make stream->context indirect trough zend_resource (stream->ctx->ptr).Dmitry Stogov2014-08-074-16/+20
* | | | | typoDmitry Stogov2014-08-051-1/+1
* | | | | Fixed argument numberingDmitry Stogov2014-08-051-3/+2
* | | | | Fixed incorrect arguments handlingDmitry Stogov2014-08-041-1/+1
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-08-041-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Added PHP_INT_MINAndrea Faulds2014-08-011-0/+1
* | | | | Fixed resource leakDmitry Stogov2014-07-312-9/+6
* | | | | Fixed check for eval()Dmitry Stogov2014-07-311-4/+13
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-07-221-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-07-211-0/+1
| |\ \ \ \ | | |/ / /
| | * | | force atoll macro usage on windowsAnatol Belski2014-07-211-0/+1
* | | | | Merge remote-tracking branch 'origin/master' into phpngXinchen Hui2014-07-181-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Lior Kaplan2014-07-171-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Enable build without atoll (e.g old AIX flavours)Lior Kaplan2014-07-171-0/+4
* | | | | Changed zend_make_printable_zval() to return "use_copy" instead of additional...Dmitry Stogov2014-07-092-2/+2
* | | | | Merge branch 'master' into testDmitry Stogov2014-07-074-24/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Michael Wallner2014-07-034-25/+34
| |\ \ \ \ | | |/ / /
| | * | | restore API compatibilityMichael Wallner2014-07-034-4/+17
| | * | | finishMichael Wallner2014-07-035-12/+5
| | * | | refactor php_stream_temp_create{,_ex} and use it for the php://input streamMichael Wallner2014-07-032-5/+14
| | * | | refactor _php_stream_fopen_{temporary_,tmp}file()Michael Wallner2014-07-031-20/+14
| | * | | fix length overflow of HTTP_RAW_POST_DATAMichael Wallner2014-07-031-0/+6
* | | | | Merge branch 'call-frame' into phpngDmitry Stogov2014-07-073-21/+24
|\ \ \ \ \
| * | | | | Simplify call-frame handlingDmitry Stogov2014-07-071-0/+2