Make sure publish() can be called in a pipeline.

nicolasff · nicolasff · commit d0d00341ff79 · 2011-12-13T19:54:13.000Z
This will also make it possible to use publish() in a MULTI/EXEC context. Fixes GitHub issue phpredis#104.
diff --git a/redis.c b/redis.c
@@ -4840,12 +4840,11 @@ PHP_METHOD(Redis, publish)
     cmd_len = redis_cmd_format_static(&cmd, "PUBLISH", "ss", key, key_len, val, val_len);
 	if(key_free) efree(key);
 
-    if (redis_sock_write(redis_sock, cmd, cmd_len TSRMLS_CC) < 0) {
-        efree(cmd);
-        RETURN_FALSE;
+	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
+    IF_ATOMIC() {
+		redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
     }
-    efree(cmd);
-	redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
+    REDIS_PROCESS_RESPONSE(redis_long_response);
 }
 
 /* 
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -55,6 +55,15 @@ public function testPing()
 	}
     }
 
+	public function testPipelinePublish() {
+
+		$ret = $this->redis->pipeline()
+			->publish('chan', 'msg')
+			->exec();
+
+		$this->assertTrue(is_array($ret) && count($ret) === 1 && $ret[0] >= 0);
+	}
+
     public function testBitsets() {
 
 	    $this->redis->delete('key');

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,15 @@ public function testPing()`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ public function testPipelinePublish() {`
	`59`	`+`
	`60`	`+ $ret = $this->redis->pipeline()`
	`61`	`+ ->publish('chan', 'msg')`
	`62`	`+ ->exec();`
	`63`	`+`
	`64`	`+ $this->assertTrue(is_array($ret) && count($ret) === 1 && $ret[0] >= 0);`
	`65`	`+ }`
	`66`	`+`
`58`	`67`	`public function testBitsets() {`
`59`	`68`
`60`	`69`	`$this->redis->delete('key');`