Missing merge.

nicolasff · nicolasff · commit 956e3e445b84 · 2011-06-12T22:27:43.000+02:00
diff --git a/redis.c b/redis.c
@@ -450,7 +450,7 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
 		}
 	}
 
-	redis_sock = redis_sock_create(host, host_len, port, timeout, persistent, persistent_id, persistent_id_len);
+	redis_sock = redis_sock_create(host, host_len, port, timeout, persistent, persistent_id);
 
 	if (redis_sock_server_open(redis_sock, 1 TSRMLS_CC) < 0) {
 		redis_free_socket(redis_sock);

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`
`453`		`- redis_sock = redis_sock_create(host, host_len, port, timeout, persistent, persistent_id, persistent_id_len);`
	`453`	`+ redis_sock = redis_sock_create(host, host_len, port, timeout, persistent, persistent_id);`
`454`	`454`
`455`	`455`	`if (redis_sock_server_open(redis_sock, 1 TSRMLS_CC) < 0) {`
`456`	`456`	`redis_free_socket(redis_sock);`