summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update versions/dates for PHP 7.1.0beta3php-7.1.0beta3PHP-7.1.0beta3Davey Shafik2016-08-193-4/+4
* Fixed bug #72888 (Segfault on clone on splFileObject)Xinchen Hui2016-08-193-1/+22
* Sync NEWSDavey Shafik2016-08-191-0/+30
* Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUGNikita Popov2016-08-1917-135/+4
* Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-181-1/+1
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-181-1/+1
| |\
| | * Fix broken test includeChristoph M. Becker2016-08-181-1/+1
* | | update NEWSAnatol Belski2016-08-181-0/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-180-0/+0
|\ \ \ | |/ /
| * | update NEWSAnatol Belski2016-08-181-0/+3
* | | fix formatAnatol Belski2016-08-181-1/+1
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-181-4/+4
|\ \ \ | |/ /
| * | avoid other efforts if memory mapping failsAnatol Belski2016-08-181-4/+4
* | | Updated UPGRADING about function call argsJulien Pauli2016-08-181-0/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-181-1/+1
|\ \ \ | |/ /
| * | fix testAnatol Belski2016-08-181-1/+1
* | | map ell the err codeAnatol Belski2016-08-181-4/+1
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-182-0/+30
|\ \ \ | |/ /
| * | Fixed bug #72858 shm_attach null dereferenceAnatol Belski2016-08-182-0/+30
* | | Merge branch 'PHP-7.0' into PHP-7.1Ferenc Kovacs2016-08-180-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2016-08-180-0/+0
| |\ \ | | |/
| | * fix NEWSFerenc Kovacs2016-08-181-3/+4
* | | Remove leftover of previous changeXinchen Hui2016-08-181-13/+3
* | | Fixed segfault introduced in 447e57a1e12cdcc6791302d5097119fb2165475aXinchen Hui2016-08-181-2/+2
* | | Remove outdate checksXinchen Hui2016-08-182-17/+6
* | | Merge branch 'PHP-7.0' into PHP-7.1Christopher Jones2016-08-181-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christopher Jones2016-08-181-1/+1
| |\ \ | | |/
| | * Add myself as PDO_OCI maintainerChristopher Jones2016-08-181-1/+1
| * | Prepare for OCI8 PECL releaseChristopher Jones2016-08-182-12/+10
* | | Merge branch 'PHP-7.0' into PHP-7.1Christopher Jones2016-08-182-11/+9
|\ \ \
| * \ \ Prepare for OCI8 PECL releaseChristopher Jones2016-08-182-11/+9
| |\ \ \ | | |/ / | |/| / | | |/
| | * Prepare for OCI8 PECL releaseChristopher Jones2016-08-182-11/+9
* | | fix testAnatol Belski2016-08-181-2/+2
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-180-0/+0
|\ \ \ | |/ /
| * | sync NEWSAnatol Belski2016-08-181-2/+29
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-1721-1/+69
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-1721-1/+69
| |\ \ | | |/
| | * Skip tests that are supposed to fail due to bugs in old external libgdChristoph M. Becker2016-08-1721-1/+69
* | | Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1Kalle Sommer Nielsen2016-08-171-2/+2
|\ \ \
| * | | Make this test also a little more resilientChristoph M. Becker2016-08-171-2/+2
* | | | Fixed 7.1 build, decls first please!Kalle Sommer Nielsen2016-08-175-8/+9
|/ / /
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-1730-60/+60
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-1730-60/+60
| |\ \ | | |/
| | * Make tests a little more resilientChristoph M. Becker2016-08-1730-60/+60
| * | Seems like I did a bad merge earlier, this should make PHP-7.0 sync with 7.1/...Kalle Sommer Nielsen2016-08-172-1/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Kalle Sommer Nielsen2016-08-172-1/+3
|\ \ \
| * | | Fix build as done in master in commit 040331c36462eac94308bbef3200ee11389ca444Kalle Sommer Nielsen2016-08-172-1/+3
| |/ /
| * | Fixed C89 buildKalle Sommer Nielsen2016-08-171-1/+2
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-171-1/+1
|\ \ \ | |/ /
| * | fix char * vs zend_string *Anatol Belski2016-08-171-1/+1