Store auth information in cluster->flags->auth

phpredis · Jun 5, 2020 · 58dab56 · 58dab56
1 parent 890ee0e
commit 58dab56
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/cluster_library.c b/cluster_library.c
@@ -637,8 +637,8 @@ cluster_node_create(redisCluster *c, char *host, size_t host_len,
     node->sock = redis_sock_create(host, host_len, port, c->timeout,
         c->read_timeout, c->persistent, NULL, 0);
 
-    if (c->auth) {
-        node->sock->auth = zend_string_copy(c->auth);
+    if (c->flags->auth) {
+        node->sock->auth = zend_string_copy(c->flags->auth);
     }
 
     return node;
@@ -826,7 +826,6 @@ PHP_REDIS_API redisCluster *cluster_create(double timeout, double read_timeout,
     c->read_timeout = read_timeout;
     c->failover = failover;
     c->persistent = persistent;
-    c->auth = NULL;
     c->err = NULL;
 
     /* Set up our waitms based on timeout */
@@ -851,6 +850,8 @@ cluster_free(redisCluster *c, int free_ctx)
 
     /* Free any allocated prefix */
     if (c->flags->prefix) zend_string_release(c->flags->prefix);
+    /* Free auth info we've got */
+    if (c->flags->auth) zend_string_release(c->flags->auth);
     efree(c->flags);
 
     /* Call hash table destructors */
@@ -861,9 +862,6 @@ cluster_free(redisCluster *c, int free_ctx)
     efree(c->seeds);
     efree(c->nodes);
 
-    /* Free auth info we've got */
-    if (c->auth) zend_string_release(c->auth);
-
     /* Free any error we've got */
     if (c->err) zend_string_release(c->err);
 
@@ -1089,8 +1087,8 @@ cluster_init_seeds(redisCluster *cluster, HashTable *ht_seeds) {
             cluster->read_timeout, cluster->persistent, NULL, 0);
 
         // Set auth information if specified
-        if (cluster->auth) {
-            redis_sock->auth = zend_string_copy(cluster->auth);
+        if (cluster->flags->auth) {
+            redis_sock->auth = zend_string_copy(cluster->flags->auth);
         }
 
         // Index this seed by host/port

diff --git a/cluster_library.h b/cluster_library.h
@@ -183,7 +183,6 @@ typedef struct clusterFoldItem clusterFoldItem;
 
 /* RedisCluster implementation structure */
 typedef struct redisCluster {
-    zend_string *auth;
 
     /* Timeout and read timeout (for normal operations) */
     double timeout;

diff --git a/redis_cluster.c b/redis_cluster.c
@@ -370,7 +370,7 @@ static void redis_cluster_init(redisCluster *c, HashTable *ht_seeds, double time
     cluster_validate_args(timeout, read_timeout, ht_seeds);
 
     if (auth && auth_len > 0) {
-        c->auth = zend_string_init(auth, auth_len, 0);
+        c->flags->auth = zend_string_init(auth, auth_len, 0);
     }
 
     c->timeout = timeout;

diff --git a/redis_session.c b/redis_session.c
@@ -962,7 +962,7 @@ PS_OPEN_FUNC(rediscluster) {
 
     c = cluster_create(timeout, read_timeout, failover, persistent);
     if (auth && auth_len > 0) {
-        c->auth = zend_string_init(auth, auth_len, 0);
+        c->flags->auth = zend_string_init(auth, auth_len, 0);
     }
 
     redisCachedCluster *cc;