summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-051-44/+1
|\
| * Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-sr...Anatol Belski2017-01-051-44/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-051-3/+3
|\ \ | |/
| * Merge branch 'pull-request/1256' into PHP-7.0Joe Watkins2017-01-051-3/+3
| |\
| | * Fix php-fpm.service.inFloris Bos2015-05-011-3/+3
| * | Update copyright headers to 2017Sammy Kaye Powers2017-01-0482-90/+90
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0482-90/+90
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-011-0/+3
|\ \ \ | |/ /
| * | Flush stderr on win32 in cli_log_messageNikita Popov2017-01-011-0/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-12-291-1/+44
|\ \ \ | |/ /
| * | Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into P...Xinchen Hui2016-12-291-1/+44
| |\ \
| | * | define php_ap_map_http_request_error function for older httpd onlyZheng SHAO2016-12-291-31/+24
| | * | add old versions of httpd supportZheng SHAO2016-12-291-0/+34
| | * | typo fixedZheng SHAO2016-12-171-1/+1
| | * | bug fixed #61471 in apache2handlerZheng SHAO2016-12-171-1/+17
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-272-18/+56
|\ \ \ \ | |/ / /
| * | | Makes the sapi web server and curl tests more reliableMitch Hagstrand2016-12-272-18/+56
* | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-225-14/+61
|\ \ \ \ | |/ / /
| * | | Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)Bob Weinand2016-12-224-14/+61
* | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-211-1/+1
|\ \ \ \ | |/ / /
| * | | Fix issue with -- in phpdbg command lineBob Weinand2016-12-211-1/+1
| |/ /
* | | Fixed bug #73794 (Crash (out of memory) when using run and # command separator)Bob Weinand2016-12-202-0/+17
* | | Fix segfault in ZTS mode when just printing and exiting in phpdbgBob Weinand2016-12-201-1/+1
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-141-1/+1
|\ \ \ | |/ /
| * | Partially fix bug #70492Nikita Popov2016-12-141-1/+1
* | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-063-5/+95
|\ \ \ | |/ /
| * | Fixed issue getting executable lines from custom wrappersBob Weinand2016-12-063-5/+95
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-12-031-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-12-031-1/+1
| |\ \
| | * | Fix minor typoAdrien Crivelli2016-12-031-1/+1
| * | | Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0Nuno Lopes2016-11-3014-24/+64
| |\ \ \
| * | | | fix gcov coverageNuno Lopes2016-11-162-31/+31
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-11-301-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg availableBob Weinand2016-11-301-1/+1
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-11-304-6/+24
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup)Bob Weinand2016-11-304-6/+24
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-11-208-16/+15
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert "Remove a few unused write warning""Bob Weinand2016-11-208-16/+15
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-11-206-7/+9
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Remove a few unused write warning (backport from master, oops)s"Nikita Popov2016-11-206-7/+9
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-11-207-9/+8
|\ \ \ \ \ | |/ / / /
| * | | | Remove a few unused write warning (backport from master, oops)sBob Weinand2016-11-207-9/+8
| * | | | make it possible to show specific help pages without interactive sessionJoe Watkins2016-11-203-1/+23
* | | | | make it possible to show specific help pages without interactive sessionJoe Watkins2016-11-203-1/+23
* | | | | extend skipifAnatol Belski2016-11-181-0/+3
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Dmitry Stogov2016-11-171-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Fixed testDmitry Stogov2016-11-171-1/+1
* | | | fix gcov coverageNuno Lopes2016-11-162-31/+31
* | | | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-11-131-2/+2
|\ \ \ \ | |/ / /