From 633a7470d16d5d63ebf59fefd77f986c8aef94b4 Mon Sep 17 00:00:00 2001 From: foobar Date: Mon, 19 Jan 2004 02:31:19 +0000 Subject: [PATCH] MFH: - Fixed bug #26949 (rand(min,max) always returns min when ZTS enabled) --- NEWS | 1 + ext/standard/php_rand.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5e3d00fffa..e4ca2e8137 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jan 2004, Version 4.3.5 +- Fixed bug #26949 (rand(min,max) always returns min when ZTS enabled). (Jani) - Fixed bug #26937 (Warning in xml.c). (Jani) - Fixed Bug #26927 (preg_quote() does not escape \0). (Ilia) - Fixed bug #26923 (ext/imap: pam and crypt libraries missing when build as diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h index e72f3ed02d..1dda038872 100644 --- a/ext/standard/php_rand.h +++ b/ext/standard/php_rand.h @@ -33,7 +33,8 @@ #define RAND_MAX (1<<15) #endif -#if defined(HAVE_LRAND48) || defined(HAVE_RANDOM) +/* In ZTS mode we rely on rand_r() so we must use RAND_MAX. */ +#if !defined(ZTS) && (defined(HAVE_LRAND48) || defined(HAVE_RANDOM)) #define PHP_RAND_MAX 2147483647 #else #define PHP_RAND_MAX RAND_MAX -- 2.50.1