- Prefix the first version line with 'PHP' so it's easier to use shell tools to

  parse the version number (both CLI and CGI).

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 6cc052eb68066ce458a8fa4a2fddd8dc96f036c2..46b967ba559ede06198cb0defcaa6969da55de8d 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -874,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%s", PHP_VERSION, sapi_module.name, get_zend_version());
+                                               php_printf("PHP %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 cfdc72949325781360d5945e482459b9822217a7..6f496d23b2e2933cc53d8e7ae05265a570504378 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -522,7 +522,7 @@ int main(int argc, char *argv[])
                                        SG(headers_sent) = 1;
                                        SG(request_info).no_headers = 1;
                                }
-                               php_printf("%s (%s)\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
+                               php_printf("PHP %s (%s)\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
                                php_end_ob_buffers(1 TSRMLS_CC);
                                exit(1);
                                break;