diff --git a/ChangeLog b/ChangeLog index 52b25e871..06586899a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - [interface] sanitize the after_field parameter, thanks to Norman Hippert - [structure] do not remove the BINARY attribute in drop-down +- bug #1955386 [session] Overriding session.hash_bits_per_character 2.11.6.0 (2008-04-29) - bug #1903724 [interface] Displaying of very large queries in error message diff --git a/libraries/session.inc.php b/libraries/session.inc.php index e6b2d1073..c1b30197a 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -50,10 +50,8 @@ ini_set('session.bug_compat_42', false); ini_set('session.bug_compat_warn', true); // use more secure session ids (with PHP 5) -if (version_compare(PHP_VERSION, '5.0.0', 'ge') - && substr(PHP_OS, 0, 3) != 'WIN') { +if (version_compare(PHP_VERSION, '5.0.0', 'ge')) { ini_set('session.hash_function', 1); - ini_set('session.hash_bits_per_character', 6); } // some pages (e.g. stylesheet) may be cached on clients, but not in shared