Refactor redis_session

Use `redis_sock` to store `auth` and `prefix` for session.
Use `redis_sock_auth` insted of `redis_pool_member_auth`.

Author: yatsukhnenko

redis_session.c

@@ -71,8 +71,6 @@ typedef struct redis_pool_member_ {
     RedisSock *redis_sock;
     int weight;
     int database;
-    zend_string *prefix;
-    zend_string *auth;
     struct redis_pool_member_ *next;
 
 } redis_pool_member;
@@ -88,17 +86,13 @@ typedef struct {
 } redis_pool;
 
 PHP_REDIS_API void
-redis_pool_add(redis_pool *pool, RedisSock *redis_sock, int weight,
-                int database, zend_string *prefix, zend_string *auth) {
-
+redis_pool_add(redis_pool *pool, RedisSock *redis_sock, int weight, int database)
+{
     redis_pool_member *rpm = ecalloc(1, sizeof(redis_pool_member));
     rpm->redis_sock = redis_sock;
     rpm->weight = weight;
     rpm->database = database;
 
-    rpm->prefix = prefix;
-    rpm->auth = auth;
-
     rpm->next = pool->head;
     pool->head = rpm;
 
@@ -114,8 +108,6 @@ redis_pool_free(redis_pool *pool) {
         next = rpm->next;
         redis_sock_disconnect(rpm->redis_sock, 0);
         redis_free_socket(rpm->redis_sock);
-        if (rpm->prefix) zend_string_release(rpm->prefix);
-        if (rpm->auth) zend_string_release(rpm->auth);
         efree(rpm);
         rpm = next;
     }
@@ -143,26 +135,6 @@ static int redis_simple_cmd(RedisSock *redis_sock, char *cmd, int cmdlen,
     return len_written;
 }
 
-static void
-redis_pool_member_auth(redis_pool_member *rpm) {
-    RedisSock *redis_sock = rpm->redis_sock;
-    char *response, *cmd;
-    int response_len, cmd_len;
-
-    /* Short circuit if we don't have a password */
-    if (!rpm->auth) {
-        return;
-    }
-
-    cmd_len = REDIS_SPPRINTF(&cmd, "AUTH", "S", rpm->auth);
-    if (redis_sock_write(redis_sock, cmd, cmd_len) >= 0) {
-        if ((response = redis_sock_read(redis_sock, &response_len))) {
-            efree(response);
-        }
-    }
-    efree(cmd);
-}
-
 static void
 redis_pool_member_select(redis_pool_member *rpm) {
     RedisSock *redis_sock = rpm->redis_sock;
@@ -190,12 +162,12 @@ redis_pool_get_sock(redis_pool *pool, const char *key) {
     for(i = 0; i < pool->totalWeight;) {
         if (pos >= i && pos < i + rpm->weight) {
             int needs_auth = 0;
-            if (rpm->auth && rpm->redis_sock->status != REDIS_SOCK_STATUS_CONNECTED) {
+            if (rpm->redis_sock->auth && rpm->redis_sock->status != REDIS_SOCK_STATUS_CONNECTED) {
                     needs_auth = 1;
             }
             if (redis_sock_server_open(rpm->redis_sock) == 0) {
                 if (needs_auth) {
-                    redis_pool_member_auth(rpm);
+                    redis_sock_auth(rpm->redis_sock);
                 }
                 if (rpm->database >= 0) { /* default is -1 which leaves the choice to redis. */
                     redis_pool_member_select(rpm);
@@ -514,7 +486,9 @@ PS_OPEN_FUNC(redis)
                 redis_sock = redis_sock_create(ZSTR_VAL(url->path), ZSTR_LEN(url->path), 0, timeout, read_timeout, persistent, persistent_id, retry_interval);
 #endif
             }
-            redis_pool_add(pool, redis_sock, weight, database, prefix, auth);
+            redis_pool_add(pool, redis_sock, weight, database);
+            redis_sock->prefix = prefix;
+            redis_sock->auth = auth;
 
             php_url_free(url);
         }
@@ -554,16 +528,16 @@ PS_CLOSE_FUNC(redis)
 /* }}} */
 
 static zend_string *
-redis_session_key(redis_pool_member *rpm, const char *key, int key_len)
+redis_session_key(RedisSock *redis_sock, const char *key, int key_len)
 {
     zend_string *session;
     char default_prefix[] = "PHPREDIS_SESSION:";
     char *prefix = default_prefix;
     size_t prefix_len = sizeof(default_prefix)-1;
 
-    if (rpm->prefix) {
-        prefix = ZSTR_VAL(rpm->prefix);
-        prefix_len = ZSTR_LEN(rpm->prefix);
+    if (redis_sock->prefix) {
+        prefix = ZSTR_VAL(redis_sock->prefix);
+        prefix_len = ZSTR_LEN(redis_sock->prefix);
     }
 
     /* build session key */
@@ -589,9 +563,9 @@ PS_CREATE_SID_FUNC(redis)
         zend_string* sid = php_session_create_id((void **) &pool);
         redis_pool_member *rpm = redis_pool_get_sock(pool, ZSTR_VAL(sid));
 
-        RedisSock *redis_sock = rpm?rpm->redis_sock:NULL;
+        RedisSock *redis_sock = rpm ? rpm->redis_sock : NULL;
 
-        if (!rpm || !redis_sock) {
+        if (!redis_sock) {
             php_error_docref(NULL, E_NOTICE,
                 "Redis not available while creating session_id");
 
@@ -600,7 +574,7 @@ PS_CREATE_SID_FUNC(redis)
         }
 
         if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);
-        pool->lock_status.session_key = redis_session_key(rpm, ZSTR_VAL(sid), ZSTR_LEN(sid));
+        pool->lock_status.session_key = redis_session_key(redis_sock, ZSTR_VAL(sid), ZSTR_LEN(sid));
 
         if (lock_acquire(redis_sock, &pool->lock_status) == SUCCESS) {
             return sid;
@@ -639,7 +613,7 @@ PS_VALIDATE_SID_FUNC(redis)
     }
 
     /* send EXISTS command */
-    zend_string *session = redis_session_key(rpm, skey, skeylen);
+    zend_string *session = redis_session_key(redis_sock, skey, skeylen);
     cmd_len = REDIS_SPPRINTF(&cmd, "EXISTS", "S", session);
     zend_string_release(session);
     if (redis_sock_write(redis_sock, cmd, cmd_len) < 0) {
@@ -683,7 +657,7 @@ PS_UPDATE_TIMESTAMP_FUNC(redis)
     }
 
     /* send EXPIRE command */
-    zend_string *session = redis_session_key(rpm, skey, skeylen);
+    zend_string *session = redis_session_key(redis_sock, skey, skeylen);
     cmd_len = REDIS_SPPRINTF(&cmd, "EXPIRE", "Sd", session, INI_INT("session.gc_maxlifetime"));
     zend_string_release(session);
 
@@ -721,14 +695,14 @@ PS_READ_FUNC(redis)
 
     redis_pool *pool = PS_GET_MOD_DATA();
     redis_pool_member *rpm = redis_pool_get_sock(pool, skey);
-    RedisSock *redis_sock = rpm?rpm->redis_sock:NULL;
-    if (!rpm || !redis_sock){
+    RedisSock *redis_sock = rpm ? rpm->redis_sock : NULL;
+    if (!redis_sock) {
         return FAILURE;
     }
 
     /* send GET command */
     if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);
-    pool->lock_status.session_key = redis_session_key(rpm, skey, skeylen);
+    pool->lock_status.session_key = redis_session_key(redis_sock, skey, skeylen);
     cmd_len = REDIS_SPPRINTF(&cmd, "GET", "S", pool->lock_status.session_key);
 
     if (lock_acquire(redis_sock, &pool->lock_status) != SUCCESS) {
@@ -779,7 +753,7 @@ PS_WRITE_FUNC(redis)
     }
 
     /* send SET command */
-    zend_string *session = redis_session_key(rpm, skey, skeylen);
+    zend_string *session = redis_session_key(redis_sock, skey, skeylen);
 
     cmd_len = REDIS_SPPRINTF(&cmd, "SETEX", "Sds", session, INI_INT("session.gc_maxlifetime"), sval, svallen);
     zend_string_release(session);
@@ -822,12 +796,10 @@ PS_DESTROY_FUNC(redis)
     }
 
     /* Release lock */
-    if (redis_sock) {
-        lock_release(redis_sock, &pool->lock_status);
-    }
+    lock_release(redis_sock, &pool->lock_status);
 
     /* send DEL command */
-    zend_string *session = redis_session_key(rpm, skey, skeylen);
+    zend_string *session = redis_session_key(redis_sock, skey, skeylen);
     cmd_len = REDIS_SPPRINTF(&cmd, "DEL", "S", session);
     zend_string_release(session);
     if (redis_sock_write(redis_sock, cmd, cmd_len) < 0) {