Merge remote-tracking branch 'matmol/dont_throw_exception_on_pconnect' into feature/matmol_connect_ex

michael-grunder · michael-grunder · commit 677c8df7c1d1 · 2013-08-30T21:18:00.000-07:00
diff --git a/redis.c b/redis.c
@@ -632,7 +632,7 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
 	}
 
 	/* if there is a redis sock already we have to remove it from the list */
-	if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) > 0) {
+	if (redis_sock_get(object, &redis_sock TSRMLS_CC, 1) > 0) {
 		if (zend_hash_find(Z_OBJPROP_P(object), "socket",
 					sizeof("socket"), (void **) &socket) == FAILURE) {
 			/* maybe there is a socket but the id isn't known.. what to do? */

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`/* if there is a redis sock already we have to remove it from the list */`
`635`		`- if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) > 0) {`
	`635`	`+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 1) > 0) {`
`636`	`636`	`if (zend_hash_find(Z_OBJPROP_P(object), "socket",`
`637`	`637`	`sizeof("socket"), (void **) &socket) == FAILURE) {`
`638`	`638`	`/* maybe there is a socket but the id isn't known.. what to do? */`