Imported Upstream version 5.5.5+dfsg

1 files changed, 11 insertions, 1 deletions

diff --git a/run-tests.php b/run-tests.php
index 54a12a177..7eb445eeb 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -459,7 +459,7 @@ $pass_options = '';
 $compression = 0;
 $output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
 
-if ($compression) {
+if ($compression && in_array("compress.zlib", stream_get_filters())) {
 	$output_file = 'compress.zlib://' . $output_file . '.gz';
 }
 
@@ -1547,6 +1547,16 @@ TEST $file
 			}
 		}
 	}
+	
+	if (!extension_loaded("zlib")
+	&& (	array_key_exists("GZIP_POST", $section_text) 
+		||	array_key_exists("DEFLATE_POST", $section_text))
+	) {
+		$message = "ext/zlib required";
+		show_result('SKIP', $tested, $tested_file, "reason: $message", $temp_filenames);
+		junit_mark_test_as('SKIP', $shortname, $tested, null, "<![CDATA[\n$message\n]]>");
+		return 'SKIPPED';
+	}
 
 	if (@count($section_text['REDIRECTTEST']) == 1) {
 		$test_files = array();