Checks for tv.tv_usec as well as tv.tv_sec when setting the read

michael-grunder · michael-grunder · commit 93f77be960b0 · 2013-01-13T21:59:13.000-08:00
timeout option on our socket. We were actually ignoring timeouts < 1 second because of this. Nice catch by @xiaoyjy Fixes phpredis#286
diff --git a/library.c b/library.c
@@ -915,7 +915,7 @@ PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
 
     php_stream_auto_cleanup(redis_sock->stream);
 
-    if(tv.tv_sec != 0) {
+    if(tv.tv_sec != 0 || tv.tv_usec != 0) {
         php_stream_set_option(redis_sock->stream, PHP_STREAM_OPTION_READ_TIMEOUT,
                               0, &tv);
     }

Original file line number	Diff line number	Diff line change
`@@ -915,7 +915,7 @@ PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)`
`915`	`915`
`916`	`916`	`php_stream_auto_cleanup(redis_sock->stream);`
`917`	`917`
`918`		`- if(tv.tv_sec != 0) {`
	`918`	`+ if(tv.tv_sec != 0 \|\| tv.tv_usec != 0) {`
`919`	`919`	`php_stream_set_option(redis_sock->stream, PHP_STREAM_OPTION_READ_TIMEOUT,`
`920`	`920`	`0, &tv);`
`921`	`921`	`}`