jason Thu Jul 24 21:50:09 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sockets sockets.c
Log:
MFH: fix for #24629
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.17
php-src/ext/sockets/sockets.c:1.125.2.18
--- php-src/ext/sockets/sockets.c:1.125.2.17 Thu Jun 5 19:48:17 2003
+++ php-src/ext/sockets/sockets.c Thu Jul 24 21:50:09 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.125.2.17 2003/06/05 23:48:17 iliaa Exp $ */
+/* $Id: sockets.c,v 1.125.2.18 2003/07/25 01:50:09 jason Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -592,8 +592,16 @@
convert_to_long(&tmp);
sec = &tmp;
}
- tv.tv_sec = Z_LVAL_P(sec);
- tv.tv_usec = usec;
+
+ /* Solaris + BSD do not like microsecond values which are >= 1 sec */
+ if (usec > 999999) {
+ tv.tv_sec = Z_LVAL_P(sec) + (usec / 1000000);
+ tv.tv_usec = usec % 1000000;
+ } else {
+ tv.tv_sec = Z_LVAL_P(sec);
+ tv.tv_usec = usec;
+ }
+
tv_p = &tv;
if (sec == &tmp) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
