Merge branch 'master' of github.com:nicolasff/phpredis

michael-grunder · michael-grunder · commit 5362d686eefd · 2012-08-08T16:13:56.000-07:00
diff --git a/redis_session.c b/redis_session.c
@@ -251,10 +251,10 @@ PS_OPEN_FUNC(redis)
 			}
 
 			RedisSock *redis_sock;
-            if(url->path) { /* unix */
-                    redis_sock = redis_sock_create(url->path, strlen(url->path), 0, timeout, persistent, persistent_id);
-            } else {
+            if(url->host) {
                     redis_sock = redis_sock_create(url->host, strlen(url->host), url->port, timeout, persistent, persistent_id);
+            } else { /* unix */
+                    redis_sock = redis_sock_create(url->path, strlen(url->path), 0, timeout, persistent, persistent_id);
             }
 			redis_pool_add(pool, redis_sock, weight, prefix, auth TSRMLS_CC);
 

Original file line number	Diff line number	Diff line change
`@@ -251,10 +251,10 @@ PS_OPEN_FUNC(redis)`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`RedisSock *redis_sock;`
`254`		`- if(url->path) { /* unix */`
`255`		`- redis_sock = redis_sock_create(url->path, strlen(url->path), 0, timeout, persistent, persistent_id);`
`256`		`- } else {`
	`254`	`+ if(url->host) {`
`257`	`255`	`redis_sock = redis_sock_create(url->host, strlen(url->host), url->port, timeout, persistent, persistent_id);`
	`256`	`+ } else { /* unix */`
	`257`	`+ redis_sock = redis_sock_create(url->path, strlen(url->path), 0, timeout, persistent, persistent_id);`
`258`	`258`	`}`
`259`	`259`	`redis_pool_add(pool, redis_sock, weight, prefix, auth TSRMLS_CC);`
`260`	`260`