johannes Thu Oct 6 16:39:29 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
Log:
- MFH: Fix #34557 php -m exits with "error" 1
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.47&r2=1.1247.2.920.2.48&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.47 php-src/NEWS:1.1247.2.920.2.48
--- php-src/NEWS:1.1247.2.920.2.47 Wed Oct 5 10:34:38 2005
+++ php-src/NEWS Thu Oct 6 16:39:24 2005
@@ -13,6 +13,7 @@
- Fixed bug #34645 (ctype corrupts memory when validating large numbers).
(Ilia)
- Fixed bug #34565 (mb_send_mail does not fetch mail.force_extra_parameters).
(Marco, Ilia)
+- Fixed bug #34557 (php -m exits with "error" 1). (Johannes)
- Fixed bug #34456 (Possible crash inside pspell extension). (Nuno)
- Fixed bug #34311 (unserialize() crashes with chars above 191 dec). (Nuno)
- Fixed bug #34307 (on_modify handler not called to set the default value if
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.68&r2=1.190.2.68.2.1&ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.68
php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.1
--- php-src/sapi/cgi/cgi_main.c:1.190.2.68 Thu Apr 28 10:24:47 2005
+++ php-src/sapi/cgi/cgi_main.c Thu Oct 6 16:39:26 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.190.2.68 2005/04/28 14:24:47 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.68.2.1 2005/10/06 20:39:26 johannes Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1395,7 +1395,7 @@
}
php_print_info(0xFFFFFFFF
TSRMLS_CC);
php_end_ob_buffers(1 TSRMLS_CC);
- exit(1);
+ exit(0);
break;
case 'l': /* syntax check mode */
@@ -1413,7 +1413,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 ... */
@@ -1446,7 +1446,7 @@
php_printf("PHP %s (%s) (built:
%s %s)\nCopyright (c) 1997-2004 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.51.2.37&r2=1.51.2.37.2.1&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.51.2.37
php-src/sapi/cli/php_cli.c:1.51.2.37.2.1
--- php-src/sapi/cli/php_cli.c:1.51.2.37 Tue Mar 22 10:09:36 2005
+++ php-src/sapi/cli/php_cli.c Thu Oct 6 16:39:26 2005
@@ -623,8 +623,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 */
@@ -633,7 +634,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 */
@@ -645,8 +646,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) {
@@ -658,7 +660,7 @@
php_printf("PHP %s (%s) (built: %s
%s)\nCopyright (c) 1997-2004 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
