summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-05-07 00:55:05 +0200
committerFerenc Kovacs <tyrael@php.net>2014-05-07 00:55:05 +0200
commit8e2d396b52de88f299882b872a3603a4c37644a5 (patch)
tree7c796ae34efbdec141579517140ea3426f7b40db
parent579898e3382ae975ab1cc03738676e4e6582bf89 (diff)
parent8517001b259f1e8e540ee45cf15cf0312ca14098 (diff)
downloadphp-git-8e2d396b52de88f299882b872a3603a4c37644a5.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed test (it requires ext/hash)
-rw-r--r--ext/session/tests/031.phpt1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/session/tests/031.phpt b/ext/session/tests/031.phpt
index e8deb3dac5..7486c4b866 100644
--- a/ext/session/tests/031.phpt
+++ b/ext/session/tests/031.phpt
@@ -2,6 +2,7 @@
setting hash_function to sha512 and hash_bits_per_character > 4 should not crash
--SKIPIF--
<?php include('skipif.inc'); ?>
+<?php if (!extension_loaded('hash')) die('skip hash extension not available'); ?>
--INI--
session.use_cookies=0
session.cache_limiter=