helly Sun Jan 22 22:09:54 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cli php_cli.c
Log:
- MFH Show the exact version
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.11&r2=1.129.2.12&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.11
php-src/sapi/cli/php_cli.c:1.129.2.12
--- php-src/sapi/cli/php_cli.c:1.129.2.11 Sat Jan 14 02:09:37 2006
+++ php-src/sapi/cli/php_cli.c Sun Jan 22 22:09:54 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.129.2.11 2006/01/14 02:09:37 helly Exp $ */
+/* $Id: php_cli.c,v 1.129.2.12 2006/01/22 22:09:54 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -747,14 +747,23 @@
goto out;
case 'v': /* show php version & quit */
- if (php_request_startup(TSRMLS_C)==FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
goto err;
}
-#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s)
(DEBUG)\nCopyright (c) 1997-2006 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
+
+ php_printf("PHP %s (%s) (built: %s %s)
%s\nCopyright (c) 1997-2006 The PHP Group\n%s",
+ PHP_VERSION, sapi_module.name,
__DATE__, __TIME__,
+#if ZEND_DEBUG && defined(HAVE_GCOV)
+ "(DEBUG GCOV)",
+#elif ZEND_DEBUG
+ "(DEBUG)",
+#elif defined(HAVE_GCOV)
+ "(GCOV)",
#else
- php_printf("PHP %s (%s) (built: %s
%s)\nCopyright (c) 1997-2006 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
__DATE__, __TIME__, get_zend_version());
+ "",
#endif
+ get_zend_version()
+ );
php_end_ob_buffers(1 TSRMLS_CC);
exit_status=0;
goto out;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
