johannes Thu Oct 6 16:29:14 2005 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
Log:
- Fix #34557 php -m exits with "error" 1
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.267&r2=1.268&ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267 php-src/sapi/cgi/cgi_main.c:1.268
--- php-src/sapi/cgi/cgi_main.c:1.267 Wed Aug 3 07:12:17 2005
+++ php-src/sapi/cgi/cgi_main.c Thu Oct 6 16:29:09 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267 2005/08/03 11:12:17 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.268 2005/10/06 20:29:09 johannes Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1366,7 +1366,7 @@
}
php_print_info(0xFFFFFFFF
TSRMLS_CC);
php_end_ob_buffers(1 TSRMLS_CC);
- exit(1);
+ exit(0);
break;
case 'l': /* syntax check mode */
@@ -1384,7 +1384,7 @@
print_extensions(TSRMLS_C);
php_printf("\n");
php_end_ob_buffers(1 TSRMLS_CC);
- exit(1);
+ exit(0);
break;
#if 0 /* not yet operational, see also below ... */
@@ -1417,7 +1417,7 @@
php_printf("PHP %s (%s) (built:
%s %s)\nCopyright (c) 1997-2005 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);
+ exit(0);
break;
case 'w':
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.130&r2=1.131&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.130 php-src/sapi/cli/php_cli.c:1.131
--- php-src/sapi/cli/php_cli.c:1.130 Mon Oct 3 07:54:46 2005
+++ php-src/sapi/cli/php_cli.c Thu Oct 6 16:29:13 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.130 2005/10/03 11:54:46 johannes Exp $ */
+/* $Id: php_cli.c,v 1.131 2005/10/06 20:29:13 johannes Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -704,8 +704,9 @@
php_output_activate(TSRMLS_C);
php_cli_usage(argv[0]);
php_end_ob_buffers(1 TSRMLS_CC);
- exit_status=1;
- goto err;
+ exit_status=0;
+ zend_ini_deactivate(TSRMLS_C);
+ goto out_err;
case 'i': /* php info & quit */
@@ -714,7 +715,7 @@
}
php_print_info(0xFFFFFFFF TSRMLS_CC);
php_end_ob_buffers(1 TSRMLS_CC);
- exit_status=1;
+ exit_status=0;
goto out;
case 'm': /* list compiled in modules */
@@ -726,8 +727,9 @@
print_extensions(TSRMLS_C);
php_printf("\n");
php_end_ob_buffers(1 TSRMLS_CC);
- exit_status=1;
- goto err;
+ exit_status=0;
+ zend_ini_deactivate(TSRMLS_C);
+ goto out_err;
case 'v': /* show php version & quit */
if (php_request_startup(TSRMLS_C)==FAILURE) {
@@ -739,7 +741,7 @@
php_printf("PHP %s (%s) (built: %s
%s)\nCopyright (c) 1997-2005 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;
+ exit_status=0;
goto out;
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
