Ignore OPT_PREFIX for a timeout argument

michael-grunder · michael-grunder · commit 70430fb4f101 · 2012-10-22T13:22:41.000-07:00
When arguments were passed in the form ($key1, $key2, ...) to BLPOP or BRPOP with a prefix, the timeout value was also being prefixed causing it to misbehave. Now for these commands we ignore the prefix on our timeout argument Fixes issue phpredis#158
diff --git a/redis.c b/redis.c
@@ -2422,7 +2422,10 @@ PHPAPI int generic_multiple_args_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword
        	        keys[j] = Z_STRVAL_P(z_args[i]);
            	    keys_len[j] = Z_STRLEN_P(z_args[i]);
 
-				keys_to_free[j] = redis_key_prefix(redis_sock, &keys[j], &keys_len[j] TSRMLS_CC); /* add optional prefix  TSRMLS_CC*/
+           	    // If we have a timeout it should be the last argument, which we do not want to prefix
+				if(!has_timeout || i < argc-1) {
+					keys_to_free[j] = redis_key_prefix(redis_sock, &keys[j], &keys_len[j] TSRMLS_CC); /* add optional prefix  TSRMLS_CC*/
+				}
 			}
 
             cmd_len += 1 + integer_length(keys_len[j]) + 2 + keys_len[j] + 2; /* $ + size + NL + string + NL */
