summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Empty mergeDerick Rethans2016-11-240-0/+0
| |\ \ \ | | |/ /
| | * | Updated to version 2016.10 (2016j)Derick Rethans2016-11-241-432/+583
* | | | Update NEWSXinchen Hui2016-11-241-0/+2
* | | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-11-241-4/+2
|\ \ \ \ | |/ / /
| * | | Fixed bug #73585 (Logging of "Internal Zend error - Missing class information...Xinchen Hui2016-11-242-5/+5
* | | | Merge branch 'PHP-7.0' into PHP-7.1Ferenc Kovacs2016-11-240-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2016-11-240-0/+0
| |\ \ \ | | |/ /
| | * | 5.6.30 will be nextFerenc Kovacs2016-11-243-5/+7
* | | | CS (no leading space in comment for config option)Remi Collet2016-11-232-4/+4
* | | | Fixed bug #73583 (Segfaults when conditionally declared class and function ha...Xinchen Hui2016-11-233-1/+22
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-11-221-77/+56
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-11-221-77/+56
| |\ \ \ | | |/ /
| | * | Make php_url_parse_ex() respect length argumentNikita Popov2016-11-221-20/+28
| | * | Cleanup parse_url() query/fragment handlingNikita Popov2016-11-221-40/+21
| | * | Cleanup parse_url() gotosNikita Popov2016-11-221-17/+7
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-2/+2
|\ \ \ \ | |/ / /
| * | | update libs_versions.txtAnatol Belski2016-11-221-2/+2
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-11-220-0/+0
| |\ \ \ | | |/ /
| | * | update libs versions.txtAnatol Belski2016-11-221-2/+2
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-220-0/+0
|\ \ \ \ | |/ / /
| * | | move dev to nextAnatol Belski2016-11-223-5/+9
* | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-221-1/+1
|\ \ \ \ | |/ / /
| * | | Fixed use after freeDmitry Stogov2016-11-221-1/+1
* | | | Micro-optimizationDmitry Stogov2016-11-222-20/+20
* | | | Removed useless (double) checks for EG(exception). (Bob)Dmitry Stogov2016-11-223-66/+6
* | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-222-3/+23
|\ \ \ \ | |/ / /
| * | | Fixed memory leak (Bob)Dmitry Stogov2016-11-222-3/+23
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-6/+2
|\ \ \ \ | |/ / /
| * | | Revert "fix invalid read, follow up on 97b65cc9"Anatol Belski2016-11-221-6/+2
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-2/+6
|\ \ \ \ | |/ / /
| * | | fix invalid read, follow up on 97b65cc9Anatol Belski2016-11-221-2/+6
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-220-0/+0
|\ \ \ \ | |/ / /
| * | | update NEWSAnatol Belski2016-11-221-0/+3
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-11-220-0/+0
| |\ \ \ | | |/ /
| | * | update NEWSAnatol Belski2016-11-221-0/+3
* | | | update NEWSAnatol Belski2016-11-221-0/+3
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-225-2/+30
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-11-225-2/+30
| |\ \ \ | | |/ /
| | * | Fix bug #73498Craig Duncan2016-11-221-2/+2
| | * | Add a test for bug 73498Craig Duncan2016-11-224-0/+28
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-2211-19/+19
|\ \ \ \ | |/ / /
| * | | remove TSRMLS_*Anatol Belski2016-11-2111-19/+19
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-212-0/+12
|\ \ \ \ | |/ / /
| * | | update php.ini-* for bug #69090Anatol Belski2016-11-212-0/+12
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-11-210-0/+0
| |\ \ \ | | |/ /
| | * | update php.ini-* according to changes for bug #69090Anatol Belski2016-11-212-0/+12
* | | | update NEWSAnatol Belski2016-11-211-0/+1
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-210-0/+0
|\ \ \ \ | |/ / /
| * | | update NEWSAnatol Belski2016-11-211-0/+1
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-11-210-0/+0
| |\ \ \ | | |/ /