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

diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h
index 7e705bb12d56543b41dd1ebc30baea303573a722..1638a7ace713086bb409ec0f84b9aba40bd2c2a1 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