* @link http://status.net/
*/
-if (!defined('GNUSOCIAL')) {
- exit(1);
-}
-
-require_once 'HTTP/Request2.php';
-require_once 'HTTP/Request2/Response.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Useful structure for HTTP responses
*
* This extends the HTTP_Request2_Response class with methods to get info
* about any followed redirects.
- *
+ *
* Originally used the name 'HTTPResponse' to match earlier code, but
* this conflicts with a class in in the PECL HTTP extension.
*
}
/**
- * Gets the final target URL, after any redirects have been followed.
+ * Gets the target URL, before any redirects. Use getEffectiveUrl() for final target.
* @return string URL
*/
function getUrl()
{
- return $this->effectiveUrl;
+ return $this->url;
}
/**
function __construct($url=null, $method=self::METHOD_GET, $config=array())
{
+ if (is_int(common_config('http', 'timeout'))) {
+ // Reasonably you shouldn't set http/timeout to 0 because of
+ // malicious remote servers that can cause infinitely long
+ // responses... But the default in HTTP_Request2 is 0 for
+ // some reason and should probably be considered a valid value.
+ $this->config['timeout'] = common_config('http', 'timeout');
+ } else {
+ common_log(LOG_ERR, 'config option http/timeout is not an integer value: '._ve(common_config('http', 'timeout')));
+ }
+ if (!empty(common_config('http', 'connect_timeout'))) {
+ $this->config['connect_timeout'] = common_config('http', 'connect_timeout');
+ }
$this->config['max_redirs'] = 10;
$this->config['follow_redirects'] = true;
-
+
// We've had some issues with keepalive breaking with
// HEAD requests, such as to youtube which seems to be
// emitting chunked encoding info for an empty body
foreach (array('host', 'port', 'user', 'password', 'auth_scheme') as $cf) {
$k = 'proxy_'.$cf;
- $v = common_config('http', $k);
+ $v = common_config('http', $k);
if (!empty($v)) {
$this->config[$k] = $v;
}
/**
* 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)) {
$params = http_build_query($params, null, '&');
if (!is_null($accept)) {
$client->setHeader('Accept', $accept);
}
- $response = $client->get($url);
+ $response = $client->get($url, $headers);
if (!$response->isOk()) {
- // TRANS: Exception. %s is a profile URL.
+ // TRANS: Exception. %s is the URL we tried to GET.
throw new Exception(sprintf(_m('Could not GET URL %s.'), $url), $response->getStatus());
}
return $response->getBody();
return $data;
}
+ /**
+ * If you want an Accept header, put it in $headers
+ */
+ public static function quickHead($url, array $params=array(), array $headers=array())
+ {
+ if (!empty($params)) {
+ $params = http_build_query($params, null, '&');
+ if (strpos($url, '?') === false) {
+ $url .= '?' . $params;
+ } else {
+ $url .= '&' . $params;
+ }
+ }
+
+ $client = new HTTPClient();
+ $response = $client->head($url, $headers);
+ if (!$response->isOk()) {
+ // TRANS: Exception. %s is the URL we tried to GET.
+ throw new Exception(sprintf(_m('Could not GET URL %s.'), $url), $response->getStatus());
+ }
+ return $response->getHeader();
+ }
+
/**
* Convenience function to run a GET request.
*
}
/**
+ * @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
* @throws HTTP_Request2_Exception
*/
- protected function doRequest($url, $method, $headers)
+ protected function doRequest($url, $method, array $headers=array())
{
$this->setUrl($url);
}
$this->setMethod($method);
- if ($headers) {
- foreach ($headers as $header) {
- $this->setHeader($header);
- }
+ foreach ($headers as $header) {
+ $this->setHeader($header);
}
$response = $this->send();
+ if (is_null($response)) {
+ // TRANS: Failed to retrieve a remote web resource, %s is the target URL.
+ throw new NoHttpResponseException($url);
+ }
return $response;
}
-
+
protected function log($level, $detail) {
$method = $this->getMethod();
$url = $this->getUrl();
public function send()
{
$maxRedirs = intval($this->config['max_redirs']);
- if (empty($this->config['follow_redirects'])) {
+ if (empty($this->config['max_redirs'])) {
$maxRedirs = 0;
}
$redirs = 0;
+ $redirUrls = array();
do {
try {
$response = parent::send();
- } catch (HTTP_Request2_Exception $e) {
+ } catch (Exception $e) {
$this->log(LOG_ERR, $e->getMessage());
throw $e;
}
$code = $response->getStatus();
+ $effectiveUrl = $response->getEffectiveUrl();
+ $redirUrls[] = $effectiveUrl;
+ $response->redirUrls = $redirUrls;
if ($code >= 200 && $code < 300) {
$reason = $response->getReasonPhrase();
$this->log(LOG_INFO, "$code $reason");
} elseif ($code >= 300 && $code < 400) {
$url = $this->getUrl();
$target = $response->getHeader('Location');
-
+
if (++$redirs >= $maxRedirs) {
common_log(LOG_ERR, __CLASS__ . ": Too many redirects: skipping $code redirect from $url to $target");
break;
} while ($maxRedirs);
return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
}
-}
\ No newline at end of file
+}