cvs: php-src(PHP_5_2) /ext/standard microtime.c
| From: | Arnaud Le Blanc | Date: | Thu, 21 May 2009 14:21:53 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/standard microtime.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58101@lists.php.net to get a copy of this message | ||
lbarnaud Thu May 21 14:21:53 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard microtime.c
Log:
MFH: 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.53.2.2.2.5&r2=1.53.2.2.2.6&diff_format=u
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.53.2.2.2.5 php-src/ext/standard/microtime.c:1.53.2.2.2.6
--- php-src/ext/standard/microtime.c:1.53.2.2.2.5 Wed Dec 31 11:17:45 2008
+++ php-src/ext/standard/microtime.c Thu May 21 14:21:53 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: microtime.c,v 1.53.2.2.2.5 2008/12/31 11:17:45 sebastian Exp $ */
+/* $Id: microtime.c,v 1.53.2.2.2.6 2009/05/21 14:21:53 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;
}