derick Fri May 30 13:03:10 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4 NEWS
/php4/sapi/cli php_cli.c
/php4/sapi/cgi cgi_main.c
Log:
- Added a "DEBUG" qualifier to 'php -v's version output, and made the CGI
version statement look the same as the CLI version. (Derick)
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.224 php4/NEWS:1.1247.2.225
--- php4/NEWS:1.1247.2.224 Fri May 30 10:46:19 2003
+++ php4/NEWS Fri May 30 13:03:09 2003
@@ -6,6 +6,8 @@
- Added new command line parameters -B, -F, -R and -E which allow to process
stdin line by line (See 'php -h' or 'man php' for more). (Marcus)
- Added DBA handler 'inifile' to support ini files. (Marcus)
+- Added a "DEBUG" qualifier to 'php -v's version output, and made the CGI
+ version statement look the same as the CLI version. (Derick)
- Fixed bug #23898 (Proper handling of NULLs in odbc_result, odbc_fetch_into
and odbc_result_all). (Ilia)
- Fixed bug #23897 (Fixed a check for mbfilter_ru.h). ([EMAIL PROTECTED], Ilia)
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.51.2.21 php4/sapi/cli/php_cli.c:1.51.2.22
--- php4/sapi/cli/php_cli.c:1.51.2.21 Thu May 29 19:57:27 2003
+++ php4/sapi/cli/php_cli.c Fri May 30 13:03:10 2003
@@ -655,8 +655,12 @@
case 'v': /* show php version & quit */
if (php_request_startup(TSRMLS_C)==FAILURE) {
goto err;
- }
+ }
+#if ZEND_DEBUG
+ php_printf("PHP %s (%s) (built: %s %s)
(DEBUG)\nCopyright (c) 1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
__DATE__, __TIME__, get_zend_version());
+#else
php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c)
1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
get_zend_version());
+#endif
php_end_ob_buffers(1 TSRMLS_CC);
exit_status=1;
goto out;
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.190.2.33 php4/sapi/cgi/cgi_main.c:1.190.2.34
--- php4/sapi/cgi/cgi_main.c:1.190.2.33 Thu May 29 11:41:52 2003
+++ php4/sapi/cgi/cgi_main.c Fri May 30 13:03:10 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.190.2.33 2003/05/29 15:41:52 helly Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.34 2003/05/30 17:03:10 derick Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1367,7 +1367,11 @@
SG(headers_sent) = 1;
SG(request_info).no_headers =
1;
}
- php_printf("PHP %s (%s), Copyright (c)
1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
+#if ZEND_DEBUG
+ php_printf("PHP %s (%s) (built: %s %s)
(DEBUG)\nCopyright (c) 1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
__DATE__, __TIME__, get_zend_version());
+#else
+ php_printf("PHP %s (%s) (built: %s
%s)\nCopyright (c) 1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name,
__DATE__, __TIME__, get_zend_version());
+#endif
php_end_ob_buffers(1 TSRMLS_CC);
exit(1);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
