summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2013-08-09 18:05:07 +0900
committerYasuo Ohgaki <yohgaki@php.net>2013-08-09 18:05:24 +0900
commitb6b425d2cf767e47e9d05fbfe1328f1485a488ef (patch)
tree522a38c7c1ed7ce296734951278fb97065598111
parentc53b425763d4cdbc9dc5708e22c6517dfd5e1e09 (diff)
downloadphp-git-b6b425d2cf767e47e9d05fbfe1328f1485a488ef.tar.gz
Fixed Bug #65315 session.hash_function silently fallback to default md5
-rw-r--r--NEWS4
-rw-r--r--ext/session/session.c1
-rw-r--r--ext/session/tests/session_hash_function_basic.phpt50
3 files changed, 55 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index c679b90a65..02fa05ede8 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ PHP NEWS
. Implemented internal operator overloading
(RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
+- Session:
+ . Fixed Bug #65315 (session.hash_function silently fallback to default md5)
+ (Yasuo)
+
- mysqlnd:
. Disabled flag for SP OUT variables for 5.5+ servers as they are not natively
supported by the overlying APIs. (Andrey)
diff --git a/ext/session/session.c b/ext/session/session.c
index c02a10d7bf..aee3308568 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -727,6 +727,7 @@ static PHP_INI_MH(OnUpdateHashFunc) /* {{{ */
}
#endif /* HAVE_HASH_EXT }}} */
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "session.configuration 'session.hash_function' must be existing hash function. %s does not exist.", new_value);
return FAILURE;
}
/* }}} */
diff --git a/ext/session/tests/session_hash_function_basic.phpt b/ext/session/tests/session_hash_function_basic.phpt
new file mode 100644
index 0000000000..8b14a88337
--- /dev/null
+++ b/ext/session/tests/session_hash_function_basic.phpt
@@ -0,0 +1,50 @@
+--TEST--
+Test session.hash_function ini setting : basic functionality
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+
+ob_start();
+
+echo "*** Testing session.hash_function : basic functionality ***\n";
+
+var_dump(ini_set('session.hash_function', 'md5'));
+var_dump(session_start());
+var_dump(!empty(session_id()), session_id());
+var_dump(session_destroy());
+
+var_dump(ini_set('session.hash_function', 'sha1'));
+var_dump(session_start());
+var_dump(!empty(session_id()), session_id());
+var_dump(session_destroy());
+
+var_dump(ini_set('session.hash_function', 'none')); // Should fail
+var_dump(session_start());
+var_dump(!empty(session_id()), session_id());
+var_dump(session_destroy());
+
+
+echo "Done";
+ob_end_flush();
+?>
+--EXPECTF--
+*** Testing session.hash_function : basic functionality ***
+string(1) "0"
+bool(true)
+bool(true)
+string(32) "%s"
+bool(true)
+string(3) "md5"
+bool(true)
+bool(true)
+string(40) "%s"
+bool(true)
+
+Warning: ini_set(): session.hash_func must be existing hash function. none does not exist. in %s/session_hash_function_basic.php on line 17
+bool(false)
+bool(true)
+bool(true)
+string(40) "%s"
+bool(true)
+Done