gzip support; default request headers; customizable timeout; basic authentication; bugfixes; closes #5 #15 #16 #18
This commit is contained in:
@@ -5,15 +5,46 @@ use Unirest\HttpResponse;
|
||||
|
||||
class Unirest
|
||||
{
|
||||
|
||||
private static $socketTimeout = null;
|
||||
private static $defaultHeaders = array();
|
||||
|
||||
/**
|
||||
* Set a timeout
|
||||
* @param integer $seconds Timeout value in seconds
|
||||
*/
|
||||
public static function timeout($seconds) {
|
||||
Unirest::$socketTimeout = $seconds;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set a new default header to send on every request
|
||||
* @param string $name Header name
|
||||
* @param string $value Header value
|
||||
*/
|
||||
public static function defaultHeader($name, $value) {
|
||||
Unirest::$defaultHeaders[$name] = $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear all the default headers
|
||||
*/
|
||||
public static function clearDefaultHeaders() {
|
||||
Unirest::$defaultHeaders = array();
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a GET request to a URL
|
||||
* @param string $url URL to send the GET request to
|
||||
* @param array $headers Additional headers to send
|
||||
* @param mixed $parameters Parameters to send in the querystring
|
||||
* @param string $username Basic Authentication username
|
||||
* @param string $password Basic Authentication password
|
||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
||||
*/
|
||||
public static function get($url, $headers = array())
|
||||
public static function get($url, $headers = array(), $parameters = NULL, $username = NULL, $password = NULL)
|
||||
{
|
||||
return Unirest::request(HttpMethod::GET, $url, NULL, $headers);
|
||||
return Unirest::request(HttpMethod::GET, $url, $parameters, $headers, $username, $password);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -21,22 +52,27 @@ class Unirest
|
||||
* @param string $url URL to send the POST request to
|
||||
* @param array $headers Additional headers to send
|
||||
* @param mixed $body POST body data
|
||||
* @param string $username Basic Authentication username
|
||||
* @param string $password Basic Authentication password
|
||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
||||
*/
|
||||
public static function post($url, $headers = array(), $body = NULL)
|
||||
public static function post($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
|
||||
{
|
||||
return Unirest::request(HttpMethod::POST, $url, $body, $headers);
|
||||
return Unirest::request(HttpMethod::POST, $url, $body, $headers, $username, $password);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send DELETE request to a URL
|
||||
* @param string $url URL to send the DELETE request to
|
||||
* @param array $headers Additional headers to send
|
||||
* @param mixed $body DELETE body data
|
||||
* @param string $username Basic Authentication username
|
||||
* @param string $password Basic Authentication password
|
||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
||||
*/
|
||||
public static function delete($url, $headers = array())
|
||||
public static function delete($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
|
||||
{
|
||||
return Unirest::request(HttpMethod::DELETE, $url, NULL, $headers);
|
||||
return Unirest::request(HttpMethod::DELETE, $url, $body, $headers, $username, $password);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -44,11 +80,13 @@ class Unirest
|
||||
* @param string $url URL to send the PUT request to
|
||||
* @param array $headers Additional headers to send
|
||||
* @param mixed $body PUT body data
|
||||
* @param string $username Basic Authentication username
|
||||
* @param string $password Basic Authentication password
|
||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
||||
*/
|
||||
public static function put($url, $headers = array(), $body = NULL)
|
||||
public static function put($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
|
||||
{
|
||||
return Unirest::request(HttpMethod::PUT, $url, $body, $headers);
|
||||
return Unirest::request(HttpMethod::PUT, $url, $body, $headers, $username, $password);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,11 +94,19 @@ class Unirest
|
||||
* @param string $url URL to send the PATCH request to
|
||||
* @param array $headers Additional headers to send
|
||||
* @param mixed $body PATCH body data
|
||||
* @param string $username Basic Authentication username
|
||||
* @param string $password Basic Authentication password
|
||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
||||
*/
|
||||
public static function patch($url, $headers = array(), $body = NULL)
|
||||
public static function patch($url, $headers = array(), $body = NULL, $username = NULL, $password = NULL)
|
||||
{
|
||||
return Unirest::request(HttpMethod::PATCH, $url, $body, $headers);
|
||||
return Unirest::request(HttpMethod::PATCH, $url, $body, $headers, $username, $password);
|
||||
}
|
||||
|
||||
private static function getHeader($key, $val) {
|
||||
$key = trim(strtolower($key));
|
||||
if ($key == "user-agent" || $key == "expect") continue;
|
||||
return $key . ": " . $val;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -69,38 +115,61 @@ class Unirest
|
||||
* @param string $url URL to send the request to
|
||||
* @param mixed $body Request body
|
||||
* @param array $headers Additional headers to send
|
||||
* @param string $username Basic Authentication username
|
||||
* @param string $password Basic Authentication password
|
||||
* @throws Exception If a cURL error occurs
|
||||
* @return \Unireset\HttpResponse \Unirest\HttpResponse object
|
||||
*/
|
||||
private static function request($httpMethod, $url, $body = NULL, $headers = array())
|
||||
private static function request($httpMethod, $url, $body = NULL, $headers = array(), $username = NULL, $password = NULL)
|
||||
{
|
||||
if ($headers == NULL) $headers = array();
|
||||
$lowercaseHeaders = array();
|
||||
foreach ($headers as $key => $val) {
|
||||
$key = trim(strtolower($key));
|
||||
if ($key == "user-agent" || $key == "expect") continue;
|
||||
$lowercaseHeaders[] = $key . ": " . $val;
|
||||
$lowercaseHeaders[] = Unirest::getHeader($key, $val);
|
||||
}
|
||||
$lowercaseHeaders[] = "user-agent: unirest-php/1.0";
|
||||
foreach (Unirest::$defaultHeaders as $key => $val) {
|
||||
$lowercaseHeaders[] = Unirest::getHeader($key, $val);
|
||||
}
|
||||
|
||||
$lowercaseHeaders[] = "user-agent: unirest-php/1.1";
|
||||
$lowercaseHeaders[] = "expect:";
|
||||
|
||||
|
||||
$ch = curl_init();
|
||||
if ($httpMethod != HttpMethod::GET) {
|
||||
curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);
|
||||
curl_setopt ($ch, CURLOPT_POSTFIELDS, $body);
|
||||
} else if (is_array($body)) {
|
||||
if (strpos($url,'?') !== false) {
|
||||
$url .= "&";
|
||||
} else {
|
||||
$url .= "?";
|
||||
}
|
||||
|
||||
foreach ($body as $parameter => $val) {
|
||||
$url .= $parameter . "=" . $val . "&";
|
||||
}
|
||||
$url = substr($url, 0, strlen($url) - 1);
|
||||
}
|
||||
|
||||
curl_setopt ($ch, CURLOPT_URL , Unirest::encodeUrl($url));
|
||||
|
||||
curl_setopt ($ch, CURLOPT_URL, Unirest::encodeUrl($url));
|
||||
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, true);
|
||||
curl_setopt ($ch, CURLOPT_MAXREDIRS, 10);
|
||||
curl_setopt ($ch, CURLOPT_HTTPHEADER, $lowercaseHeaders);
|
||||
curl_setopt ($ch, CURLOPT_HEADER, true);
|
||||
curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false);
|
||||
curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, true);
|
||||
curl_setopt ($ch, CURLOPT_ENCODING, ""); // If an empty string, "", is set, a header containing all supported encoding types is sent.
|
||||
if (Unirest::$socketTimeout != null) {
|
||||
curl_setopt ($ch, CURLOPT_TIMEOUT, Unirest::$socketTimeout);
|
||||
}
|
||||
if (!empty($username)) {
|
||||
curl_setopt($ch, CURLOPT_USERPWD, $username . ":" . ((empty($password)) ? "" : $password));
|
||||
}
|
||||
|
||||
$response = curl_exec($ch);
|
||||
$error = curl_error($ch);
|
||||
if ($error) {
|
||||
throw new \Exception($error);
|
||||
throw new Exception($error);
|
||||
}
|
||||
|
||||
// Split the full response in its headers and body
|
||||
|
||||
Reference in New Issue
Block a user