out-of-sync packages will close connection now.

previously - asserting server. closes gh-57
+ add test for request timeout

Author: bigbes

src/tarantool.c

@@ -364,8 +364,14 @@ static int64_t tarantool_step_recv(
 	HashTable *hash = HASH_OF(*header);
 	zval **val = NULL;
 
-	if (zend_hash_index_find(hash, TNT_SYNC, (void **)&val) == SUCCESS)
-		assert(Z_LVAL_PP(val) == sync);
+	if (zend_hash_index_find(hash, TNT_SYNC, (void **)&val) == SUCCESS) {
+		if (Z_LVAL_PP(val) != sync) {
+			THROW_EXC("request sync is not equal response sync. "
+				  "closing connection");
+			tarantool_stream_close(obj TSRMLS_CC);
+			goto error;
+		}
+	}
 	val = NULL;
 	if (zend_hash_index_find(hash, TNT_CODE, (void **)&val) == SUCCESS) {
 		if (Z_LVAL_PP(val) == TNT_OK) {

test/AssertTest.php

@@ -0,0 +1,44 @@
+<?php
+class AssertTest extends PHPUnit_Framework_TestCase
+{
+    protected static $tarantool;
+
+    public static function setUpBeforeClass()
+    {
+        self::$tarantool = new Tarantool('localhost', getenv('PRIMARY_PORT'));
+        self::$tarantool->authenticate('test', 'test');
+    }
+
+    protected function tearDown()
+    {
+        $tuples = self::$tarantool->select("test");
+        foreach($tuples as $value)
+            self::$tarantool->delete("test", Array($value[0]));
+    }
+
+    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);
+        }
+        try {
+            sleep(1);
+            self::$tarantool->select("test");
+            $this->assertFalse(True);
+        } catch (Exception $e) {
+            /* check that we are closing connection */
+            $this->assertTrue(strpos($e->getMessage(),
+                "request sync") !== False);
+        }
+        /* We can reconnect and everything will be ok */
+        self::$tarantool->select("test");
+    }
+}

test/shared/tarantool.ini

@@ -1,9 +1,10 @@
 [PHP]
-extension              = ./tarantool.so
-tarantool.timeout      = 1.5
-tarantool.con_per_host = 5
-tarantool.persistent   = 1
-tarantool.deauthorize  = 1
+extension                 = ./tarantool.so
+tarantool.timeout         = 1.5
+tarantool.request_timeout = 0.1
+tarantool.con_per_host    = 5
+tarantool.persistent      = 1
+tarantool.deauthorize     = 1
 
 [xdebug]
 remote_autostart = 0