Merge branch 'PHP-5.6'

* PHP-5.6:
  disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
This commit is contained in:
Anatol Belski 2014-11-28 12:25:08 +01:00
commit 5f65c77e98

View File

@ -6,6 +6,10 @@ if (!extension_loaded("openssl")) die("skip openssl not loaded");
if (!function_exists("proc_open")) die("skip no proc_open");
exec('openssl help', $out, $code);
if ($code > 0) die("skip couldn't locate openssl binary");
if(substr(PHP_OS, 0, 3) == 'WIN') {
die('skip not suitable for Windows');
}
?>
--FILE--
<?php