cvs: php4 /sapi/cgi cgi_main.c /sapi/cli php_cli.c

mfischer Fri May 10 12:04:05 2002 EDT Modified files: /php4/sapi/cgi cgi_main.c /php4/sapi/cli php_cli.c Log: - This affects both CGI and CLI sapi: Remove Zend version output from -m switch and move it over to the output of the -v switch (-v is supposed to list version numbers, not -m). Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.166 php4/sapi/cgi/cgi_main.c:1.167 --- php4/sapi/cgi/cgi_main.c:1.166 Thu May 9 19:33:27 2002 +++ php4/sapi/cgi/cgi_main.c Fri May 10 12:04:02 2002 @@ -841,7 +841,6 @@ php_output_startup(); php_output_activate(TSRMLS_C); SG(headers_sent) = 1; - php_printf("Running PHP %s\n%s\n", PHP_VERSION , get_zend_version()); php_printf("[PHP Modules]\n"); zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) _print_module_info, NULL TSRMLS_CC); php_printf("\n[Zend Modules]\n"); @@ -875,7 +874,7 @@ SG(headers_sent) = 1; SG(request_info).no_headers = 1; } - php_printf("%s (%s)\n", PHP_VERSION, sapi_module.name); + php_printf("%s (%s)\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); php_end_ob_buffers(1 TSRMLS_CC); exit(1); break; Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.21 php4/sapi/cli/php_cli.c:1.22 --- php4/sapi/cli/php_cli.c:1.21 Thu May 9 05:36:45 2002 +++ php4/sapi/cli/php_cli.c Fri May 10 12:04:03 2002 @@ -472,7 +472,6 @@ php_output_startup(); php_output_activate(TSRMLS_C); SG(headers_sent) = 1; - php_printf("Running PHP %s\n%s\n", PHP_VERSION , get_zend_version()); php_printf("[PHP Modules]\n"); zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) _print_module_info, NULL TSRMLS_CC); php_printf("\n[Zend Modules]\n"); @@ -523,7 +522,7 @@ SG(headers_sent) = 1; SG(request_info).no_headers = 1; } - php_printf("%s (%s)\n", PHP_VERSION, sapi_module.name); + php_printf("%s (%s)\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); php_end_ob_buffers(1 TSRMLS_CC); exit(1); break;