MFH: - Fixed bug #26949 (rand(min,max) always returns min when ZTS enabled)

diff --git a/NEWS b/NEWS
index 5e3d00fffaed7e8bb290dc1ffdcb8789eda54d55..e4ca2e81371baa147b4c05fc2a32d075651e1520 100644 (file)
--- 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 e72f3ed02d542eccee290563c2d84a976c0fb3c1..1dda03887225bf4e1c18257f3271db65c3a406e1 100644 (file)
--- 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