From 4808d9689a8791a25554b09f8e68726216a52b78 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Wed, 10 Feb 2016 12:57:48 +0000
Subject: be more precise about the meaning of -n

---
 sapi/cli/php_cli.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sapi/cli/php_cli.c')

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index a387059e27..907f629c01 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -517,7 +517,7 @@ static void php_cli_usage(char *argv0)
 				"  -a               Run interactively\n"
 #endif
 				"  -c <path>|<file> Look for php.ini file in this directory\n"
-				"  -n               No php.ini file will be used\n"
+				"  -n               No configuration (ini) files will be used\n"
 				"  -d foo[=bar]     Define INI entry foo with value 'bar'\n"
 				"  -e               Generate extended information for debugger/profiler\n"
 				"  -f <file>        Parse and execute <file>.\n"
-- 
cgit v1.2.1


From fa6ce55675c75140339393a0dec7cf5763b950db Mon Sep 17 00:00:00 2001
From: Matt Ficken <mattficken@php.net>
Date: Mon, 21 Mar 2016 21:09:32 -0700
Subject: bug #71478 implementing feature request

---
 sapi/cli/php_cli.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'sapi/cli/php_cli.c')

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 5d789d2626..6683f21393 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -689,6 +689,14 @@ static int do_cli(int argc, char **argv) /* {{{ */
 #else
 					"NTS "
 #endif
+#ifdef COMPILER
+					COMPILER
+					" "
+#endif
+#ifdef ARCHITECTURE
+					ARCHITECTURE
+					" "
+#endif
 #if ZEND_DEBUG
 					"DEBUG "
 #endif
-- 
cgit v1.2.1