svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/cli/php_cli.c branches/PHP_5_4/sapi/cli/php_cli.c trunk/sapi/cli/php_cli.c

iliaa Mon, 30 May 2011 15:57:50 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311600 Log: Fixed bug #52496 (Zero exit code on option parsing failure). Bug: http://bugs.php.net/52496 (Open) Zero exit code on option parsing failure Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c U php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c U php/php-src/trunk/sapi/cli/php_cli.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-05-30 15:55:32 UTC (rev 311599) +++ php/php-src/branches/PHP_5_3/NEWS 2011-05-30 15:57:50 UTC (rev 311600) @@ -54,6 +54,9 @@ . Fixed bug #54529 (SAPI crashes on apache_config.c:197). (hebergement at riastudio dot fr) +- CLI SAPI: + . Fixed bug #52496 (Zero exit code on option parsing failure). (Ilia) + - cURL: . Added CURLINFO_REDIRECT_URL support. (Daniel Stenberg, Pierre) . Added support for CURLOPT_MAX_RECV_SPEED_LARGE and Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-05-30 15:55:32 UTC (rev 311599) +++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-05-30 15:57:50 UTC (rev 311600) @@ -799,7 +799,7 @@ request_started = 1; php_cli_usage(argv[0]); php_end_ob_buffers(1 TSRMLS_CC); - exit_status=0; + exit_status = (c == '?' && argc > 1 && !strchr(argv[1], c)); goto out; case 'i': /* php info & quit */ Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c =================================================================== --- php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-05-30 15:55:32 UTC (rev 311599) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-05-30 15:57:50 UTC (rev 311600) @@ -813,7 +813,7 @@ request_started = 1; php_cli_usage(argv[0]); php_output_end_all(TSRMLS_C); - exit_status=0; + exit_status = (c == '?' && argc > 1 && !strchr(argv[1], c)); goto out; case 'i': /* php info & quit */ Modified: php/php-src/trunk/sapi/cli/php_cli.c =================================================================== --- php/php-src/trunk/sapi/cli/php_cli.c 2011-05-30 15:55:32 UTC (rev 311599) +++ php/php-src/trunk/sapi/cli/php_cli.c 2011-05-30 15:57:50 UTC (rev 311600) @@ -813,7 +813,7 @@ request_started = 1; php_cli_usage(argv[0]); php_output_end_all(TSRMLS_C); - exit_status=0; + exit_status = (c == '?' && argc > 1 && !strchr(argv[1], c)); goto out; case 'i': /* php info & quit */