diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 01bde018396..a537e4fd67c 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -10,6 +10,8 @@ use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Guzzle\Http\Exception\RequestException; + /** * @file * API functions for installing Drupal. @@ -1445,7 +1447,7 @@ function install_download_translation(&$install_state) { } /** - * Attempts to get a file using drupal_http_request and to store it locally. + * Attempts to get a file using a HTTP request and to store it locally. * * @param string $uri * The URI of the file to grab. @@ -1467,14 +1469,18 @@ function install_retrieve_file($uri, $destination) { else { $path = $destination; } - $result = drupal_http_request($uri); - if ($result->code != 200) { + + try { + $request = drupal_container()->get('http_default_client')->get($uri, array('Accept' => 'text/plain')); + $data = $request->send()->getBody(TRUE); + if (empty($data)) { + return FALSE; + } + } + catch (RequestException $e) { return FALSE; } - if (file_put_contents($path, $result->data) === FALSE) { - return FALSE; - } - return TRUE; + return file_put_contents($path, $data) !== FALSE; } /** @@ -1484,12 +1490,17 @@ function install_retrieve_file($uri, $destination) { * The URI to contact. * * @return string - * URI of the server if the localization server was contacted successfully. - * FALSE if not. + * TRUE if the URI was contacted successfully, FALSE if not. */ function install_check_localization_server($uri) { - $result = drupal_http_request($uri, array('method' => 'HEAD')); - return (!isset($result->error) && $result->code == 200); + try { + $request = drupal_container()->get('http_default_client')->head($uri); + $response = $request->send(); + return TRUE; + } + catch (RequestException $e) { + return FALSE; + } } /**