summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Fixed complier errorPRE_64BIT_BRANCH_MERGEXinchen Hui2014-08-221-1/+1
* Merge branch 'PHP-5.6'Michael Wallner2014-08-211-2/+1
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-08-211-2/+1
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-08-211-2/+1
| | |\
| | | * fix bug #67865Michael Wallner2014-08-211-2/+1
| | | * fixed variable corruption under win x64Anatol Belski2014-08-201-4/+4
| | * | fix testStanislav Malyshev2014-08-201-7/+9
* | | | Fixed test. It's not a problem to perform/continue replacing if the source "$...Dmitry Stogov2014-08-211-13/+19
* | | | remove bogus locale use from testkrakjoe2014-08-211-2/+5
* | | | fix the version requirements for these testskrakjoe2014-08-2117-79/+79
* | | | correct version number requirements for this testkrakjoe2014-08-211-3/+3
* | | | use a suitable number of patterns to show the bug is resolved, not a stupid n...krakjoe2014-08-211-1/+2
* | | | Merge branch 'master' of https://github.com/php/php-srckrakjoe2014-08-213-19/+9
|\ \ \ \
| * | | | Avoid reallocation and copyingDmitry Stogov2014-08-213-19/+9
* | | | | only run this test if SimpleXML is loadedkrakjoe2014-08-211-0/+2
|/ / / /
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-08-201-7/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-201-7/+9
| |\ \ \
| | * | | fix testStanislav Malyshev2014-08-201-7/+9
* | | | | Merge branch 'master' of git.php.net:php-srcDmitry Stogov2014-08-201-1/+1
|\ \ \ \ \
| * | | | | fix directory separator in testAnatol Belski2014-08-201-1/+1
* | | | | | Fixed ext/pdo_*/tests/pdo_005.phpt tests failureDmitry Stogov2014-08-201-1/+1
|/ / / / /
* | | | | Fixed bug #67874 (Crash in array_map())Dmitry Stogov2014-08-201-7/+5
* | | | | Introduced get_resources() function.Dmitry Stogov2014-08-201-2/+2
* | | | | Reverted incorrectly changed test. Now it's the same as in PHP-5.6.Dmitry Stogov2014-08-201-1/+1
* | | | | Merge branch 'PHP-5.6'Sara Golemon2014-08-191-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Sara Golemon2014-08-191-2/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Sara Golemon2014-08-191-2/+4
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Switch use of strtok() to gd_strtok_r()Sara Golemon2014-08-191-2/+4
* | | | fix incompatible typesAnatol Belski2014-08-191-3/+4
* | | | Merge branch 'master' of git.php.net:php-srcAnatol Belski2014-08-191-0/+5
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-08-191-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-191-0/+5
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-191-0/+5
| | | |\ \ | | | | |/
| | | | * Merge tag 'PHP-5.4.32' into PHP-5.4Stanislav Malyshev2014-08-191-0/+5
| | | | |\
| | | | | * Fix bug #67730 - Null byte injection possible with imagexxx functionsStanislav Malyshev2014-08-181-0/+5
| | | | | * Fixed bug #67717 - segfault in dns_get_recordStanislav Malyshev2014-08-181-24/+60
| | | | | * Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-141-1/+1
* | | | | | fix uninitialized args usageAnatol Belski2014-08-191-1/+6
|/ / / / /
* | | | | Merge branch 'master' of git.php.net:php-srcAnatol Belski2014-08-191-24/+60
|\ \ \ \ \
| * | | | | fix merge issue in previous (again)Remi Collet2014-08-191-1/+2
| * | | | | fix merge issue in previousRemi Collet2014-08-191-1/+1
| * | | | | fix merge for #67717Remi Collet2014-08-191-23/+58
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-08-191-24/+60
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-191-24/+60
| | | |\ \ \ | | | | |/ /
| | | | * | Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597Remi Collet2014-08-191-24/+60
* | | | | | brought back that vs2012 fixAnatol Belski2014-08-191-1/+1
|/ / / / /
* | | | | C89 compatAnatol Belski2014-08-191-2/+5
* | | | | c89 compatAnatol Belski2014-08-191-2/+2
* | | | | added missing defineAnatol Belski2014-08-191-1/+1
* | | | | Merge branch 'master' of git.php.net:php-srcAnatol Belski2014-08-191-1/+1
|\ \ \ \ \