cvs: php-src /sapi/cli php_cli.c
| From: | Antony Dovgal | Date: | Fri, 24 Nov 2006 11:54:48 +0000 |
| Subject: | cvs: php-src /sapi/cli php_cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41714@lists.php.net to get a copy of this message | ||
tony2001 Fri Nov 24 11:54:48 2006 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
call sapi_deactivate() & friends on error
fixes leak with
php-cli -n -c ..
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.163&r2=1.164&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.163 php-src/sapi/cli/php_cli.c:1.164
--- php-src/sapi/cli/php_cli.c:1.163 Fri Sep 22 17:42:08 2006
+++ php-src/sapi/cli/php_cli.c Fri Nov 24 11:54:48 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.163 2006/09/22 17:42:08 iliaa Exp $ */
+/* $Id: php_cli.c,v 1.164 2006/11/24 11:54:48 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -718,7 +718,7 @@
if (cli_sapi_module.php_ini_path_override && cli_sapi_module.php_ini_ignore) {
PUTS("You cannot use both -n and -c switch. Use -h for help.\n");
exit_status=1;
- goto out_err;
+ goto err;
}
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0)) != -1) {