Added support for user specified persistent connection id

Author: Zakay

common.h

@@ -147,6 +147,7 @@ typedef struct {
     int            failed;
     int            status;
     int            persistent;
+    char           *persistent_id;
 
     int            serializer;
 

library.c

@@ -754,7 +754,8 @@ PHPAPI void redis_ping_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_s
  * redis_sock_create
  */
 PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short port,
-                                    double timeout, int persistent)
+                                    double timeout, int persistent, char *persistent_id,
+				    int persistent_id_len)
 {
     RedisSock *redis_sock;
 
@@ -765,6 +766,13 @@ PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short por
 
     redis_sock->persistent = persistent;
 
+    if (persistent_id) {
+      memcpy(redis_sock->persistent_id, persistent_id, persistent_id_len);
+      redis_sock->persistent_id[persistent_id_len] = '\0';
+    } else {
+      redis_sock->persistent_id = NULL;
+    }
+
     memcpy(redis_sock->host, host, host_len);
     redis_sock->host[host_len] = '\0';
 
@@ -807,7 +815,11 @@ PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
     }
 
     if (redis_sock->persistent) {
-      spprintf(&persistent_id, 0, "%s:%f", host, redis_sock->timeout);
+      if (redis_sock->persistent_id) {
+        spprintf(&persistent_id, 0, "%s:%s", host, redis_sock->persistent_id);
+      } else {
+        spprintf(&persistent_id, 0, "%s:%f", host, redis_sock->timeout);
+      }
     }
 
     redis_sock->stream = php_stream_xport_create(host, host_len, ENFORCE_SAFE_MODE,

library.h

@@ -14,7 +14,7 @@ PHPAPI void redis_string_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis
 PHPAPI void redis_ping_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
 PHPAPI void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
 PHPAPI void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
-PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short port, double timeout, int persistent);
+PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short port, double timeout, int persistent, char *persistent_id, int persistent_id_len);
 PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC);
 PHPAPI int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC);
 PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC);

redis.c

@@ -412,6 +412,9 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
 	char *host = NULL;
 	long port = -1;
 
+	char *persistent_id = NULL;
+	int persistent_id_len = -1;
+
 #ifdef ZTS
 	/* not sure how in threaded mode this works so disabled persistents at first */
     persistent = 0;
@@ -420,9 +423,9 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
 	double timeout = 0.0;
 	RedisSock *redis_sock  = NULL;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|ld",
-				&object, redis_ce, &host, &host_len, &port,
-				&timeout) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|lds",
+				&object, redis_ce, &host, &host_len, &port
+				&timeout, &persistent_id, &persistent_id_len) == FAILURE) {
 		return FAILURE;
 	}
 
@@ -445,7 +448,7 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
 		}
 	}
 
-	redis_sock = redis_sock_create(host, host_len, port, timeout, persistent);
+	redis_sock = redis_sock_create(host, host_len, port, timeout, persistent, persistent_id, persistent_id_len);
 
 	if (redis_sock_server_open(redis_sock, 1 TSRMLS_CC) < 0) {
 		redis_free_socket(redis_sock);