diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-22 12:24:15 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-22 14:31:51 +0100 |
| commit | 073b6ea818286fe838097d49f92ae379d5f217f0 (patch) | |
| tree | 3c184757547e5b3d1993fc613813f1365ab1c1ed | |
| parent | d7c98ca1ac10ee0461f332f21e548649dc0e51c9 (diff) | |
| download | php-git-073b6ea818286fe838097d49f92ae379d5f217f0.tar.gz | |
Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLI
There is no good reason not to show the credits in text based SAPIs,
except for brevity. Thus, we suppress the credits from `php -i`.
Closes GH-6710.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/standard/info.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/bug80771.phpt | 16 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 2 |
4 files changed, 21 insertions, 2 deletions
@@ -17,6 +17,9 @@ PHP NEWS - Session: . Fixed bug #80774 (session_name() problem with backslash). (cmb) +- Standard: + . Fixed bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI). (cmb) + 04 Mar 2021, php 7.4.16 - Core: diff --git a/ext/standard/info.c b/ext/standard/info.c index 1e58b31a0f..8e21d77f13 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -1000,7 +1000,7 @@ PHPAPI ZEND_COLD void php_print_info(int flag) } - if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) { + if (flag & PHP_INFO_CREDITS) { php_info_print_hr(); php_print_credits(PHP_CREDITS_ALL & ~PHP_CREDITS_FULLPAGE); } diff --git a/ext/standard/tests/general_functions/bug80771.phpt b/ext/standard/tests/general_functions/bug80771.phpt new file mode 100644 index 0000000000..a8c9e7b542 --- /dev/null +++ b/ext/standard/tests/general_functions/bug80771.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI) +--FILE-- +<?php +ob_start(); +phpinfo(INFO_CREDITS); +$info = ob_get_clean(); + +ob_start(); +phpcredits(); +$credits = ob_get_clean(); + +var_dump(strpos($info, $credits) !== false); +?> +--EXPECT-- +bool(true) diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 91f400aca4..0fd167de63 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -642,7 +642,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ goto err; } request_started = 1; - php_print_info(0xFFFFFFFF); + php_print_info(PHP_INFO_ALL & ~PHP_INFO_CREDITS); php_output_end_all(); exit_status = (c == '?' && argc > 1 && !strchr(argv[1], c)); goto out; |