cvs: php-src /ext/standard microtime.c
| From: | Arnaud Le Blanc | Date: | Thu, 21 May 2009 14:21:19 +0000 |
| Subject: | cvs: php-src /ext/standard microtime.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58099@lists.php.net to get a copy of this message | ||
lbarnaud Thu May 21 14:21:19 2009 UTC
Modified files:
/php-src/ext/standard microtime.c
Log:
set second argument of gettimeofday() to NULL (fixes #48346,
patch by adriano at guiadohardware dot net)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/microtime.c?r1=1.64&r2=1.65&diff_format=u
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.64 php-src/ext/standard/microtime.c:1.65
--- php-src/ext/standard/microtime.c:1.64 Tue Mar 10 23:39:40 2009
+++ php-src/ext/standard/microtime.c Thu May 21 14:21:18 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: microtime.c,v 1.64 2009/03/10 23:39:40 helly Exp $ */
+/* $Id: microtime.c,v 1.65 2009/05/21 14:21:18 lbarnaud Exp $ */
#include "php.h"
@@ -54,13 +54,12 @@
{
zend_bool get_as_float = 0;
struct timeval tp = {0};
- struct timezone tz = {0};
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &get_as_float) ==
FAILURE) {
return;
}
- if (gettimeofday(&tp, &tz)) {
+ if (gettimeofday(&tp, NULL)) {
RETURN_FALSE;
}