summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improved ineritance codePRE_PHP7_EREG_MYSQL_REMOVALSDmitry Stogov2015-03-042-44/+69
* Merge branch 'PHP-5.6'Daniel Lowrey2015-03-044-6/+77
|\
| * Fixed bug #68920 (use strict peer_fingerprint input checks)Daniel Lowrey2015-03-044-8/+82
* | fix ini registry handlingAnatol Belski2015-03-041-11/+17
* | Merge commit 'refs/pull/1066/head' of git://github.com/php/php-srcDmitry Stogov2015-03-043-2/+20
|\ \
| * | Add zend assert deleted by accidentReeze Xia2015-02-071-0/+1
| * | Let's keep it simpleReeze Xia2015-02-071-10/+1
| * | Improve internal function return types checking for parentReeze Xia2015-02-073-2/+28
* | | Merge commit 'refs/pull/1137/head' of git://github.com/php/php-srcDmitry Stogov2015-03-041-5/+5
|\ \ \
| * | | Optimize class constant declare compilationReeze Xia2015-03-031-5/+5
* | | | Merge branch 'pull-request/1128'Dmitry Stogov2015-03-041-0/+3
|\ \ \ \
| * | | | Fixed memleak in alloc_globals_ctorReeze Xia2015-02-281-0/+3
* | | | | Improved code for class property inheritanceDmitry Stogov2015-03-048-91/+144
* | | | | Merge branch 'master' of https://git.php.net/repository/php-srcXinchen Hui2015-03-041-0/+6
|\ \ \ \ \
| * | | | | ensure the mail() socket is not leaked after requestAnatol Belski2015-03-041-0/+6
* | | | | | Add test for previously fixed segfaultXinchen Hui2015-03-041-0/+22
|/ / / / /
* | | | | Fixed segfaultXinchen Hui2015-03-042-2/+2
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2015-03-042-2/+22
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fixed bug #69159 (Opcache causes problem when passing a variable variable to ...Xinchen Hui2015-03-043-2/+24
* | | | | indentXinchen Hui2015-03-041-1/+1
* | | | | Fixed memleakXinchen Hui2015-03-041-0/+4
* | | | | Merge branch 'master' of https://git.php.net/repository/php-srcXinchen Hui2015-03-041-1/+3
|\ \ \ \ \
| * | | | | Silence a empty while loop warningReeze Xia2015-03-041-1/+3
* | | | | | Merge branch 'fix-compile-error' of https://github.com/zxcvdavid/php-srcXinchen Hui2015-03-041-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix compile errorzxcvdavid2015-03-041-2/+2
* | | | | | Fixed wrong type usedXinchen Hui2015-03-041-1/+1
* | | | | | Fixed buildXinchen Hui2015-03-041-1/+1
* | | | | | Remove the unused varszxcvdavid2015-03-041-2/+0
|/ / / / /
* | | | | Use zend_string* instead of char* for opened_patch handling. Avoid reallocati...Dmitry Stogov2015-03-0450-3047/+3023
* | | | | fix thread safety for win32/sendmailAnatol Belski2015-03-032-56/+46
* | | | | avoid this pointers playAnatol Belski2015-03-031-6/+1
* | | | | use correct free apiAnatol Belski2015-03-031-2/+2
* | | | | Fixed bug #69154 Access violation in php7.dll!_emallocAnatol Belski2015-03-031-1/+0
* | | | | ensure there is no connectionAnatol Belski2015-03-031-0/+3
* | | | | fix socket leaking and better connection err checkAnatol Belski2015-03-031-1/+10
* | | | | avoid skipif as this indeed should be testedAnatol Belski2015-03-031-3/+2
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2015-03-031-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-03-031-2/+2
| |\ \ \ \
| | * | | | Make killing a locker an ERROR eventnathan r. hruby2015-03-031-2/+2
* | | | | | Fix testReeze Xia2015-03-031-0/+2
* | | | | | Microoptimization (avoid reloading from memory)Dmitry Stogov2015-03-032-22/+20
* | | | | | Removed deprecated paths. Changed "switch" into series of "if".Dmitry Stogov2015-03-031-23/+13
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' of git.php.net:php-srcReeze Xia2015-03-034-4/+44
|\ \ \ \ \
| * | | | | Remove wrong commit committed by accidentXinchen Hui2015-03-033-17/+0
| * | | | | Merge branch 'master' of https://git.php.net/repository/php-srcXinchen Hui2015-03-0310-44/+248
| |\ \ \ \ \
| * | | | | | Fixed bug #69167 (call_user_func does not support references anymore)Xinchen Hui2015-03-034-2/+42
| * | | | | | Fixed #69166 (Assigning array_values() to array does not reset key counter)Xinchen Hui2015-03-032-1/+18
* | | | | | | Add missing zend_parse_parameters_none() for flush()Reeze Xia2015-03-031-0/+4
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'PHP-5.6'Reeze Xia2015-03-031-10/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6Reeze Xia2015-03-030-0/+0
| |\ \ \ \ \