Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix memleak in CLI

Conflicts:
	sapi/cli/php_cli.c
This commit is contained in:
Johannes Schlüter 2012-06-27 11:46:57 +02:00
commit 9a86784859

View File

@ -1173,6 +1173,9 @@ out:
if (request_started) {
php_request_shutdown((void *) 0);
}
if (translated_path) {
free(translated_path);
}
return exit_status;
err:
sapi_deactivate(TSRMLS_C);