[CORE][FRAMEWORK] URL_REGEX_VALID_PATH_CHARS didn't recognize the parenthesis sign.

[quix0rs-gnu-social.git] / lib / httpclient.php

diff --git a/lib/httpclient.php b/lib/httpclient.php
index bd182f8757384151b45b609290af1ce5651458ad..819a5e6e0799140646ac01aa8c76cd6e0b058608 100644 (file)
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -38,7 +38,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  *
  * 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.
  *
@@ -116,10 +116,21 @@ class HTTPClient extends HTTP_Request2
 
     function __construct($url=null, $method=self::METHOD_GET, $config=array())
     {
-        $this->config['connect_timeout'] = common_config('http', 'connect_timeout') ?: $this->config['connect_timeout'];
+        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
@@ -151,7 +162,7 @@ class HTTPClient extends HTTP_Request2
 
         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;
             }
@@ -173,7 +184,7 @@ class HTTPClient extends HTTP_Request2
     /**
      * 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, '&');
@@ -188,7 +199,7 @@ class HTTPClient extends HTTP_Request2
         if (!is_null($accept)) {
             $client->setHeader('Accept', $accept);
         }
-        $response = $client->get($url);
+        $response = $client->get($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());
@@ -206,6 +217,29 @@ class HTTPClient extends HTTP_Request2
         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.
      *
@@ -262,10 +296,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
      * @throws HTTP_Request2_Exception
      */
-    protected function doRequest($url, $method, $headers)
+    protected function doRequest($url, $method, array $headers=array())
     {
         $this->setUrl($url);
 
@@ -278,10 +318,8 @@ class HTTPClient extends HTTP_Request2
         }
 
         $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)) {
@@ -290,7 +328,7 @@ class HTTPClient extends HTTP_Request2
         }
         return $response;
     }
-    
+
     protected function log($level, $detail) {
         $method = $this->getMethod();
         $url = $this->getUrl();
@@ -334,16 +372,16 @@ class HTTPClient extends HTTP_Request2
                 throw $e;
             }
             $code = $response->getStatus();
-            $effectiveUrl = $response->getEffectiveUrl();            
-            $redirUrls[] = $effectiveUrl;       
+            $effectiveUrl = $response->getEffectiveUrl();
+            $redirUrls[] = $effectiveUrl;
             $response->redirUrls = $redirUrls;
             if ($code >= 200 && $code < 300) {
                 $reason = $response->getReasonPhrase();
-                $this->log(LOG_INFO, "$code $reason - Effective URL: ".$response->getEffectiveUrl().' – redirect: '.json_encode($response->isRedirect()));
+                $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;
@@ -355,8 +393,6 @@ class HTTPClient extends HTTP_Request2
                     continue;
                 } catch (HTTP_Request2_Exception $e) {
                     common_log(LOG_ERR, __CLASS__ . ": Invalid $code redirect from $url to $target");
-                } catch (NoHttpResponseException $e) {
-                    common_log(LOG_ERR, __CLASS__ . ": {$e->getMessage()}");
                 }
             } else {
                 $reason = $response->getReasonPhrase();
@@ -366,4 +402,4 @@ class HTTPClient extends HTTP_Request2
         } while ($maxRedirs);
         return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
     }
-}
\ No newline at end of file
+}