Merge branch 'PHP-7.1'

diff --cc run-tests.php
index 6e9d3be1b2f0feef31f370b6c9d21d4925eb4301,40162881c56ef9d9aa3947c0d91825105821cfde..4e2ac37e3e2382acbad2a2ed326c3122972215aa
--- 1/run-tests.php
--- 2/run-tests.php
+++ b/run-tests.php
@@@ -1609,11 -1590,16 +1609,16 @@@ TEST $fil
                                        $info = " (warn: $m[1])";
                                }
                        }
+ 
+                       if (!strncasecmp('xfail', ltrim($output), 5)) {
+                               // Pretend we have an XFAIL section
+                               $section_text['XFAIL'] = trim(substr(ltrim($output), 5));
+                       }
                }
        }
 -      
 +
        if (!extension_loaded("zlib")
 -      && (    array_key_exists("GZIP_POST", $section_text) 
 +      && (    array_key_exists("GZIP_POST", $section_text)
                ||      array_key_exists("DEFLATE_POST", $section_text))
        ) {
                $message = "ext/zlib required";