@@ -33,8 +33,9 @@ class EpiCurl public function addCurl($ch) { - $key = (string)$ch; + $key = $this->getKey($ch); $this->requests[$key] = $ch; + curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, 'headerCallback')); $code = curl_multi_add_handle($this->mc, $ch); @@ -78,7 +79,7 @@ class EpiCurl $innerSleepInt = 1; } $this->storeResponses(); - if(isset($this->responses[$key])) + if(isset($this->responses[$key]['data'])) { return $this->responses[$key]; } @@ -89,6 +90,24 @@ class EpiCurl return false; } + private function getKey($ch) + { + return (string)$ch; + } + + private function headerCallback($ch, $header) + { + $_header = trim($header); + $colonPos= strpos($_header, ':'); + if($colonPos > 0) + { + $key = substr($_header, 0, $colonPos); + $val = preg_replace('/^\W+/','',substr($_header, $colonPos)); + $this->responses[$this->getKey($ch)]['headers'][$key] = $val; + } + return strlen($header); + } + private function storeResponses() { while($done = curl_multi_info_read($this->mc)) EpiCurl.php @@ -33,7 +33,7 @@ class EpiTwitter extends EpiOAuth // calls which do not have a consumerKey are assumed to not require authentication if($this->consumerKey === null) { - $query = isset($args) ? http_build_query($args, '', '&') : ''; + $query = !is_null($args) ? http_build_query($args, '', '&') : ''; $url = (preg_match('@^/(search|trends)@', $path) ? $this->searchUrl : $this->apiUrl) . "{$path}?{$query}"; $ch = curl_init($url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -131,7 +131,7 @@ class EpiTwitterJson implements ArrayAccess, Countable, IteratorAggregate public function __get($name) { - if(($this->__resp->code < 200 || $this->__resp->code >= 400) && $name !== 'responseText') + if(($this->__resp->code < 200 || $this->__resp->code >= 400) && $name !== 'responseText' && $name !== 'headers') // TODO: clean up { switch($this->__auth) { @@ -146,6 +146,7 @@ class EpiTwitterJson implements ArrayAccess, Countable, IteratorAggregate $this->responseText = $this->__resp->data; $this->code = $this->__resp->code; + $this->headers = $this->__resp->headers; $this->response = json_decode($this->responseText, 1); $this->__obj = json_decode($this->responseText); EpiTwitter.php @@ -295,4 +295,10 @@ class EpiTwitterTest extends PHPUnit_Framework_TestCase $resp2 = $this->twitterObj->get_accountVerify_credentials(); $this->assertEquals($status, $resp2->status->text, 'The destructor did not ensure that the status was updated'); } + + function testHeaders() + { + $resp = $this->twitterObj->get_statusesFollowers(); + $this->assertTrue(!empty($resp->headers['Status']), 'header status response should not be empty'); + } } tests/EpiTwitterTest.php d5b21a57314748e436b4cc95d650be1760112c3d Jaisen Mathai jaisen@jmathai.com http://github.com/jmathai/twitter-async/commit/5ce7b8af93fff122c1739b9a9e88df592eaa47ba 5ce7b8af93fff122c1739b9a9e88df592eaa47ba 2009-09-29T22:58:12-07:00 2009-09-29T22:58:12-07:00 Added support for accessing the response headers. Closes gh-24 c051623839cf2141ce5c55bc2d5ed9a79dcf0670 Jaisen Mathai jaisen@jmathai.com