Merge branch 'devel' into connection_tests_close_and_keep-alive

frankmayer · frankmayer · commit b2c34c10362e · 2017-02-24T01:14:14.000+02:00
# Conflicts:
#	tests/ConnectionTest.php
diff --git a/lib/ArangoDBClient/Connection.php b/lib/ArangoDBClient/Connection.php
@@ -458,7 +458,7 @@ private function executeRequest($method, $url, $data, array $customHeaders = [])
                 $startTime = microtime(true);
             }
 
-            $result = HttpHelper::transfer($handle, $request);
+            $result = HttpHelper::transfer($handle, $request, $method);
 
             if ($traceFunc) {
                 // only issue syscall if we need it
diff --git a/lib/ArangoDBClient/HttpHelper.php b/lib/ArangoDBClient/HttpHelper.php
@@ -207,11 +207,12 @@ public static function validateMethod($method)
      *
      * @param resource $socket  - connection socket (must be open)
      * @param string   $request - complete HTTP request as a string
+     * @param string   $method - HTTP method used (e.g. "HEAD")
      *
      * @throws ClientException
      * @return string - HTTP response string as provided by the server
      */
-    public static function transfer($socket, $request)
+    public static function transfer($socket, $request, $method)
     {
         if (!is_resource($socket)) {
             throw new ClientException('Invalid socket used');
@@ -255,6 +256,13 @@ public static function transfer($socket, $request)
                 if ($pos !== false) {
                     $contentLength    = (int) substr($result, $pos + 16, 10); // 16 = strlen("content-length: ")
                     $contentLengthPos = $pos + 17; // 17 = 16 + 1 one digit
+
+                    if ($method === "HEAD") {
+                        // for HTTP HEAD requests, the server will respond
+                        // with the proper Content-Length value, but will
+                        // NOT return the body.
+                        $contentLength = 0;
+                    }
                 }
             }
 
diff --git a/tests/CollectionExtendedTest.php b/tests/CollectionExtendedTest.php
@@ -338,7 +338,7 @@ public function testCreateRenameAndDeleteCollectionWithWrongEncoding()
         // inject wrong encoding
         $isoValue = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', 'ArangoDB_PHP_TestSuite_TestCollection_01_renamedü');
 
-        $collectionHandler->rename($resultingCollection, $isoValue);
+        static::assertTrue($collectionHandler->rename($resultingCollection, $isoValue));
 
 
         $response = $collectionHandler->drop($resultingCollection);
diff --git a/tests/DocumentBasicTest.php b/tests/DocumentBasicTest.php
@@ -27,6 +27,13 @@ public function setUp()
     {
         $this->connection        = getConnection();
         $this->collectionHandler = new CollectionHandler($this->connection);
+        
+        try {
+            $this->collectionHandler->drop('ArangoDB_PHP_TestSuite_TestCollection_01');
+        } catch (\Exception $e) {
+            // don't bother us, if it's already deleted.
+        }
+
         $this->collection        = new Collection();
         $this->collection->setName('ArangoDB_PHP_TestSuite_TestCollection_01');
         $this->collectionHandler->create($this->collection);

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ private function executeRequest($method, $url, $data, array $customHeaders = [])`
`458`	`458`	`$startTime = microtime(true);`
`459`	`459`	`}`
`460`	`460`
`461`		`- $result = HttpHelper::transfer($handle, $request);`
	`461`	`+ $result = HttpHelper::transfer($handle, $request, $method);`
`462`	`462`
`463`	`463`	`if ($traceFunc) {`
`464`	`464`	`// only issue syscall if we need it`
Original file line number	Diff line number	Diff line change
`@@ -207,11 +207,12 @@ public static function validateMethod($method)`
`207`	`207`	`*`
`208`	`208`	`* @param resource $socket - connection socket (must be open)`
`209`	`209`	`* @param string $request - complete HTTP request as a string`
	`210`	`+ * @param string $method - HTTP method used (e.g. "HEAD")`
`210`	`211`	`*`
`211`	`212`	`* @throws ClientException`
`212`	`213`	`* @return string - HTTP response string as provided by the server`
`213`	`214`	`*/`
`214`		`- public static function transfer($socket, $request)`
	`215`	`+ public static function transfer($socket, $request, $method)`
`215`	`216`	`{`
`216`	`217`	`if (!is_resource($socket)) {`
`217`	`218`	`throw new ClientException('Invalid socket used');`
`@@ -255,6 +256,13 @@ public static function transfer($socket, $request)`
`255`	`256`	`if ($pos !== false) {`
`256`	`257`	`$contentLength = (int) substr($result, $pos + 16, 10); // 16 = strlen("content-length: ")`
`257`	`258`	`$contentLengthPos = $pos + 17; // 17 = 16 + 1 one digit`
	`259`	`+`
	`260`	`+ if ($method === "HEAD") {`
	`261`	`+ // for HTTP HEAD requests, the server will respond`
	`262`	`+ // with the proper Content-Length value, but will`
	`263`	`+ // NOT return the body.`
	`264`	`+ $contentLength = 0;`
	`265`	`+ }`
`258`	`266`	`}`
`259`	`267`	`}`
`260`	`268`