summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-171-0/+4
|\ \ | |/
| * Added cleanupXinchen Hui2017-05-171-0/+4
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-171-0/+34
|\ \ | |/
| * Added test for bug #74600Xinchen Hui2017-05-171-0/+34
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-091-1/+1
|\ \ | |/
| * Fix typo: exectute => executeAndrew Marcinkevičius2017-05-081-1/+1
| * Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0Joe Watkins2017-04-101-1/+1
| |\
* | \ Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1Joe Watkins2017-04-102-2/+2
|\ \ \
| * | | Fixed condition checkXinchen Hui2017-04-101-1/+1
| * | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-04-101-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fixed condition checkXinchen Hui2017-04-101-1/+1
* | | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-04-101-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fixed bug #74400 (phpdbg comparing socket function to int)Joe Watkins2017-04-101-1/+1
| |/
* | fix buffer overflowAnatol Belski2017-04-031-2/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-03-282-47/+1
|\ \ | |/
| * Revert "Fixed bug #61471"Anatol Belski2017-03-282-47/+1
| * Revert "fix crash in phpdbg shutdown process when opcache is loaded"Joe Watkins2017-02-271-2/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-02-271-1/+2
|\ \ | |/
| * fix crash in phpdbg shutdown process when opcache is loadedJoe Watkins2017-02-271-1/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-02-221-5/+9
|\ \ | |/
| * pull-request/2393:Coenraad Loubser2017-02-221-5/+9
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-121-1/+2
|\ \ | |/
| * Fixed bug #69860Denis Yeldandi2017-02-121-1/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-082-1/+47
|\ \ | |/
| * Fixed bug #61471Zheng SHAO2017-02-082-1/+47
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-01-291-4/+10
|\ \ | |/
| * Try fpm path for testing in sbin as it is default targetJakub Zelenka2017-01-291-4/+10
* | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2017-01-251-1/+1
|\ \ | |/
| * Fix copying too much leading to potential segfaultBob Weinand2017-01-251-1/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-231-0/+6
|\ \ | |/
| * Fix Bug #69865 php-fpm does not close stderr when using syslogMichael Wallner2017-01-231-0/+6
* | use correct shift and fix slowlog bt in 7.1Antony Dovgal2017-01-231-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-182-2/+2
|\ \ | |/
| * Remove remnants of TSMRLS_* macro callsThomas Punt2017-01-182-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-137-10/+10
|\ \ | |/
| * Increase wait time for tests involving sockets to improve Travis relabilityMitch Hagstrand2017-01-137-10/+10
* | Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()Anatol Belski2017-01-121-1/+20
* | Fixed bug #73904 php-cgi fails to load -c specified php.ini fileAnatol Belski2017-01-121-6/+23
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-101-1/+1
|\ \ | |/
| * Fixed #73902 mention router support in usage output for php-cliJoe Watkins2017-01-101-1/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-081-0/+0
|\ \ | |/
| * Use proper file extension for the READMEMarkus Staab2017-01-081-0/+0
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-081-2/+2
|\ \ | |/
| * Fix 404 links in Litespeed README - Bug 73890Peter Kokot2017-01-081-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-089-14/+19
|\ \ | |/
| * improve FPM tests (mostly for systemd build)Remi Collet2017-01-089-14/+19
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-071-2/+1
|\ \ | |/
| * Fixed bug #67583Nikita Popov2017-01-071-2/+1