Merge branch 'develop' into issue.1054

michael-grunder · michael-grunder · commit 85e0b9e7b296 · 2016-12-18T21:26:55.000-08:00
diff --git a/library.c b/library.c
@@ -496,6 +496,7 @@ PHP_REDIS_API char *redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_D
     char inbuf[1024];
     size_t err_len;
 
+    *buf_len = 0;
     if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {
         return NULL;
     }
diff --git a/tests/RedisClusterTest.php b/tests/RedisClusterTest.php
@@ -513,7 +513,9 @@ public function testSession()
         ini_set('session.save_path', implode('&', array_map(function ($seed) {
             return 'seed[]=' . $seed;
         }, self::$_arr_node_map)) . '&failover=error');
-        @session_start();
+        if (!@session_start()) {
+            return $this->markTestSkipped();
+        }
         session_write_close();
         $this->assertTrue($this->redis->exists('PHPREDIS_CLUSTER_SESSION:' . session_id()));
     }
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -4965,7 +4965,9 @@ public function testSession()
     {
         ini_set('session.save_handler', 'redis');
         ini_set('session.save_path', 'tcp://localhost:6379');
-        @session_start();
+        if (!@session_start()) {
+            return $this->markTestSkipped();
+        }
         session_write_close();
         $this->assertTrue($this->redis->exists('PHPREDIS_SESSION:' . session_id()));
     }

Original file line number	Diff line number	Diff line change
`@@ -496,6 +496,7 @@ PHP_REDIS_API char redis_sock_read(RedisSock redis_sock, int *buf_len TSRMLS_D`
`496`	`496`	`char inbuf[1024];`
`497`	`497`	`size_t err_len;`
`498`	`498`
	`499`	`+ *buf_len = 0;`
`499`	`500`	`if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {`
`500`	`501`	`return NULL;`
`501`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4965,7 +4965,9 @@ public function testSession()`
`4965`	`4965`	`{`
`4966`	`4966`	`ini_set('session.save_handler', 'redis');`
`4967`	`4967`	`ini_set('session.save_path', 'tcp://localhost:6379');`
`4968`		`- @session_start();`
	`4968`	`+ if (!@session_start()) {`
	`4969`	`+ return $this->markTestSkipped();`
	`4970`	`+ }`
`4969`	`4971`	`session_write_close();`
`4970`	`4972`	`$this->assertTrue($this->redis->exists('PHPREDIS_SESSION:' . session_id()));`
`4971`	`4973`	`}`