Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing null termination | Nikita Popov | 2017-09-05 | 1 | -0/+3 |
| | |||||
* | Fixed bug #70470 | Bouke van der Bijl | 2017-09-05 | 3 | -28/+119 |
| | |||||
* | take care of compile warnings. | George Wang | 2017-08-02 | 2 | -64/+11 |
| | |||||
* | Update copyright year to 2017 | Peter Kokot | 2017-07-24 | 2 | -4/+4 |
| | |||||
* | Fixed bug 74913 redirecting incorrect include <sys/poll.h> | Peter Kokot | 2017-07-17 | 1 | -1/+5 |
| | |||||
* | [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), ↵ | George Wang | 2017-06-27 | 1 | -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 sections | Manuel Mausz | 2017-06-09 | 1 | -0/+46 |
| | |||||
* | Added cleanup | Xinchen Hui | 2017-05-17 | 1 | -0/+4 |
| | |||||
* | Added test for bug #74600 | Xinchen Hui | 2017-05-17 | 1 | -0/+34 |
| | |||||
* | 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 |
|\ | | | | | | | | | | | * '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 check | Xinchen Hui | 2017-04-10 | 1 | -1/+1 |
| | | |||||
* | | Fixed bug #74400 (phpdbg comparing socket function to int) | Joe Watkins | 2017-04-10 | 1 | -1/+1 |
|/ | |||||
* | Revert "Fixed bug #61471" | Anatol Belski | 2017-03-28 | 2 | -47/+1 |
| | | | | This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d. | ||||
* | Revert "fix crash in phpdbg shutdown process when opcache is loaded" | Joe Watkins | 2017-02-27 | 1 | -2/+1 |
| | | | | This reverts commit 008fb28eafa3740b1e3696b1a5cf7566d493b97d. | ||||
* | fix crash in phpdbg shutdown process when opcache is loaded | Joe Watkins | 2017-02-27 | 1 | -1/+2 |
| | |||||
* | pull-request/2393: | Coenraad Loubser | 2017-02-22 | 1 | -5/+9 |
| | | | | stop make install from clobbering default dot d configuration | ||||
* | Fixed bug #69860 | Denis Yeldandi | 2017-02-12 | 1 | -1/+2 |
| | |||||
* | Fixed bug #61471 | Zheng SHAO | 2017-02-08 | 2 | -1/+47 |
| | |||||
* | Try fpm path for testing in sbin as it is default target | Jakub Zelenka | 2017-01-29 | 1 | -4/+10 |
| | |||||
* | Fix copying too much leading to potential segfault | Bob Weinand | 2017-01-25 | 1 | -1/+1 |
| | |||||
* | Fix Bug #69865 php-fpm does not close stderr when using syslog | Michael Wallner | 2017-01-23 | 1 | -0/+6 |
| | |||||
* | Remove remnants of TSMRLS_* macro calls | Thomas Punt | 2017-01-18 | 2 | -2/+2 |
| | |||||
* | Increase wait time for tests involving sockets to improve Travis relability | Mitch Hagstrand | 2017-01-13 | 7 | -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-cli | Joe Watkins | 2017-01-10 | 1 | -1/+1 |
| | |||||
* | Use proper file extension for the README | Markus Staab | 2017-01-08 | 1 | -0/+0 |
| | |||||
* | Fix 404 links in Litespeed README - Bug 73890 | Peter Kokot | 2017-01-08 | 1 | -2/+2 |
| | |||||
* | improve FPM tests (mostly for systemd build) | Remi Collet | 2017-01-08 | 9 | -14/+19 |
| | |||||
* | Fixed bug #67583 | Nikita Popov | 2017-01-07 | 1 | -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 branch | Mitch Hagstrand | 2017-01-06 | 6 | -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.0 | Joe Watkins | 2017-01-06 | 1 | -2/+4 |
|\ | | | | | | | | | * pull-request/1311: fix inappropriate warning in FPM log | ||||
| * | improperlog | redfoxli | 2015-05-30 | 1 | -2/+4 |
| | | |||||
* | | Revert "Merge branch 'bugfix_timeout_61471' of ↵ | Anatol Belski | 2017-01-05 | 1 | -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.0 | Joe Watkins | 2017-01-05 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | * pull-request/1256: Fix php-fpm.service.in | ||||
| * | | Fix php-fpm.service.in | Floris Bos | 2015-05-01 | 1 | -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 2017 | Sammy Kaye Powers | 2017-01-04 | 82 | -90/+90 |
| | | | |||||
* | | | Flush stderr on win32 in cli_log_message | Nikita Popov | 2017-01-01 | 1 | -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 Hui | 2016-12-29 | 1 | -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 only | Zheng SHAO | 2016-12-29 | 1 | -31/+24 |
| | | | | |||||
| * | | | add old versions of httpd support | Zheng SHAO | 2016-12-29 | 1 | -0/+34 |
| | | | | |||||
| * | | | typo fixed | Zheng SHAO | 2016-12-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | bug fixed #61471 in apache2handler | Zheng SHAO | 2016-12-17 | 1 | -1/+17 |
| | | | | |||||
* | | | | Makes the sapi web server and curl tests more reliable | Mitch Hagstrand | 2016-12-27 | 2 | -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 Weinand | 2016-12-22 | 4 | -14/+61 |
| | | | | |||||
* | | | | Fix issue with -- in phpdbg command line | Bob Weinand | 2016-12-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Partially fix bug #70492 | Nikita Popov | 2016-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | The libmagic portion is missing. | ||||
* | | | Fixed issue getting executable lines from custom wrappers | Bob Weinand | 2016-12-06 | 3 | -5/+95 |
| | | | | | | | | | | | | See also krakjoe/phpdbg#161 | ||||
* | | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-12-03 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix minor typo | Adrien Crivelli | 2016-12-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 | Nuno Lopes | 2016-11-30 | 14 | -24/+64 |
|\ \ \ \ |