summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.1' into PHP-7.2Xinchen Hui2017-10-151-16/+14
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-10-151-16/+14
| |\
| | * Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)Xinchen Hui2017-10-151-16/+14
* | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-10-051-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-10-051-2/+2
| |\ \ | | |/
| | * Fixed bug #75311Mathieu CARBONNEAUX2017-10-051-2/+2
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-10-031-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-10-031-1/+1
| |\ \ | | |/
| | * Typo in status.htmlViktor Szépe2017-10-031-1/+1
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-09-271-3/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-09-271-3/+3
| |\ \ | | |/
| | * Fix CGI m4 config message when CGI is disabledPeter Kokot2017-09-271-3/+3
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-09-271-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-09-271-2/+2
| |\ \ | | |/
| | * Fix bug #75248 and #75251Peter Kokot2017-09-271-2/+2
* | | rename testRemi Collet2017-09-191-0/+0
* | | Fixed Bug #75212 php_value acts like php_admin_valueRemi Collet2017-09-183-1/+87
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-09-181-13/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-09-181-13/+1
| |\ \ | | |/
| | * Fix the version check causing the test failAnatol Belski2017-09-181-13/+1
* | | fix tests for 32-bitRemi Collet2017-09-132-2/+2
* | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-09-051-0/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-09-051-0/+3
| |\ \ | | |/
| | * Add missing null terminationNikita Popov2017-09-051-0/+3
* | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-09-053-27/+118
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-09-053-28/+119
| |\ \ | | |/
| | * Fixed bug #70470Bouke van der Bijl2017-09-053-28/+119
* | | Rework automatic interactive cli activationAnatol Belski2017-08-031-4/+14
* | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-08-022-64/+11
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-08-022-64/+11
| |\ \ | | |/
| | * take care of compile warnings.George Wang2017-08-022-64/+11
* | | Merge branch 'PHP-7.1' into PHP-7.2Joe Watkins2017-07-242-4/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-242-4/+4
| |\ \ | | |/
| | * Update copyright year to 2017Peter Kokot2017-07-242-4/+4
* | | Merge branch 'PHP-7.1' into PHP-7.2Xinchen Hui2017-07-211-1284/+1223
|\ \ \ | |/ /
* | | Merge branch 'PHP-7.1'Joe Watkins2017-07-171-1/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-171-1/+5
| |\ \ | | |/
| | * Fixed bug 74913 redirecting incorrect include <sys/poll.h>Peter Kokot2017-07-171-1/+5
* | | Fixed bug #74849 Process is started as interactive shell in PhpStormAnatol Belski2017-07-031-2/+1
* | | Merge branch 'PHP-7.1'George Wang2017-06-271-10/+18
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1George Wang2017-06-271-10/+18
| |\ \ | | |/
| | * [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), b...George Wang2017-06-271-10/+18
* | | Remove superfluous semicolonsTom Van Looy2017-06-261-5/+5
* | | Fixed php_socket_t to int conversionRichard Fussenegger2017-06-151-1/+1
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-06-121-0/+46
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-06-121-0/+46
| |\ \ | | |/
| | * Add simple cli test for PATH/HOST ini sectionsManuel Mausz2017-06-091-0/+46
* | | Exclude warm-up requests from callgrind profile.Dmitry Stogov2017-05-311-0/+12
* | | missing fix for another testRemi Collet2017-05-291-1/+2
* | | extend conditionAnatol Belski2017-05-271-1/+1