johannes Thu Oct 6 16:36:46 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.1760.2.490&r2=1.1760.2.491&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.490 php-src/NEWS:1.1760.2.491
--- php-src/NEWS:1.1760.2.490 Tue Oct 4 16:49:33 2005
+++ php-src/NEWS Thu Oct 6 16:36:42 2005
@@ -7,6 +7,7 @@
- Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
- Fixed bug #34617 (zend_deactivate: objects_store used after
zend_objects_store_destroy is called). (Dmitry)
+- Fixed bug #34557 (php -m exits with "error" 1). (Johannes)
- Fixed bug #34505 (Possible memory corruption when unmangling properties
with empty names). (Tony)
- Fixed bug #34478 (Incorrect parsing of url's fragment (#...)). (Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.256.2.6&r2=1.256.2.7&ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.256.2.6
php-src/sapi/cgi/cgi_main.c:1.256.2.7
--- php-src/sapi/cgi/cgi_main.c:1.256.2.6 Thu Apr 28 10:24:21 2005
+++ php-src/sapi/cgi/cgi_main.c Thu Oct 6 16:36:44 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.256.2.6 2005/04/28 14:24:21 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.256.2.7 2005/10/06 20:36:44 johannes Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1374,7 +1374,7 @@
}
php_print_info(0xFFFFFFFF
TSRMLS_CC);
php_end_ob_buffers(1 TSRMLS_CC);
- exit(1);
+ exit(0);
break;
case 'l': /* syntax check mode */
@@ -1392,7 +1392,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 ... */
@@ -1425,7 +1425,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.113.2.2&r2=1.113.2.3&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.113.2.2
php-src/sapi/cli/php_cli.c:1.113.2.3
--- php-src/sapi/cli/php_cli.c:1.113.2.2 Tue Mar 22 10:09:20 2005
+++ php-src/sapi/cli/php_cli.c Thu Oct 6 16:36:45 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.113.2.2 2005/03/22 15:09:20 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.113.2.3 2005/10/06 20:36:45 johannes Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -665,8 +665,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 */
@@ -675,7 +676,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 */
@@ -687,8 +688,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) {
@@ -700,7 +702,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
