From: Anatol Belski <ab@php.net>
Date: Wed, 22 Mar 2017 10:04:08 +0000 (+0100)
Subject: improve zlib version check for tests
X-Git-Tag: php-7.2.0alpha1~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba64ec0b1331697bd71e70bf20c9a5c3c3c02136;p=php

improve zlib version check for tests
---

diff --git a/ext/zlib/tests/func.inc b/ext/zlib/tests/func.inc
index 0a422cab78..e431afedbf 100644
--- a/ext/zlib/tests/func.inc
+++ b/ext/zlib/tests/func.inc
@@ -8,8 +8,10 @@ function get_zlib_version()
 	phpinfo();
 	$info = ob_get_contents();
 	ob_end_clean();
-	if (preg_match(',zlib.*Compiled Version => (\d+\.\d+\.\d+),s', $info, $match)) {
-		$version = $match[1];
+	//if (preg_match(',zlib.*Compiled Version => (\d+\.\d+\.\d+),s', $info, $match)) {
+	//	$version = $match[1];
+	if (preg_match(',zlib(?!.*libXML).*Compiled Version (=> |</).*(\d+\.\d+\.\d+?),sU', $info, $match)) {
+		$version = $match[2];
 	}
 
 	return $version;