Allow negative timeout/read_timeout and fix doc

michael-grunder · twose · michael-grunder · commit ab4ce4ab6f6e · 2022-10-07T11:42:38.000-07:00
Co-authored-by: twosee &lt;twose@qq.com&gt;
diff --git a/README.markdown b/README.markdown
@@ -223,10 +223,10 @@ _**Description**_: Connects to a Redis instance.
 
 *host*: string. can be a host, or the path to a unix domain socket. Starting from version 5.0.0 it is possible to specify schema 
 *port*: int, optional  
-*timeout*: float, value in seconds (optional, default is 0 meaning unlimited)  
+*timeout*: float, value in seconds (optional, default is 0 meaning it will use default_socket_timeout)
 *reserved*: should be '' if retry_interval is specified  
 *retry_interval*: int, value in milliseconds (optional)  
-*read_timeout*: float, value in seconds (optional, default is 0 meaning unlimited)
+*read_timeout*: float, value in seconds (optional, default is 0 meaning it will use default_socket_timeout)
 *others*: array, with PhpRedis >= 5.3.0, it allows setting _auth_ and [_stream_](https://www.php.net/manual/en/context.ssl.php) configuration.
 
 ##### *Return value*
@@ -271,10 +271,10 @@ persistent equivalents.
 
 *host*: string. can be a host, or the path to a unix domain socket. Starting from version 5.0.0 it is possible to specify schema 
 *port*: int, optional  
-*timeout*: float, value in seconds (optional, default is 0 meaning unlimited)  
+*timeout*: float, value in seconds (optional, default is 0 meaning it will use default_socket_timeout)
 *persistent_id*: string. identity for the requested persistent connection  
 *retry_interval*: int, value in milliseconds (optional)  
-*read_timeout*: float, value in seconds (optional, default is 0 meaning unlimited)
+*read_timeout*: float, value in seconds (optional, default is 0 meaning it will use default_socket_timeout)
 
 ##### *Return value*
 
diff --git a/cluster_library.c b/cluster_library.c
@@ -2873,12 +2873,12 @@ cluster_validate_args(double timeout, double read_timeout, HashTable *seeds,
 {
     zend_string **retval;
 
-    if (timeout < 0L || timeout > INT_MAX) {
+    if (timeout > INT_MAX) {
         if (errstr) *errstr = "Invalid timeout";
         return NULL;
     }
 
-    if (read_timeout < 0L || read_timeout > INT_MAX) {
+    if (read_timeout > INT_MAX) {
         if (errstr) *errstr = "Invalid read timeout";
         return NULL;
     }
diff --git a/redis.c b/redis.c
@@ -718,12 +718,12 @@ redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
         persistent_id = NULL;
     }
 
-    if (timeout < 0L || timeout > INT_MAX) {
+    if (timeout > INT_MAX) {
         REDIS_VALUE_EXCEPTION("Invalid connect timeout");
         return FAILURE;
     }
 
-    if (read_timeout < 0L || read_timeout > INT_MAX) {
+    if (read_timeout > INT_MAX) {
         REDIS_VALUE_EXCEPTION("Invalid read timeout");
         return FAILURE;
     }
diff --git a/redis_sentinel.c b/redis_sentinel.c
@@ -61,12 +61,12 @@ PHP_METHOD(RedisSentinel, __construct)
         RETURN_THROWS();
     }
 
-    if (timeout < 0L || timeout > INT_MAX) {
+    if (timeout > INT_MAX) {
         REDIS_VALUE_EXCEPTION("Invalid connect timeout");
         RETURN_THROWS();
     }
 
-    if (read_timeout < 0L || read_timeout > INT_MAX) {
+    if (read_timeout > INT_MAX) {
         REDIS_VALUE_EXCEPTION("Invalid read timeout");
         RETURN_THROWS();
     }

Original file line number	Diff line number	Diff line change
`@@ -2873,12 +2873,12 @@ cluster_validate_args(double timeout, double read_timeout, HashTable *seeds,`
`2873`	`2873`	`{`
`2874`	`2874`	`zend_string **retval;`
`2875`	`2875`
`2876`		`- if (timeout < 0L \|\| timeout > INT_MAX) {`
	`2876`	`+ if (timeout > INT_MAX) {`
`2877`	`2877`	`if (errstr) *errstr = "Invalid timeout";`
`2878`	`2878`	`return NULL;`
`2879`	`2879`	`}`
`2880`	`2880`
`2881`		`- if (read_timeout < 0L \|\| read_timeout > INT_MAX) {`
	`2881`	`+ if (read_timeout > INT_MAX) {`
`2882`	`2882`	`if (errstr) *errstr = "Invalid read timeout";`
`2883`	`2883`	`return NULL;`
`2884`	`2884`	`}`
Original file line number	Diff line number	Diff line change
`@@ -718,12 +718,12 @@ redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)`
`718`	`718`	`persistent_id = NULL;`
`719`	`719`	`}`
`720`	`720`
`721`		`- if (timeout < 0L \|\| timeout > INT_MAX) {`
	`721`	`+ if (timeout > INT_MAX) {`
`722`	`722`	`REDIS_VALUE_EXCEPTION("Invalid connect timeout");`
`723`	`723`	`return FAILURE;`
`724`	`724`	`}`
`725`	`725`
`726`		`- if (read_timeout < 0L \|\| read_timeout > INT_MAX) {`
	`726`	`+ if (read_timeout > INT_MAX) {`
`727`	`727`	`REDIS_VALUE_EXCEPTION("Invalid read timeout");`
`728`	`728`	`return FAILURE;`
`729`	`729`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,12 @@ PHP_METHOD(RedisSentinel, __construct)`
`61`	`61`	`RETURN_THROWS();`
`62`	`62`	`}`
`63`	`63`
`64`		`- if (timeout < 0L \|\| timeout > INT_MAX) {`
	`64`	`+ if (timeout > INT_MAX) {`
`65`	`65`	`REDIS_VALUE_EXCEPTION("Invalid connect timeout");`
`66`	`66`	`RETURN_THROWS();`
`67`	`67`	`}`
`68`	`68`
`69`		`- if (read_timeout < 0L \|\| read_timeout > INT_MAX) {`
	`69`	`+ if (read_timeout > INT_MAX) {`
`70`	`70`	`REDIS_VALUE_EXCEPTION("Invalid read timeout");`
`71`	`71`	`RETURN_THROWS();`
`72`	`72`	`}`