Fix variant reply handling

Author: michael-grunder

cluster_library.c

@@ -183,7 +183,9 @@ clusterReply*
 cluster_read_sock_resp(RedisSock *redis_sock, REDIS_REPLY_TYPE type, 
                        size_t len TSRMLS_DC) 
 {
-    clusterReply *r = ecalloc(1, sizeof(clusterReply));
+    clusterReply *r;
+
+    r = ecalloc(1, sizeof(clusterReply));
     r->type = type;
 
     // Error flag in case we go recursive
@@ -193,6 +195,9 @@ cluster_read_sock_resp(RedisSock *redis_sock, REDIS_REPLY_TYPE type,
         case TYPE_INT:
             r->integer = len;
             break;
+        case TYPE_LINE:
+        case TYPE_ERR:
+            return r;
         case TYPE_BULK:
             r->len = len;
             r->str = redis_sock_read_bulk_reply(redis_sock, len TSRMLS_CC);
@@ -1702,6 +1707,9 @@ PHPAPI void cluster_variant_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
             case TYPE_INT:
                 RETVAL_LONG(r->integer);
                 break;
+            case TYPE_ERR:
+                RETVAL_FALSE;
+                break;
             case TYPE_LINE:
                 RETVAL_TRUE;
                 break;
@@ -1728,6 +1736,9 @@ PHPAPI void cluster_variant_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
             case TYPE_INT:
                 add_next_index_long(c->multi_resp, r->integer);
                 break;
+            case TYPE_ERR:
+                add_next_index_bool(c->multi_resp, 0);
+                break;
             case TYPE_LINE:
                 add_next_index_bool(c->multi_resp, 1);
                 break;

redis_cluster.c

@@ -2181,10 +2181,10 @@ static void cluster_raw_cmd(INTERNAL_FUNCTION_PARAMETERS, char *kw, int kw_len)
     }
 
     /* Initialize our command */
-    redis_cmd_init_sstr(&cmd, argc-1, kw, kw_len);
+    redis_cmd_init_sstr(&cmd, argc, kw, kw_len);
 
     /* Iterate, appending args */
-    for(i=1;i<argc;i++) {
+    for(i=0;i<argc;i++) {
         convert_to_string(z_args[i]);
         redis_cmd_append_sstr(&cmd, Z_STRVAL_P(z_args[i]), 
             Z_STRLEN_P(z_args[i]));