cvs: php-src /ext/standard uniqid.c
| From: | Ilia Alshanetsky | Date: | Wed, 19 Oct 2005 13:41:37 +0000 |
| Subject: | cvs: php-src /ext/standard uniqid.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34681@lists.php.net to get a copy of this message | ||
iliaa Wed Oct 19 09:41:37 2005 EDT
Modified files:
/php-src/ext/standard uniqid.c
Log:
Change E_ERROR to E_WARNING when more_entropy flag is off on Cygwin.
http://cvs.php.net/diff.php/php-src/ext/standard/uniqid.c?r1=1.42&r2=1.43&ty=u
Index: php-src/ext/standard/uniqid.c
diff -u php-src/ext/standard/uniqid.c:1.42 php-src/ext/standard/uniqid.c:1.43
--- php-src/ext/standard/uniqid.c:1.42 Tue Aug 23 08:53:30 2005
+++ php-src/ext/standard/uniqid.c Wed Oct 19 09:41:36 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: uniqid.c,v 1.42 2005/08/23 12:53:30 dmitry Exp $ */
+/* $Id: uniqid.c,v 1.43 2005/10/19 13:41:36 iliaa Exp $ */
#include "php.h"
@@ -61,8 +61,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