summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2013-10-01 17:01:03 +0200
committerMichael Wallner <mike@php.net>2013-10-01 17:01:03 +0200
commitcd1cab3f4726751a0476ac8701ce09cc37cb36df (patch)
tree633f929fb2058adfa482ceeae3e02a3e4872214a
parent18b04b480ebc41841b2004cc11797eda40fb3958 (diff)
downloadphp-git-cd1cab3f4726751a0476ac8701ce09cc37cb36df.tar.gz
fix bug #62396 'make test' crashes starting with 5.3.14
(missing gzencode())
-rw-r--r--NEWS5
-rwxr-xr-xrun-tests.php12
2 files changed, 16 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9bb60327fa..b889e66271 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,11 @@ PHP NEWS
. Fixed bug #61548 (content-type must appear at the end of headers for 201
Location to work in http). (Mike)
+- Build system:
+ . Fixed bug #62396 ('make test' crashes starting with 5.3.14 (missing
+ gzencode())). (Mike)
+
+
19 Sep 2013, PHP 5.4.20
- Core:
diff --git a/run-tests.php b/run-tests.php
index 935f821f4e..317f6077a3 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -455,7 +455,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';
}
@@ -1545,6 +1545,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();