fix for problem when setting socket timeout lower then 1 (also the microsecond part wasn't used because of the bug)

Simon Effenberg · Simon Effenberg · commit 12769b03c8ec · 2010-11-08T12:38:48.000+01:00
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+phpredis (2.0.10-1) unstable; urgency=low
+
+  * Fixed wrong timeout option when setting timeout to lower then 1s.
+
+ -- Simon Effenberg <se@plista.com>  Mon, 08 Nov 2010 12:30:54 +0100
+
 phpredis (2.0.10) unstable; urgency=low
 
   * Merged with upstream
diff --git a/library.c b/library.c
@@ -706,11 +706,11 @@ PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
     }
 
     tv.tv_sec  = (time_t)redis_sock->timeout;
-    tv.tv_usec = ((int)(redis_sock->timeout - tv.tv_sec)) * 1000000;
+    tv.tv_usec = (int)((redis_sock->timeout - tv.tv_sec) * 1000000);
 
     host_len = spprintf(&host, 0, "%s:%d", redis_sock->host, redis_sock->port);
 
-    if(tv.tv_sec != 0) {
+    if(tv.tv_sec != 0 || tv.tv_usec != 0) {
         tv_ptr = &tv;
     }
     redis_sock->stream = php_stream_xport_create(host, host_len, ENFORCE_SAFE_MODE,

Original file line number	Diff line number	Diff line change
`@@ -706,11 +706,11 @@ PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)`
`706`	`706`	`}`
`707`	`707`
`708`	`708`	`tv.tv_sec = (time_t)redis_sock->timeout;`
`709`		`- tv.tv_usec = ((int)(redis_sock->timeout - tv.tv_sec)) * 1000000;`
	`709`	`+ tv.tv_usec = (int)((redis_sock->timeout - tv.tv_sec) * 1000000);`
`710`	`710`
`711`	`711`	`host_len = spprintf(&host, 0, "%s:%d", redis_sock->host, redis_sock->port);`
`712`	`712`
`713`		`- if(tv.tv_sec != 0) {`
	`713`	`+ if(tv.tv_sec != 0 \|\| tv.tv_usec != 0) {`
`714`	`714`	`tv_ptr = &tv;`
`715`	`715`	`}`
`716`	`716`	`redis_sock->stream = php_stream_xport_create(host, host_len, ENFORCE_SAFE_MODE,`