summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.4'Nikita Popov2019-06-111-3/+3
|\
| * Register class before fetching parentNikita Popov2019-06-111-3/+3
| * use XFAILIF rather than XFAIL to avoid warnings [ci skip]Joe Watkins2019-06-116-12/+36
* | use XFAILIF rather than XFAIL to avoid warnings [ci skip]Joe Watkins2019-06-116-12/+36
* | Merge branch 'PHP-7.4'Joe Watkins2019-06-106-0/+12
|\ \ | |/
| * watchpoints have flaws in implementationJoe Watkins2019-06-106-0/+12
* | Merge branch 'PHP-7.4'Peter Kokot2019-06-094-5/+5
|\ \ | |/
| * Simplify LiteSpeed SAPI module versionPeter Kokot2019-06-091-1/+1
| * Use PHP_VERSION for zend modulesPeter Kokot2019-06-094-4/+4
* | Merge branch 'PHP-7.4'Nikita Popov2019-06-041-1/+0
|\ \ | |/
| * Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-041-1/+0
| |\
| | * Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-06-041-1/+0
| | |\
| | | * Reload tsrmls_id in release builds as wellNikita Popov2019-06-041-1/+0
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-06-041-17/+17
|\ \ \ \ | |/ / /
| * | | Try to fix phpdbg + opcache compatibilityNikita Popov2019-06-041-17/+17
* | | | Merge branch 'PHP-7.4'Anatol Belski2019-06-011-5/+15
|\ \ \ \ | |/ / /
| * | | Don't involve output check in the testAnatol Belski2019-06-011-5/+15
* | | | Merge branch 'PHP-7.4'Christoph M. Becker2019-06-011-2/+0
|\ \ \ \ | |/ / /
| * | | Fix ZTS issue regarding new Windows CTRL handling APIChristoph M. Becker2019-06-011-2/+0
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-05-311-0/+1
|\ \ \ \ | |/ / /
| * | | Add CONFLCITS file for fpmNikita Popov2019-05-311-0/+1
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-05-311-0/+2
|\ \ \ \ | |/ / /
| * | | Mark sapi_windows_set_ctrl_handler.phpt as XFAILNikita Popov2019-05-311-0/+2
* | | | Fix FPM tests for PHP 8Nikita Popov2019-05-291-1/+1
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-05-294-28/+5
|\ \ \ \ | |/ / /
| * | | Update phpdbg oplog testNikita Popov2019-05-291-1/+1
| * | | Update cli reflection testNikita Popov2019-05-291-2/+4
| * | | Remove two zpp tests in sapi/cli/testsNikita Popov2019-05-292-35/+0
* | | | Merge branch 'PHP-7.4'Joe Watkins2019-05-202-4/+4
|\ \ \ \ | |/ / /
| * | | Revert "Rename *.l files to *.re"Joe Watkins2019-05-202-4/+4
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-05-172-4/+4
|\ \ \ \ | |/ / /
| * | | Rename *.l files to *.rePeter Kokot2019-05-172-4/+4
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-05-172-4/+4
|\ \ \ \ | |/ / /
| * | | Rename configure --with-litespeed to --enable-litespeedPeter Kokot2019-05-172-4/+4
* | | | Merge branch 'PHP-7.4'Jakub Zelenka2019-05-131-0/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.3' into PHP-7.4Jakub Zelenka2019-05-131-0/+4
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-05-131-0/+4
| | |\ \ | | | |/
| | | * Add ping to the fpm test for bug #77934Jakub Zelenka2019-05-131-0/+4
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-05-131-151/+0
|\ \ \ \ | |/ / /
| * | | [ci skip] Remove outdated fastcgi info in favor of the manualPeter Kokot2019-05-131-151/+0
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-05-127-42/+15
|\ \ \ \ | |/ / /
| * | | Normalize comments in *nix build system m4 filesPeter Kokot2019-05-127-42/+15
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-05-121-25/+3
|\ \ \ \ | |/ / /
| * | | Use PKG_CHECK_MODULES to detect the systemd libraryHugh McMaster2019-05-121-25/+3
* | | | Merge branch 'PHP-7.4'Jakub Zelenka2019-05-112-1/+45
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.3' into PHP-7.4Jakub Zelenka2019-05-112-1/+45
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-05-112-1/+45
| | |\ \ | | | |/
| | | * Fix bug #77934 (php-fpm kill -USR2 not working)Jakub Zelenka2019-05-112-1/+45
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-05-101-19/+0
|\ \ \ \ | |/ / /
| * | | Remove unused variablesPeter Kokot2019-05-101-19/+0