Commit Graph

4213 Commits

Author SHA1 Message Date
Jakub Zelenka
df16579642 Try fpm path for testing in sbin as it is default target 2017-01-29 20:43:58 +00:00
Bob Weinand
c44efbbbb1 Fix copying too much leading to potential segfault 2017-01-25 13:00:48 +01:00
Michael Wallner
80a851b4dd
Fix Bug #69865 php-fpm does not close stderr when using syslog 2017-01-23 16:55:15 +00:00
Thomas Punt
fb8486f3bd
Remove remnants of TSMRLS_* macro calls 2017-01-18 17:42:45 +00:00
Mitch Hagstrand
fd92b91188
Increase wait time for tests involving sockets to improve Travis relability
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
2017-01-13 06:45:04 +00:00
Joe Watkins
125ee6a68e
Fixed #73902 mention router support in usage output for php-cli 2017-01-10 06:19:34 +00:00
Markus Staab
5b5483dc8e
Use proper file extension for the README 2017-01-08 21:05:06 +00:00
Peter Kokot
7f1247004e
Fix 404 links in Litespeed README - Bug 73890 2017-01-08 20:27:48 +00:00
Remi Collet
eb02876e74
improve FPM tests (mostly for systemd build) 2017-01-08 19:02:50 +00:00
Nikita Popov
a46bbdda2e Fixed bug #67583
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.
2017-01-07 22:53:28 +01:00
Mitch Hagstrand
3401f553b9 Fixes for session and fpm tests in PHP7.0 branch
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
2017-01-06 19:55:57 -08:00
Joe Watkins
6a03b43e5f
Merge branch 'pull-request/1311' into PHP-7.0
* pull-request/1311:
  fix inappropriate warning in FPM log
2017-01-06 05:54:42 +00:00
Anatol Belski
57736cc937 Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
This reverts commit a8931df672, reversing
changes made to f2f35a2b27.
2017-01-05 13:59:01 +01:00
Joe Watkins
b037c43497
Merge branch 'pull-request/1256' into PHP-7.0
* pull-request/1256:
  Fix php-fpm.service.in
2017-01-05 06:54:19 +00:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Nikita Popov
935b5cb11e Flush stderr on win32 in cli_log_message
This allows us to unfork a bunch of tests for Windows.
2017-01-01 21:09:02 +01:00
Xinchen Hui
a8931df672 Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into 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
2016-12-29 15:46:47 +08:00
Zheng SHAO
587497e3a9 define php_ap_map_http_request_error function for older httpd only 2016-12-29 16:07:05 +09:00
Zheng SHAO
d92606a4be add old versions of httpd support 2016-12-29 00:41:56 +09:00
Mitch Hagstrand
2d51267c07 Makes the sapi web server and curl tests more reliable
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.
2016-12-27 21:52:05 +01:00
Bob Weinand
3b2b080cbc Fixed bug #73704 (phpdbg shows the wrong line in files with shebang) 2016-12-22 00:39:24 +01:00
Bob Weinand
becda86ae5 Fix issue with -- in phpdbg command line 2016-12-21 02:42:23 +01:00
Zheng SHAO
fb98907d2d typo fixed 2016-12-17 20:26:09 +09:00
Zheng SHAO
9b65a10256 bug fixed #61471 in apache2handler 2016-12-17 13:37:58 +09:00
Nikita Popov
f99bf70360 Partially fix bug #70492
The libmagic portion is missing.
2016-12-14 18:11:27 +01:00
Bob Weinand
7e12b5da71 Fixed issue getting executable lines from custom wrappers
See also krakjoe/phpdbg#161
2016-12-06 18:29:48 +01:00
Christoph M. Becker
a8ec79e27f Merge branch 'PHP-5.6' into PHP-7.0 2016-12-03 14:18:00 +01:00
Adrien Crivelli
cf2496140d Fix minor typo 2016-12-03 14:15:52 +01:00
Nuno Lopes
d5a2af6d1c Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 2016-11-30 14:41:26 -05:00
Bob Weinand
344ef050aa Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available 2016-11-30 11:44:10 +01:00
Bob Weinand
b73a3afff3 Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup) 2016-11-30 02:56:47 +01:00
Bob Weinand
bc30206b8a Revert "Revert "Remove a few unused write warning""
This reverts commit ff5a65d26b.

(With zend_ prefix now)
2016-11-20 19:18:50 +01:00
Nikita Popov
ff5a65d26b Revert "Remove a few unused write warning (backport from master, oops)s"
This reverts commit c65d24eaa3.
2016-11-20 19:09:05 +01:00
Bob Weinand
c65d24eaa3 Remove a few unused write warning (backport from master, oops)s 2016-11-20 14:17:14 +01:00
Joe Watkins
7753d10457 make it possible to show specific help pages without interactive session 2016-11-20 05:24:14 +00:00
Dmitry Stogov
3817a2e6d5 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed test
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
2016-11-17 15:58:38 +03:00
Dmitry Stogov
c2d6ffb85f Fixed test 2016-11-17 15:57:40 +03:00
Nuno Lopes
d26b8804d0 fix gcov coverage 2016-11-16 15:11:07 -05:00
Bob Weinand
22a43551a2 Fix passing of wrong values in bp export 2016-11-13 18:30:23 +01:00
Bob Weinand
ba75d4c50b Properly escape all filenames when exporting breakpoints 2016-11-13 13:22:06 +01:00
Mitch Hagstrand
57c0773cd7 Fix phpdbg breakpoint restoring after execution completes 2016-11-13 12:44:25 +01:00
Anatol Belski
e586c7c612 yet another uninitialized pointer 2016-10-27 02:42:30 +02:00
Anatol Belski
b9993c8b6c fix uninitialized pointer 2016-10-27 02:15:14 +02:00
Joe Watkins
96ed946b2b Merge branch 'pull-request/2097' 2016-10-17 16:03:12 +01:00
Bob Weinand
d82da7de3a Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version) 2016-10-16 15:41:37 +02:00
Bob Weinand
e93eaee164 Fixed bug #70776 (Simple SIGINT does not have any effect) 2016-10-16 13:47:49 +02:00
Bob Weinand
466870e2b0 Fix memory leak when compiling files in phpdbg 2016-10-14 12:24:28 +02:00
Bob Weinand
d14498a475 Ignore non-executable opcodes in line mode of phpdbg_end_oplog() 2016-10-13 14:09:56 +02:00
Anatol Belski
ce3e792c2c use already exported symbol 2016-10-13 09:55:37 +02:00
Bob Weinand
fe49fd7dad Update NEWS
Also add missing include.inc test file
2016-10-12 22:54:32 +02:00