php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 22:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

get rid of that usleep() and add some entropy using the combined lcg

Browse Source
This commit is contained in:
Sascha Schumann
1999-08-21 17:22:08 +00:00
parent 6313238c63
commit c9bb8db0ad
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/standard/uniqid.c
View File

@@ -35,6 +35,7 @@
#include <sys/time.h>
#endif
#include "../lcg/php_lcg.h"
#include "uniqid.h"
/* {{{ proto string uniqid(string prefix)
@@ -43,7 +44,7 @@ PHP_FUNCTION(uniqid)
{
#ifdef HAVE_GETTIMEOFDAY
pval *prefix;
char uniqid[128];
char uniqid[138];
int sec, usec;
struct timeval tv;
@@ -57,10 +58,6 @@ PHP_FUNCTION(uniqid)
php_error(E_WARNING, "The prefix to uniqid should not be more than 114 characters.");
return;
}
/* dont need this on windows so lets not do it*/
#if HAVE_USLEEP && !(WIN32|WINNT)
usleep(1);
#endif
gettimeofday((struct timeval *) &tv, (struct timezone *) NULL);
sec = (int) tv.tv_sec;
usec = (int) (tv.tv_usec % 1000000);
@@ -68,7 +65,7 @@ PHP_FUNCTION(uniqid)
/* The max value usec can have is 0xF423F, so we use only five hex
* digits for usecs:
*/
sprintf(uniqid, "%s%08x%05x", prefix->value.str.val, sec, usec);
sprintf(uniqid, "%s%08x%05x%.8f", prefix->value.str.val, sec, usec, php_combined_lcg() * 10);
RETURN_STRING(uniqid,1);
#endif