Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.4' | Nikita Popov | 2019-06-11 | 1 | -3/+3 |
|\ | |||||
| * | Register class before fetching parent | Nikita Popov | 2019-06-11 | 1 | -3/+3 |
| * | use XFAILIF rather than XFAIL to avoid warnings [ci skip] | Joe Watkins | 2019-06-11 | 6 | -12/+36 |
* | | use XFAILIF rather than XFAIL to avoid warnings [ci skip] | Joe Watkins | 2019-06-11 | 6 | -12/+36 |
* | | Merge branch 'PHP-7.4' | Joe Watkins | 2019-06-10 | 6 | -0/+12 |
|\ \ | |/ | |||||
| * | watchpoints have flaws in implementation | Joe Watkins | 2019-06-10 | 6 | -0/+12 |
* | | Merge branch 'PHP-7.4' | Peter Kokot | 2019-06-09 | 4 | -5/+5 |
|\ \ | |/ | |||||
| * | Simplify LiteSpeed SAPI module version | Peter Kokot | 2019-06-09 | 1 | -1/+1 |
| * | Use PHP_VERSION for zend modules | Peter Kokot | 2019-06-09 | 4 | -4/+4 |
* | | Merge branch 'PHP-7.4' | Nikita Popov | 2019-06-04 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-7.3' into PHP-7.4 | Nikita Popov | 2019-06-04 | 1 | -1/+0 |
| |\ | |||||
| | * | Merge branch 'PHP-7.2' into PHP-7.3 | Nikita Popov | 2019-06-04 | 1 | -1/+0 |
| | |\ | |||||
| | | * | Reload tsrmls_id in release builds as well | Nikita Popov | 2019-06-04 | 1 | -1/+0 |
* | | | | Merge branch 'PHP-7.4' | Nikita Popov | 2019-06-04 | 1 | -17/+17 |
|\ \ \ \ | |/ / / | |||||
| * | | | Try to fix phpdbg + opcache compatibility | Nikita Popov | 2019-06-04 | 1 | -17/+17 |
* | | | | Merge branch 'PHP-7.4' | Anatol Belski | 2019-06-01 | 1 | -5/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | Don't involve output check in the test | Anatol Belski | 2019-06-01 | 1 | -5/+15 |
* | | | | Merge branch 'PHP-7.4' | Christoph M. Becker | 2019-06-01 | 1 | -2/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix ZTS issue regarding new Windows CTRL handling API | Christoph M. Becker | 2019-06-01 | 1 | -2/+0 |
* | | | | Merge branch 'PHP-7.4' | Nikita Popov | 2019-05-31 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add CONFLCITS file for fpm | Nikita Popov | 2019-05-31 | 1 | -0/+1 |
* | | | | Merge branch 'PHP-7.4' | Nikita Popov | 2019-05-31 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Mark sapi_windows_set_ctrl_handler.phpt as XFAIL | Nikita Popov | 2019-05-31 | 1 | -0/+2 |
* | | | | Fix FPM tests for PHP 8 | Nikita Popov | 2019-05-29 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-7.4' | Nikita Popov | 2019-05-29 | 4 | -28/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Update phpdbg oplog test | Nikita Popov | 2019-05-29 | 1 | -1/+1 |
| * | | | Update cli reflection test | Nikita Popov | 2019-05-29 | 1 | -2/+4 |
| * | | | Remove two zpp tests in sapi/cli/tests | Nikita Popov | 2019-05-29 | 2 | -35/+0 |
* | | | | Merge branch 'PHP-7.4' | Joe Watkins | 2019-05-20 | 2 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Revert "Rename *.l files to *.re" | Joe Watkins | 2019-05-20 | 2 | -4/+4 |
* | | | | Merge branch 'PHP-7.4' | Peter Kokot | 2019-05-17 | 2 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Rename *.l files to *.re | Peter Kokot | 2019-05-17 | 2 | -4/+4 |
* | | | | Merge branch 'PHP-7.4' | Peter Kokot | 2019-05-17 | 2 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Rename configure --with-litespeed to --enable-litespeed | Peter Kokot | 2019-05-17 | 2 | -4/+4 |
* | | | | Merge branch 'PHP-7.4' | Jakub Zelenka | 2019-05-13 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-7.3' into PHP-7.4 | Jakub Zelenka | 2019-05-13 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-7.2' into PHP-7.3 | Jakub Zelenka | 2019-05-13 | 1 | -0/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Add ping to the fpm test for bug #77934 | Jakub Zelenka | 2019-05-13 | 1 | -0/+4 |
* | | | | Merge branch 'PHP-7.4' | Peter Kokot | 2019-05-13 | 1 | -151/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | [ci skip] Remove outdated fastcgi info in favor of the manual | Peter Kokot | 2019-05-13 | 1 | -151/+0 |
* | | | | Merge branch 'PHP-7.4' | Peter Kokot | 2019-05-12 | 7 | -42/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | Normalize comments in *nix build system m4 files | Peter Kokot | 2019-05-12 | 7 | -42/+15 |
* | | | | Merge branch 'PHP-7.4' | Peter Kokot | 2019-05-12 | 1 | -25/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Use PKG_CHECK_MODULES to detect the systemd library | Hugh McMaster | 2019-05-12 | 1 | -25/+3 |
* | | | | Merge branch 'PHP-7.4' | Jakub Zelenka | 2019-05-11 | 2 | -1/+45 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-7.3' into PHP-7.4 | Jakub Zelenka | 2019-05-11 | 2 | -1/+45 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-7.2' into PHP-7.3 | Jakub Zelenka | 2019-05-11 | 2 | -1/+45 |
| | |\ \ | | | |/ | |||||
| | | * | Fix bug #77934 (php-fpm kill -USR2 not working) | Jakub Zelenka | 2019-05-11 | 2 | -1/+45 |
* | | | | Merge branch 'PHP-7.4' | Peter Kokot | 2019-05-10 | 1 | -19/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove unused variables | Peter Kokot | 2019-05-10 | 1 | -19/+0 |