- 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).

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index d044c95dd143bb9613ab809abf700d11148f0490..6cc052eb68066ce458a8fa4a2fddd8dc96f036c2 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -841,7 +841,6 @@ consult the installation file that came with this distribution, or visit \n\
                                        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 @@ consult the installation file that came with this distribution, or visit \n\
                                                        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;

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 55f9f3803125ab9684447437cd6b2c5a9aed3db3..cfdc72949325781360d5945e482459b9822217a7 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -472,7 +472,6 @@ int main(int argc, char *argv[])
                                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 @@ int main(int argc, char *argv[])
                                        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;