Context Navigation

Changeset 2149

Timestamp:

02/22/2008 07:45:01 PM (11 months ago)

Author:

Shadowhand

Message:

Merging r2146 and r2148 into releases/2.1.2

Location:

releases/2.1.2/system

Files:

r1968	r2149
13	13	define('KOHANA_VERSION', '2.1.1');
14	14	define('KOHANA_CODENAME', 'Schneefeier');
	15
	16	// Test of Kohana is running in Windows
	17	define('KOHANA_IS_WIN', PHP_SHLIB_SUFFIX === 'dll');
15	18
16	19	// Kohana benchmarks are prefixed by a random string to prevent collisions

r1911	r2149
81	81	if (self::$rand === NULL)
82	82	{
83		if (~~defined('MCRYPT_DEV_URANDOM')~~)
	83	if (KOHANA_IS_WIN)
84	84	{
85		// Use /dev/urandom
86		self::$rand = MCRYPT_DEV_URANDOM;
87		}
88		elseif (defined('MCRYPT_DEV_RANDOM'))
89		{
90		// Use /dev/random
91		self::$rand = MCRYPT_DEV_RANDOM;
	85	// Windows only supports the system random number generator
	86	self::$rand = MCRYPT_RAND;
92	87	}
93	88	else
94	89	{
95		// Use the system random number generator
96		self::$rand = MCRYPT_RAND;
	90	if (defined('MCRYPT_DEV_URANDOM'))
	91	{
	92	// Use /dev/urandom
	93	self::$rand = MCRYPT_DEV_URANDOM;
	94	}
	95	elseif (defined('MCRYPT_DEV_RANDOM'))
	96	{
	97	// Use /dev/random
	98	self::$rand = MCRYPT_DEV_RANDOM;
	99	}
	100	else
	101	{
	102	// Use the system random number generator
	103	self::$rand = MCRYPT_RAND;
	104	}
97	105	}
98	106	}