Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-06-12 | 1 | -0/+46 |
|\ | |||||
| * | Add simple cli test for PATH/HOST ini sections | Manuel Mausz | 2017-06-09 | 1 | -0/+46 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-05-17 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Added cleanup | Xinchen Hui | 2017-05-17 | 1 | -0/+4 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-05-17 | 1 | -0/+34 |
|\ \ | |/ | |||||
| * | Added test for bug #74600 | Xinchen Hui | 2017-05-17 | 1 | -0/+34 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-05-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix typo: exectute => execute | Andrew Marcinkevičius | 2017-05-08 | 1 | -1/+1 |
| * | Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 | Joe Watkins | 2017-04-10 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 | Joe Watkins | 2017-04-10 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Fixed condition check | Xinchen Hui | 2017-04-10 | 1 | -1/+1 |
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-04-10 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed condition check | Xinchen Hui | 2017-04-10 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-04-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Fixed bug #74400 (phpdbg comparing socket function to int) | Joe Watkins | 2017-04-10 | 1 | -1/+1 |
| |/ | |||||
* | | fix buffer overflow | Anatol Belski | 2017-04-03 | 1 | -2/+1 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-03-28 | 2 | -47/+1 |
|\ \ | |/ | |||||
| * | Revert "Fixed bug #61471" | Anatol Belski | 2017-03-28 | 2 | -47/+1 |
| * | Revert "fix crash in phpdbg shutdown process when opcache is loaded" | Joe Watkins | 2017-02-27 | 1 | -2/+1 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-02-27 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | fix crash in phpdbg shutdown process when opcache is loaded | Joe Watkins | 2017-02-27 | 1 | -1/+2 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-02-22 | 1 | -5/+9 |
|\ \ | |/ | |||||
| * | pull-request/2393: | Coenraad Loubser | 2017-02-22 | 1 | -5/+9 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-02-12 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Fixed bug #69860 | Denis Yeldandi | 2017-02-12 | 1 | -1/+2 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-02-08 | 2 | -1/+47 |
|\ \ | |/ | |||||
| * | Fixed bug #61471 | Zheng SHAO | 2017-02-08 | 2 | -1/+47 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-01-29 | 1 | -4/+10 |
|\ \ | |/ | |||||
| * | Try fpm path for testing in sbin as it is default target | Jakub Zelenka | 2017-01-29 | 1 | -4/+10 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2017-01-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix copying too much leading to potential segfault | Bob Weinand | 2017-01-25 | 1 | -1/+1 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-23 | 1 | -0/+6 |
|\ \ | |/ | |||||
| * | Fix Bug #69865 php-fpm does not close stderr when using syslog | Michael Wallner | 2017-01-23 | 1 | -0/+6 |
* | | use correct shift and fix slowlog bt in 7.1 | Antony Dovgal | 2017-01-23 | 1 | -2/+2 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-18 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Remove remnants of TSMRLS_* macro calls | Thomas Punt | 2017-01-18 | 2 | -2/+2 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-13 | 7 | -10/+10 |
|\ \ | |/ | |||||
| * | Increase wait time for tests involving sockets to improve Travis relability | Mitch Hagstrand | 2017-01-13 | 7 | -10/+10 |
* | | Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo() | Anatol Belski | 2017-01-12 | 1 | -1/+20 |
* | | Fixed bug #73904 php-cgi fails to load -c specified php.ini file | Anatol Belski | 2017-01-12 | 1 | -6/+23 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-10 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixed #73902 mention router support in usage output for php-cli | Joe Watkins | 2017-01-10 | 1 | -1/+1 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-08 | 1 | -0/+0 |
|\ \ | |/ | |||||
| * | Use proper file extension for the README | Markus Staab | 2017-01-08 | 1 | -0/+0 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-08 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Fix 404 links in Litespeed README - Bug 73890 | Peter Kokot | 2017-01-08 | 1 | -2/+2 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-08 | 9 | -14/+19 |
|\ \ | |/ | |||||
| * | improve FPM tests (mostly for systemd build) | Remi Collet | 2017-01-08 | 9 | -14/+19 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-07 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | Fixed bug #67583 | Nikita Popov | 2017-01-07 | 1 | -2/+1 |