Merge branch 'master' into serializer

Conflicts:
	redis.c

Author: nicolasff

library.c

@@ -874,11 +874,11 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
 
     IF_MULTI_OR_PIPELINE() {
         add_next_index_zval(z_tab, z_multi_result);
+    } else {
+        *return_value = *z_multi_result;
+        efree(z_multi_result);
     }
-
-    *return_value = *z_multi_result;
     //zval_copy_ctor(return_value);
-    efree(z_multi_result);
     return 0;
 }
 

redis.c

@@ -362,6 +362,7 @@ PHP_METHOD(Redis, __construct)
 PHP_METHOD(Redis, connect)
 {
     zval *object;
+	zval **socket;
     int host_len, id;
     char *host = NULL;
     long port = -1;
@@ -384,6 +385,16 @@ PHP_METHOD(Redis, connect)
             port = 6379;
     }
 
+	/* 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) {
+		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? */
+		} else {
+			zend_list_delete(Z_LVAL_PP(socket)); /* the refcount should be decreased and the detructor called */
+		}
+	}
+
     redis_sock = redis_sock_create(host, host_len, port, timeout);
 
     if (redis_sock_server_open(redis_sock, 1 TSRMLS_CC) < 0) {
@@ -4557,6 +4568,7 @@ PHP_METHOD(Redis, slaveof)
 }
 /* }}} */
 
+<<<<<<< HEAD
 /* {{{ proto string Redis::getOption($option)
  */
 PHP_METHOD(Redis, getOption)  {
@@ -4624,5 +4636,5 @@ PHP_METHOD(Redis, setOptions) {
 }
 /* }}} */
 
-/* vim: set tabstop=4 expandtab: */
+/* vim: set tabstop=4 softtabstop=4 noexpandtab shiftwidth=4: */
 

tests/TestRedis.php

@@ -1908,6 +1908,7 @@ protected function sequence($mode) {
 	    $this->assertTrue($ret == array());
 
 	    // ttl, mget, mset, msetnx, expire, expireAt
+	    $this->redis->delete('key');
 	    $ret = $this->redis->multi($mode)
 		    ->ttl('key')
 		    ->mget(array('key1', 'key2', 'key3'))