GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

HTTPClient::quickGet now supports headers as argument

Browse Source 
They should be in a numeric array, already formatted as headers,
ready to go. (Header-Name: Content of the header)
This commit is contained in:
Mikael Nordfeldth 2016-03-24 02:44:11 +01:00
parent be22886be8
commit 9fa18fa366
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/httpclient.php
View File

@ -38,7 +38,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
* *
* This extends the HTTP_Request2_Response class with methods to get info * This extends the HTTP_Request2_Response class with methods to get info
* about any followed redirects. * about any followed redirects.
* *
* Originally used the name 'HTTPResponse' to match earlier code, but * Originally used the name 'HTTPResponse' to match earlier code, but
* this conflicts with a class in in the PECL HTTP extension. * this conflicts with a class in in the PECL HTTP extension.
* *
@ -119,7 +119,7 @@ class HTTPClient extends HTTP_Request2
$this->config['connect_timeout'] = common_config('http', 'connect_timeout') ?: $this->config['connect_timeout']; $this->config['connect_timeout'] = common_config('http', 'connect_timeout') ?: $this->config['connect_timeout'];
$this->config['max_redirs'] = 10; $this->config['max_redirs'] = 10;
$this->config['follow_redirects'] = true; $this->config['follow_redirects'] = true;
// We've had some issues with keepalive breaking with // We've had some issues with keepalive breaking with
// HEAD requests, such as to youtube which seems to be // HEAD requests, such as to youtube which seems to be
// emitting chunked encoding info for an empty body // emitting chunked encoding info for an empty body
@ -151,7 +151,7 @@ class HTTPClient extends HTTP_Request2
foreach (array('host', 'port', 'user', 'password', 'auth_scheme') as $cf) { foreach (array('host', 'port', 'user', 'password', 'auth_scheme') as $cf) {
$k = 'proxy_'.$cf; $k = 'proxy_'.$cf;
$v = common_config('http', $k); $v = common_config('http', $k);
if (!empty($v)) { if (!empty($v)) {
$this->config[$k] = $v; $this->config[$k] = $v;
} }
@ -173,7 +173,7 @@ class HTTPClient extends HTTP_Request2
/** /**
* Quick static function to GET a URL * Quick static function to GET a URL
*/ */
public static function quickGet($url, $accept=null, $params=array()) public static function quickGet($url, $accept=null, array $params=array(), array $headers=array())
{ {
if (!empty($params)) { if (!empty($params)) {
$params = http_build_query($params, null, '&'); $params = http_build_query($params, null, '&');
@ -188,7 +188,7 @@ class HTTPClient extends HTTP_Request2
if (!is_null($accept)) { if (!is_null($accept)) {
$client->setHeader('Accept', $accept); $client->setHeader('Accept', $accept);
} }
$response = $client->get($url); $response = $client->get($url, $headers);
if (!$response->isOk()) { if (!$response->isOk()) {
// TRANS: Exception. %s is the URL we tried to GET. // TRANS: Exception. %s is the URL we tried to GET.
throw new Exception(sprintf(_m('Could not GET URL %s.'), $url), $response->getStatus()); throw new Exception(sprintf(_m('Could not GET URL %s.'), $url), $response->getStatus());
@ -262,10 +262,16 @@ class HTTPClient extends HTTP_Request2
} }
/** /**
* @param string $url The URL including possible querystring
* @param string $method The HTTP method to use
* @param array $headers List of already formatted strings
* (not an associative array, to allow
* multiple same-named headers)
*
* @return GNUsocial_HTTPResponse * @return GNUsocial_HTTPResponse
* @throws HTTP_Request2_Exception * @throws HTTP_Request2_Exception
*/ */
protected function doRequest($url, $method, $headers) protected function doRequest($url, $method, array $headers=array())
{ {
$this->setUrl($url); $this->setUrl($url);
@ -278,10 +284,8 @@ class HTTPClient extends HTTP_Request2
} }
$this->setMethod($method); $this->setMethod($method);
if ($headers) { foreach ($headers as $header) {
foreach ($headers as $header) { $this->setHeader($header);
$this->setHeader($header);
}
} }
$response = $this->send(); $response = $this->send();
if (is_null($response)) { if (is_null($response)) {
@ -290,7 +294,7 @@ class HTTPClient extends HTTP_Request2
} }
return $response; return $response;
} }
protected function log($level, $detail) { protected function log($level, $detail) {
$method = $this->getMethod(); $method = $this->getMethod();
$url = $this->getUrl(); $url = $this->getUrl();
@ -334,8 +338,8 @@ class HTTPClient extends HTTP_Request2
throw $e; throw $e;
} }
$code = $response->getStatus(); $code = $response->getStatus();
$effectiveUrl = $response->getEffectiveUrl(); $effectiveUrl = $response->getEffectiveUrl();
$redirUrls[] = $effectiveUrl; $redirUrls[] = $effectiveUrl;
$response->redirUrls = $redirUrls; $response->redirUrls = $redirUrls;
if ($code >= 200 && $code < 300) { if ($code >= 200 && $code < 300) {
$reason = $response->getReasonPhrase(); $reason = $response->getReasonPhrase();
@ -343,7 +347,7 @@ class HTTPClient extends HTTP_Request2
} elseif ($code >= 300 && $code < 400) { } elseif ($code >= 300 && $code < 400) {
$url = $this->getUrl(); $url = $this->getUrl();
$target = $response->getHeader('Location'); $target = $response->getHeader('Location');
if (++$redirs >= $maxRedirs) { if (++$redirs >= $maxRedirs) {
common_log(LOG_ERR, __CLASS__ . ": Too many redirects: skipping $code redirect from $url to $target"); common_log(LOG_ERR, __CLASS__ . ": Too many redirects: skipping $code redirect from $url to $target");
break; break;