summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.6.0RC1php-5.6.0RC1Ferenc Kovacs2014-06-192-3/+3
* Merge branch 'PHP-5.6' into PHP-5.6.0Ferenc Kovacs2014-06-19136-4239/+3352
|\
| * add missing entry to NEWSFerenc Kovacs2014-06-191-0/+1
| * add missing entry to NEWSFerenc Kovacs2014-06-191-0/+1
| * add NEWS block for 5.6.0RC2Ferenc Kovacs2014-06-191-1/+3
| * Add support for gb18030/MySQL 5.7Andrey Hristov2014-06-182-4/+49
| * Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-06-181-0/+43
| |\
| | * new test, missing in ea466a3Remi Collet2014-06-181-0/+43
| * | Fix another problem with MySQL 5.7Andrey Hristov2014-06-181-1/+1
| |/
| * Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-06-181-1/+1
| |\
| | * Suppress test failure with MySQL 5.7Andrey Hristov2014-06-181-1/+1
| * | Update copyright year to 2014Lior Kaplan2014-06-181-1/+1
| * | Update copyright year to 2014Lior Kaplan2014-06-181-1/+1
| * | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-06-185-5/+5
| |\ \ | | |/
| | * Update copyright year to 2014Lior Kaplan2014-06-182-2/+2
| | * Update copyright year to 2014Lior Kaplan2014-06-181-1/+1
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-06-182-2/+2
| | |\
| | | * Update copyright year to 2014Lior Kaplan2014-06-171-1/+1
| | | * Update copyright year to 2014Lior Kaplan2014-06-171-1/+1
| * | | NEWSRemi Collet2014-06-171-0/+1
| * | | Fix Request #67453 Allow to unserialize empty data.Remi Collet2014-06-175-12/+6
| * | | Update copyright year to 2014Lior Kaplan2014-06-162-2/+2
| * | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-06-168-8/+8
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-06-168-8/+8
| | |\ \ | | | |/
| | | * Update copyright year for re2c generated filesLior Kaplan2014-06-162-2/+2
| | | * Update copyright year to 2014Lior Kaplan2014-06-161-1/+1
| | | * Update copyright year for re2c files as wellLior Kaplan2014-06-165-5/+5
| * | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-06-161-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-161-2/+2
| | |\ \ | | | |/
| | | * Fix patch for bug #67436Bob Weinand2014-06-161-2/+2
| * | | fix failed testRemi Collet2014-06-161-1/+1
| * | | Fix test on modern distro where old unsecure algo are disabled in openssl con...Remi Collet2014-06-161-15/+1
| * | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-06-165-0/+73
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-165-0/+73
| | |\ \ | | | |/
| | | * Merge branch 'pull-request/695' into PHP-5.4Bob Weinand2014-06-165-0/+73
| | | |\
| | | | * Added tests for bug 67436Levi Morrison2014-06-155-0/+73
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-06-151-7/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-151-7/+5
| | |\ \ \ | | | |/ /
| | | * | Fixed wrong XFAIL test - already fixedBob Weinand2014-06-151-7/+5
| | | * | Fix typo in Bug #67406 NEWS entryLior Kaplan2014-06-161-1/+1
| | | |/
| | * | Fix typo in Bug #67406 NEWS entryLior Kaplan2014-06-161-1/+1
| * | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-06-152-2/+10
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-151-0/+2
| | |\ \ | | | |/
| | | * Updated NEWSBob Weinand2014-06-151-0/+2
| | * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-06-151-3/+6
| | |\ \ | | | |/
| | | * Fix bug #67436Bob Weinand2014-06-151-3/+6
| * | | Update NEWSBob Weinand2014-06-151-0/+3
| * | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-156-16/+52
| |\ \ \
| | * | | fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZkovacs.ferenc2014-06-142-1/+5
| | * | | change the default terminal width from 100 to 80, as that is the most common ...kovacs.ferenc2014-06-141-2/+2