fix my previous patch

This commit is contained in:
Antony Dovgal 2006-08-14 21:08:02 +00:00
parent 2701f53af6
commit 9889c1bfe5

View File

@ -1360,7 +1360,7 @@ TEST $file
return 'BORKED';
}
save_text($tmp_post, $request);
$cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
$cmd = "$php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
} elseif (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) {
$post = trim($section_text['POST']);
@ -1371,7 +1371,7 @@ TEST $file
$env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
$env['CONTENT_LENGTH'] = $content_length;
$cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
$cmd = "$php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
} else {
@ -1379,11 +1379,13 @@ TEST $file
$env['CONTENT_TYPE'] = '';
$env['CONTENT_LENGTH'] = '';
$cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f \"$test_file\" $args 2>&1";
$cmd = "$php$pass_options$ini_settings -f \"$test_file\" $args 2>&1";
}
if ($leak_check) {
$cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck --trace-children=yes --log-file-exactly=$memcheck_filename $cmd";
} else {
$cmd = "USE_ZEND_ALLOC=1 ".$cmd;
}
if ($DETAILED) echo "