Merge pull request #12 from samsullivan/master

Fix for class collision
This commit is contained in:
Marco Palladino
2013-07-23 11:50:46 -07:00
3 changed files with 14 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
<?php <?php namespace Unirest;
class HttpMethod class HttpMethod
{ {
const DELETE = "DELETE"; const DELETE = "DELETE";

View File

@@ -1,4 +1,4 @@
<?php <?php namespace Unirest;
class HttpResponse class HttpResponse
{ {
private $code; private $code;
@@ -62,13 +62,13 @@ class HttpResponse
*/ */
private function get_headers_from_curl_response($headers) private function get_headers_from_curl_response($headers)
{ {
foreach (explode("\r\n", $headers) as $i => $line) { $headers = explode("\r\n", $headers);
if ($i !== 0) { array_shift($headers);
if (!empty($key) && substr($key, 0, 4) != "HTTP") {
$result[$key] = $value; foreach ($headers as $line) {
} else { if (strstr($line, ': ')) {
list ($key, $value) = explode(': ', $line); list ($key, $value) = explode(': ', $line);
} $result[$key] = $value;
} }
} }

View File

@@ -1,4 +1,8 @@
<?php <?php
use Unirest\HttpMethod;
use Unirest\HttpResponse;
class Unirest class Unirest
{ {
/** /**