Merge pull request #1 from theres/master

PCurlResponse with body & headers

1 files changed, 11 insertions, 3 deletions

diff --git a/src/PurpleCode/PCurl/PCurl.php b/src/PurpleCode/PCurl/PCurl.php
index 4c2a428..4e9d4b6 100644
--- a/src/PurpleCode/PCurl/PCurl.php
+++ b/src/PurpleCode/PCurl/PCurl.php
@@ -12,8 +12,10 @@
 namespace PurpleCode\PCurl;

 

 require_once 'PCurlException.php';

+require_once 'PCurlResponse.php';

 

 use PurpleCode\PCurl\PCurlException;

+use PurpleCode\PCurl\PCurlResponse;

 

 class PCurl {

 

@@ -38,8 +40,8 @@ class PCurl {
     $this->setOption(CURLOPT_SSL_VERIFYPEER, true);

     // should curl_exec return response, not print it on stdout

     $this->setOption(CURLOPT_RETURNTRANSFER, true);

-    // should not include headers in response

-    $this->setOption(CURLOPT_HEADER, 0);

+    // should include headers in response

+    $this->setOption(CURLOPT_HEADER, 1);

   }

 

   /**

@@ -103,8 +105,14 @@ class PCurl {
       curl_close($curl);

       throw new PCurlException($error);

     }

+

+    $header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);

     curl_close($curl);

-    return $response;

+

+    $header = substr($response, 0, $header_size);

+    $body = substr($response, $header_size);

+

+    return new PCurlResponse($header, $body);

   }

 

   /**