summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update the ini scanner as from Dmitry's commitKalle Sommer Nielsen2016-11-191-117/+119
* Remove these NetWare leftoversKalle Sommer Nielsen2016-11-193-238/+0
* Updated the comment regarding what priority modes that are left out for the n...Kalle Sommer Nielsen2016-11-191-1/+12
* Remove support for REALTIME_PRIORITY_CLASS in proc_nice() on Windows.Kalle Sommer Nielsen2016-11-192-8/+4
* Merge branch 'PHP-7.1'Anatol Belski2016-11-181-1/+1
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-181-1/+1
| |\
| | * fix test portabilityAnatol Belski2016-11-181-1/+1
* | | Merge branch 'PHP-7.1'Nikita Popov2016-11-182-0/+25
|\ \ \ | |/ /
| * | Fixed bug #73303Nikita Popov2016-11-183-6/+32
* | | Merge branch 'PHP-7.1'Anatol Belski2016-11-181-4/+22
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-181-4/+22
| |\ \ | | |/
| | * don't fail miserably, when an unknown vc version is usedAnatol Belski2016-11-181-4/+22
* | | Merge branch 'PHP-7.1'Nikita Popov2016-11-180-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-11-180-0/+0
| |\ \ | | |/
| | * Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-11-180-0/+0
| | |\
| | | * Fix the lchwon error test for Travis CI.Mitch Hagstrand2016-11-181-1/+1
* | | | Merge branch 'PHP-7.1'Christoph M. Becker2016-11-182-0/+44
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-11-183-0/+47
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-11-183-0/+47
| | |\ \ | | | |/
| | | * Fix #64526: Add missing mysqlnd.* parameters to php.ini-*Christoph M. Becker2016-11-183-0/+47
* | | | Merge branch 'PHP-7.1'Dmitry Stogov2016-11-180-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-180-0/+0
| |\ \ \ | | |/ /
| | * | Regenerated scannerDmitry Stogov2016-11-182-1921/+1933
* | | | Merge branch 'PHP-7.1'Dmitry Stogov2016-11-183-16/+27
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-183-16/+27
| |\ \ \ | | |/ /
| | * | Fixed memory leaks in parse_ini_file()Dmitry Stogov2016-11-183-16/+27
* | | | Merge branch 'PHP-7.1'Anatol Belski2016-11-181-0/+1
|\ \ \ \ | |/ / /
| * | | extend skipifAnatol Belski2016-11-181-0/+1
* | | | Merge branch 'PHP-7.1'Dmitry Stogov2016-11-181-3/+13
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-182-3/+18
| |\ \ \ | | |/ /
| | * | Disabled PHP call tracing by default (it makes significant overhead).Dmitry Stogov2016-11-182-3/+18
* | | | Merge branch 'PHP-7.1'Dmitry Stogov2016-11-182-15/+7
|\ \ \ \ | |/ / /
| * | | Revert "Introduced zend.enable_dtrace INI directive to enable/disable PHP cal...Dmitry Stogov2016-11-183-19/+7
* | | | Merge branch 'PHP-7.1'Dmitry Stogov2016-11-182-7/+15
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1Dmitry Stogov2016-11-182-0/+5
| |\ \ \
| * | | | Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracingDmitry Stogov2016-11-183-7/+19
* | | | | Merge branch 'PHP-7.1'Anatol Belski2016-11-181-0/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | extend skipifAnatol Belski2016-11-181-0/+3
* | | | | Merge branch 'PHP-7.1'Anatol Belski2016-11-171-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-171-0/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | add vc15 to the listAnatol Belski2016-11-171-0/+2
* | | | Revert "Remove PDOStatement::activeQueryString()"Adam Baratz2016-11-174-8/+94
* | | | Merge branch 'PHP-7.1'Dmitry Stogov2016-11-171-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-171-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Dmitry Stogov2016-11-171-1/+1
| | |\ \ | | | |/
| | | * Fixed testDmitry Stogov2016-11-171-1/+1
| | | * Updated NEWSJulien Pauli2016-11-171-0/+4
| | | * Improvement for bug73297Julien Pauli2016-11-171-1/+1
| | | * Simplify ext/standard/tests/http/bug73297.phptRowan Collins2016-11-171-26/+18
| | | * http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responsesRowan Collins2016-11-171-0/+18