Added the current SAPI to the output of php -v

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 6da5a80574eb9278dc460b40529d728038cf1ab4..d044c95dd143bb9613ab809abf700d11148f0490 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -875,7 +875,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\n", PHP_VERSION);
+                                               php_printf("%s (%s)\n", PHP_VERSION, sapi_module.name);
                                                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 8299ba919c4543b923541a89e35e43275b5159af..55f9f3803125ab9684447437cd6b2c5a9aed3db3 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -523,7 +523,7 @@ int main(int argc, char *argv[])
                                        SG(headers_sent) = 1;
                                        SG(request_info).no_headers = 1;
                                }
-                               php_printf("%s\n", PHP_VERSION);
+                               php_printf("%s (%s)\n", PHP_VERSION, sapi_module.name);
                                php_end_ob_buffers(1 TSRMLS_CC);
                                exit(1);
                                break;