Fix for closing connection if Tarantool throws an error

closes gh-88

Author: bigbes

src/tarantool.c

@@ -316,11 +316,12 @@ static int64_t tarantool_step_recv(
 		}
 		THROW_EXC("Query error %d: %s", errcode, Z_STRVAL_P(errstr),
 				Z_STRLEN_P(errstr));
-		goto error;
+		goto error_noclose;
 	}
 	THROW_EXC("Failed to retrieve answer code");
 error:
 	obj->stream = NULL;
+error_noclose:
 	if (header) zval_ptr_dtor(header);
 	if (body) zval_ptr_dtor(body);
 	SSTR_LEN(obj->value) = 0;

test/AssertTest.php

@@ -1,43 +1,49 @@
 <?php
 class AssertTest extends PHPUnit_Framework_TestCase
 {
-    protected static $tarantool, $tm;
+	protected static $tarantool, $tm;
 
-    public static function setUpBeforeClass()
-    {
-        self::$tm = ini_get("tarantool.request_timeout");
-        ini_set("tarantool.request_timeout", "0.1");
-        self::$tarantool = new Tarantool('localhost', getenv('PRIMARY_PORT'));
-        self::$tarantool->authenticate('test', 'test');
-    }
+	public static function setUpBeforeClass() {
+		self::$tm = ini_get("tarantool.request_timeout");
+		ini_set("tarantool.request_timeout", "0.1");
+		self::$tarantool = new Tarantool('localhost', getenv('PRIMARY_PORT'));
+		self::$tarantool->authenticate('test', 'test');
+	}
 
-    public static function tearDownAfterClass() {
-        ini_set("tarantool.request_timeout", self::$tm);
-    }
+	public static function tearDownAfterClass() {
+		ini_set("tarantool.request_timeout", self::$tm);
+	}
 
-    protected function tearDown()
-    {
-        $tuples = self::$tarantool->select("test");
-        foreach($tuples as $value)
-            self::$tarantool->delete("test", Array($value[0]));
-    }
+	protected function tearDown() {
+		$tuples = self::$tarantool->select("test");
+		foreach($tuples as $value)
+			self::$tarantool->delete("test", Array($value[0]));
+	}
 
-    public function test_00_timedout() {
+	public function test_00_timedout() {
+		self::$tarantool->eval("
+			function assertf()
+				require('fiber').sleep(1)
+				return 0
+			end");
+		try {
+			self::$tarantool->call("assertf");
+			$this->assertFalse(True);
+		} catch (Exception $e) {
+			$this->assertTrue(strpos($e->getMessage(), "Can't read query") !== False);
+		}
 
-        self::$tarantool->eval("
-            function assertf()
-                require('fiber').sleep(1)
-                return 0
-            end");
-        try {
-            self::$tarantool->call("assertf");
-            $this->assertFalse(True);
-        } catch (Exception $e) {
-            $this->assertTrue(strpos($e->getMessage(),
-                "Can't read query") !== False);
-        }
+		/* We can reconnect and everything will be ok */
+		self::$tarantool->select("test");
+	}
 
-        /* We can reconnect and everything will be ok */
-        self::$tarantool->select("test");
-    }
+	public function test_01_closed_connection() {
+		for ($i = 0; $i < 20000; $i++) {
+			try {
+				self::$tarantool->call("nonexistentfunction");
+			} catch (Exception $e) {
+				$this->assertTrue(strpos($e->getMessage(), "is not defined") !== False);
+			}
+		}
+	}
 }