Merge branch 'master' into serializer

nicolasff · nicolasff · commit 6d1e8053afc6 · 2010-12-14T09:31:57.000+01:00
diff --git a/library.c b/library.c
@@ -875,7 +875,7 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
 
     *return_value = *z_multi_result;
     //zval_copy_ctor(return_value);
-    // efree(z_multi_result);
+    efree(z_multi_result);
     return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,7 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo`
`875`	`875`
`876`	`876`	`return_value = z_multi_result;`
`877`	`877`	`//zval_copy_ctor(return_value);`
`878`		`- // efree(z_multi_result);`
	`878`	`+ efree(z_multi_result);`
`879`	`879`	`return 0;`
`880`	`880`	`}`
`881`	`881`