Add NTS/ZTS information to php -v

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 94d5b84f671a76f13a1ae6031c087ce94225f511..b4288b87a2db640414522d769040bf6154720f34 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -682,17 +682,20 @@ static int do_cli(int argc, char **argv) /* {{{ */
                                goto out;
 
                        case 'v': /* show php version & quit */
-                               php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2015 The PHP Group\n%s",
+                               php_printf("PHP %s (%s) (built: %s %s) ( %s)\nCopyright (c) 1997-2015 The PHP Group\n%s",
                                        PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
-#if ZEND_DEBUG && defined(HAVE_GCOV)
-                                       "(DEBUG GCOV)",
-#elif ZEND_DEBUG
-                                       "(DEBUG)",
-#elif defined(HAVE_GCOV)
-                                       "(GCOV)",
+#if ZTS
+                                       "ZTS "
 #else
-                                       "",
+                                       "NTS "
 #endif
+#if ZEND_DEBUG
+                                       "DEBUG "
+#endif
+#ifdef HAVE_GCOV
+                                       "GCOV "
+#endif
+                                       ,
                                        get_zend_version()
                                );
                                sapi_deactivate();