Merge branch 'master' of github.com:Mashape/unirest-php

bipinu · Jan 14, 2014 · d0117b5 · d0117b5
2 parents 8b184d9 + 9e48aa4
commit d0117b5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/lib/Unirest/Unirest.php b/lib/Unirest/Unirest.php
@@ -171,9 +171,13 @@ private static function request($httpMethod, $url, $body = NULL, $headers = arra
 
 						$ch = curl_init();
 						if ($httpMethod != HttpMethod::GET) {
-								curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);
-								Unirest::http_build_query_for_curl($body, $postBody);
-								curl_setopt ($ch, CURLOPT_POSTFIELDS, $postBody);
+                                curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);
+                                if( is_array($body) || $body instanceof Traversable ) {
+                                    Unirest::http_build_query_for_curl($body, $postBody);
+                                    curl_setopt ($ch, CURLOPT_POSTFIELDS, $postBody);
+                                } else {
+                                    curl_setopt ($ch, CURLOPT_POSTFIELDS, $body);
+                                }
 						} else if (is_array($body)) {
 								if (strpos($url,'?') !== false) {
 									$url .= "&";

diff --git a/test/Unirest/UnirestTest.php b/test/Unirest/UnirestTest.php
@@ -90,6 +90,19 @@ public function testPostWithDots()
     $this->assertEqual("thefosk", $form->nick);
   }
 
+    public function testRawPost()
+    {
+        $response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ),
+            json_encode(array(
+                "author" => "Sam Sullivan"
+            )));
+
+        $this->assertEqual(200, $response->code);
+
+        $json = $response->body->json;
+        $this->assertEqual("Sam Sullivan", $json->author);
+    }
+
   public function testUpload() {
     $response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ),
       array(