Merge pull request #567 from Topface/persistent-body-reuse-fix

Fixed request body reuse in http transport

Author: ruflin

changes.txt

@@ -1,5 +1,8 @@
 CHANGES
 
+2014-03-11
+- Fixed request body reuse in http transport
+
 2014-03-08
 - Release v1.0.1.1
 - Enable goecluster-facet again as now compatible with elasticsearch 1.0 on travis

lib/Elastica/Transport/Http.php

@@ -112,6 +112,8 @@ public function exec(Request $request, array $params)
             $content = str_replace('\/', '/', $content);
 
             curl_setopt($conn, CURLOPT_POSTFIELDS, $content);
+        } else {
+            curl_setopt($conn, CURLOPT_POSTFIELDS, '');
         }
 
         curl_setopt($conn, CURLOPT_NOBODY, $httpMethod == 'HEAD');

test/lib/Elastica/Test/Transport/HttpTest.php

@@ -4,6 +4,8 @@
 
 use Elastica\Client;
 use Elastica\Document;
+use Elastica\Query;
+use Elastica\ResultSet;
 use Elastica\Test\Base as BaseTest;
 use Elastica\Exception\ResponseException;
 
@@ -180,4 +182,33 @@ public function testWithoutProxy()
         $this->assertEquals(200, $transferInfo['http_code']);
     }
 
+    public function testBodyReuse()
+    {
+        $client = new Client();
+
+        $index = $client->getIndex('elastica_body_reuse_test');
+
+        $index->create(array(), true);
+
+        $type = $index->getType('test');
+        $type->addDocument(new Document(1, array('test' => 'test')));
+
+        $index->refresh();
+
+        $resultSet = $index->search(array(
+            'query' => array(
+                'query_string' => array(
+                    'query' => 'pew pew pew',
+                ),
+            ),
+        ));
+
+        $this->assertEquals(0, $resultSet->getTotalHits());
+
+        $response = $index->request('/_search', 'POST');
+        $resultSet = new ResultSet($response, Query::create(array()));
+
+        $this->assertEquals(1, $resultSet->getTotalHits());
+    }
+
 }