summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Add missing null terminationNikita Popov2017-09-051-0/+3
|
* Fixed bug #70470Bouke van der Bijl2017-09-053-28/+119
|
* take care of compile warnings.George Wang2017-08-022-64/+11
|
* Update copyright year to 2017Peter Kokot2017-07-242-4/+4
|
* Fixed bug 74913 redirecting incorrect include <sys/poll.h>Peter Kokot2017-07-171-1/+5
|
* [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), ↵George Wang2017-06-271-10/+18
| | | | | | but not applies. [BUGFIX] when lsapi used the php_value has higher priority then ini_set when called from the script by itself .
* Add simple cli test for PATH/HOST ini sectionsManuel Mausz2017-06-091-0/+46
|
* Added cleanupXinchen Hui2017-05-171-0/+4
|
* Added test for bug #74600Xinchen Hui2017-05-171-0/+34
|
* 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
|\ | | | | | | | | | | * 'PHP-7.0' of git.php.net:/php-src: Fixed condition check Fixed issue #2466 Invalid integer constant expression error in php.h
| * Fixed condition checkXinchen Hui2017-04-101-1/+1
| |
* | Fixed bug #74400 (phpdbg comparing socket function to int)Joe Watkins2017-04-101-1/+1
|/
* Revert "Fixed bug #61471"Anatol Belski2017-03-282-47/+1
| | | | This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d.
* Revert "fix crash in phpdbg shutdown process when opcache is loaded"Joe Watkins2017-02-271-2/+1
| | | | This reverts commit 008fb28eafa3740b1e3696b1a5cf7566d493b97d.
* fix crash in phpdbg shutdown process when opcache is loadedJoe Watkins2017-02-271-1/+2
|
* pull-request/2393:Coenraad Loubser2017-02-221-5/+9
| | | | stop make install from clobbering default dot d configuration
* Fixed bug #69860Denis Yeldandi2017-02-121-1/+2
|
* Fixed bug #61471Zheng SHAO2017-02-082-1/+47
|
* Try fpm path for testing in sbin as it is default targetJakub Zelenka2017-01-291-4/+10
|
* Fix copying too much leading to potential segfaultBob Weinand2017-01-251-1/+1
|
* Fix Bug #69865 php-fpm does not close stderr when using syslogMichael Wallner2017-01-231-0/+6
|
* Remove remnants of TSMRLS_* macro callsThomas Punt2017-01-182-2/+2
|
* Increase wait time for tests involving sockets to improve Travis relabilityMitch Hagstrand2017-01-137-10/+10
| | | | | 1. Increased sleep time from 25ms to 50ms 2. Added sleep to shutdown handlers
* Fixed #73902 mention router support in usage output for php-cliJoe Watkins2017-01-101-1/+1
|
* Use proper file extension for the READMEMarkus Staab2017-01-081-0/+0
|
* Fix 404 links in Litespeed README - Bug 73890Peter Kokot2017-01-081-2/+2
|
* improve FPM tests (mostly for systemd build)Remi Collet2017-01-089-14/+19
|
* Fixed bug #67583Nikita Popov2017-01-071-2/+1
| | | | | | As fcgi_request is an opaque struct as of PHP 7, expose a new API function fcgi_end() which does fcgi_flush() with end=1 and checks/ sets the ->ended flag.
* Fixes for session and fpm tests in PHP7.0 branchMitch Hagstrand2017-01-066-17/+17
| | | | | | 1. Increased the timeout on sapi/fpm tests to match the cli server 2. Disabled session GC in session_set_save_handler_basic.phpt 3. Fixed GC in save_handler.inc to delete files based on age
* Merge branch 'pull-request/1311' into PHP-7.0Joe Watkins2017-01-061-2/+4
|\ | | | | | | | | * pull-request/1311: fix inappropriate warning in FPM log
| * improperlogredfoxli2015-05-301-2/+4
| |
* | Revert "Merge branch 'bugfix_timeout_61471' of ↵Anatol Belski2017-01-051-44/+1
| | | | | | | | | | | | | | https://github.com/axot/php-src into PHP-7.0" This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.
* | Merge branch 'pull-request/1256' into PHP-7.0Joe Watkins2017-01-051-3/+3
|\ \ | | | | | | | | | | | | * pull-request/1256: Fix php-fpm.service.in
| * | Fix php-fpm.service.inFloris Bos2015-05-011-3/+3
| | | | | | | | | | | | | | | | | | | | | - Expand file paths. - Remove obsolete After=syslog.target. Syslog is socket activated nowadays. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0482-90/+90
| | |
* | | Flush stderr on win32 in cli_log_messageNikita Popov2017-01-011-0/+3
| | | | | | | | | | | | This allows us to unfork a bunch of tests for Windows.
* | | Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into ↵Xinchen Hui2016-12-291-1/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP-7.0 * 'bugfix_timeout_61471' of https://github.com/axot/php-src: define php_ap_map_http_request_error function for older httpd only add old versions of httpd support typo fixed bug fixed #61471 in apache2handler
| * | | 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
| | | |
* | | | Makes the sapi web server and curl tests more reliableMitch Hagstrand2016-12-272-18/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections. 2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function. 3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one. 4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt runs on Windows also.
* | | | Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)Bob Weinand2016-12-224-14/+61
| | | |
* | | | Fix issue with -- in phpdbg command lineBob Weinand2016-12-211-1/+1
|/ / /
* | | Partially fix bug #70492Nikita Popov2016-12-141-1/+1
| | | | | | | | | | | | The libmagic portion is missing.
* | | Fixed issue getting executable lines from custom wrappersBob Weinand2016-12-063-5/+95
| | | | | | | | | | | | See also krakjoe/phpdbg#161
* | | 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
|\ \ \ \