From: foobar <sniper@php.net>
Date: Mon, 19 Jan 2004 03:16:04 +0000 (+0000)
Subject: MFH: Moved php_srand() call into php_rand().
X-Git-Tag: php-4.3.5RC2~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f22177b7e41b1ef8570057225ccea07409742321;p=php

MFH: Moved php_srand() call into php_rand().
---

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index b69bfa243b..328a62da61 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -119,10 +119,6 @@ PHP_FUNCTION(crypt)
 	char *str, *salt_in = NULL;
 	int str_len, salt_in_len;
 
-	if (!BG(rand_is_seeded)) {
-		php_srand(GENERATE_SEED() TSRMLS_CC);
-	} 
-
 	salt[0]=salt[PHP_MAX_SALT_LEN]='\0';
 	/* This will produce suitable results if people depend on DES-encryption
 	   available (passing always 2-character salt). At least for glibc6.1 */
diff --git a/ext/standard/rand.c b/ext/standard/rand.c
index 08e6b52adc..686d64d263 100644
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@ -72,6 +72,10 @@ PHPAPI long php_rand(TSRMLS_D)
 {
 	long ret;
 
+	if (!BG(rand_is_seeded)) {
+		php_srand(GENERATE_SEED() TSRMLS_CC);
+	}
+
 #ifdef ZTS
 	ret = php_rand_r(&BG(rand_seed));
 #else
@@ -330,10 +334,6 @@ PHP_FUNCTION(rand)
 	if (argc != 0 && zend_parse_parameters(argc TSRMLS_CC, "ll", &min, &max) == FAILURE)
 		return;
 
-	if (!BG(rand_is_seeded)) {
-		php_srand(GENERATE_SEED() TSRMLS_CC);
-	}
-
 	number = php_rand(TSRMLS_C);
 	if (argc == 2) {
 		RAND_RANGE(number, min, max, PHP_RAND_MAX);