cvs: php-src(PHP_5_0) /ext/standard uniqid.c
| From: | Antony Dovgal | Date: | Wed, 19 Oct 2005 13:47:29 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/standard uniqid.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34684@lists.php.net to get a copy of this message | ||
tony2001 Wed Oct 19 09:47:29 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard uniqid.c
Log:
backport Ilia's last patch to 5.0
http://cvs.php.net/diff.php/php-src/ext/standard/uniqid.c?r1=1.39&r2=1.39.2.1&ty=u
Index: php-src/ext/standard/uniqid.c
diff -u php-src/ext/standard/uniqid.c:1.39 php-src/ext/standard/uniqid.c:1.39.2.1
--- php-src/ext/standard/uniqid.c:1.39 Thu Jan 8 03:17:34 2004
+++ php-src/ext/standard/uniqid.c Wed Oct 19 09:47:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: uniqid.c,v 1.39 2004/01/08 08:17:34 andi Exp $ */
+/* $Id: uniqid.c,v 1.39.2.1 2005/10/19 13:47:25 tony2001 Exp $ */
#include "php.h"
@@ -62,8 +62,8 @@
#if HAVE_USLEEP && !defined(PHP_WIN32)
if (!more_entropy) {
#if defined(__CYGWIN__)
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "You must use 'more entropy' under
CYGWIN.");
- return;
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must use 'more entropy' under
CYGWIN.");
+ RETURN_FALSE;
#else
usleep(1);
#endif