summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorMark A. Hershberger <mah@debian.(none)>2009-03-25 00:37:48 -0400
committerMark A. Hershberger <mah@debian.(none)>2009-03-25 00:37:48 -0400
commiteddbbea4325e602ddc87c545531609132d4f0e3b (patch)
treef0994206a7e0a6251be7cc6729ba480f0c8729c2 /run-tests.php
parent2d4e5b09576bb4f0ba716cc82cdf29ea04d9184b (diff)
downloadphp-eddbbea4325e602ddc87c545531609132d4f0e3b.tar.gz
Imported Upstream version 5.2.3upstream/5.2.3
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php19
1 files changed, 14 insertions, 5 deletions
diff --git a/run-tests.php b/run-tests.php
index e54700054..a8fccdc49 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.27 2007/05/02 15:41:06 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.29 2007/05/27 19:23:09 tony2001 Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is available.
* In the event it is not, print a nice error message indicating that this script will
@@ -115,7 +115,7 @@ if (getenv('TEST_PHP_EXECUTABLE')) {
if (getenv('TEST_PHP_CGI_EXECUTABLE')) {
$php_cgi = getenv('TEST_PHP_CGI_EXECUTABLE');
if ($php_cgi=='auto') {
- $php_cgi = $cwd.'/sapi/cgi/php';
+ $php_cgi = $cwd.'/sapi/cgi/php-cgi';
putenv("TEST_PHP_CGI_EXECUTABLE=$php_cgi");
}
$environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
@@ -398,7 +398,7 @@ if (isset($argc) && $argc > 1) {
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.27 $'."\n";
+ echo '$Revision: 1.226.2.37.2.29 $'."\n";
exit(1);
default:
echo "Illegal switch '$switch' specified!\n";
@@ -1051,9 +1051,9 @@ TEST $file
} elseif (!strncasecmp(PHP_OS, "win", 3) && file_exists(dirname($php) ."/php-cgi.exe")) {
$old_php = $php;
$php = realpath(dirname($php) ."/php-cgi.exe") .' -C ';
- } elseif (file_exists("./sapi/cgi/php")) {
+ } elseif (file_exists("./sapi/cgi/php-cgi")) {
$old_php = $php;
- $php = realpath("./sapi/cgi/php") . ' -C ';
+ $php = realpath("./sapi/cgi/php-cgi") . ' -C ';
} else {
show_result("SKIP", $tested, $tested_file, "reason: CGI not available");
return 'SKIPPED';
@@ -1328,6 +1328,15 @@ TEST $file
} elseif (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) {
$post = trim($section_text['POST']);
+
+ if (array_key_exists('GZIP_POST', $section_text) && function_exists('gzencode')) {
+ $post = gzencode($post, 9, FORCE_GZIP);
+ $env['HTTP_CONTENT_ENCODING'] = 'gzip';
+ } else if (array_key_exists('DEFLATE_POST', $section_text) && function_exists('gzcompress')) {
+ $post = gzcompress($post, 9);
+ $env['HTTP_CONTENT_ENCODING'] = 'deflate';
+ }
+
save_text($tmp_post, $post);
$content_length = strlen($post);