fix bug #62396 'make test' crashes starting with 5.3.14

(missing gzencode())

diff --git a/NEWS b/NEWS
index 9bb60327fa9dd2cff9f3c1bac5e22a5b75b37fe4..b889e66271b14cf48a6fdfb1453b06720e3d7882 100644 (file)
--- 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 935f821f4e68330cc5a34c71d46f35f577fb2695..317f6077a3dc9a047736e9ebef0c3bc27795d1a1 100755 (executable)
--- 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();