[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
| From: | Weilin Du | Date: | Thu, 19 Nov 2026 17:59:24 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-143927@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-11-20T01:55:42+08:00
Commit: https://github.com/php/php-src/commit/1fb6b8849286be9f76a95c0d218a5101113558c0
Raw diff: https://github.com/php/php-src/commit/1fb6b8849286be9f76a95c0d218a5101113558c0.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Document --ini=diff in the php(1) man page (#25572)
Changed paths:
M sapi/cli/php.1.in
Diff:
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 30626015ce77..619bd3a2a0b5 100644
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@@ -365,6 +365,9 @@ Shows configuration for extension
.TP
.B \-\-ini
Show configuration file names
+.TP
+.B \-\-ini=diff
+Show INI entries that differ from the built-in default
.SH FILES
.TP 15
.B php\-cli.ini