Issue #1862512 by Berdir, YesCT: Convert drupal_http_request() usage in xmlrpc.module to Guzzle.

core/modules/xmlrpc/xmlrpc.inc

@@ -11,6 +11,9 @@
  * This version is made available under the GNU GPL License
  */
 
+use Guzzle\Http\Exception\BadResponseException;
+use Guzzle\Http\Exception\RequestException;
+
 /**
  * Turns a data structure into objects with 'data' and 'type' attributes.
  *
@@ -526,15 +529,15 @@ function xmlrpc_base64_get_xml($xmlrpc_base64) {
 /**
  * Performs one or more XML-RPC requests.
  *
- * @param $url
+ * @param string $url
  *   An absolute URL of the XML-RPC endpoint, e.g.,
  *   http://example.com/xmlrpc.php
- * @param $args
+ * @param array $args
  *   An associative array whose keys are the methods to call and whose values
  *   are the arguments to pass to the respective method. If multiple methods
  *   are specified, a system.multicall is performed.
- * @param $options
- *   (optional) An array of options to pass along to drupal_http_request().
+ * @param array $headers
+ *   (optional) An array of HTTP headers to pass along.
  *
  * @return
  *   A single response (single request) or an array of responses (multicall
@@ -543,7 +546,7 @@ function xmlrpc_base64_get_xml($xmlrpc_base64) {
  *   is returned, see xmlrpc_errno() and xmlrpc_error_msg() to get more
  *   information.
  */
-function _xmlrpc($url, $args, $options = array()) {
+function _xmlrpc($url, array $args, array $headers = array()) {
   xmlrpc_clear_error();
   if (count($args) > 1) {
     $multicall_args = array();
@@ -558,16 +561,21 @@ function _xmlrpc($url, $args, $options = array()) {
     $args = $args[$method];
   }
   $xmlrpc_request = xmlrpc_request($method, $args);
-  // Required options which will replace any that are passed in.
-  $options['method'] = 'POST';
-  $options['headers']['Content-Type'] = 'text/xml';
-  $options['data'] = $xmlrpc_request->xml;
-  $result = drupal_http_request($url, $options);
-  if ($result->code != 200) {
-    xmlrpc_error($result->code, $result->error);
+  $request = Drupal::httpClient()->post($url, $headers, $xmlrpc_request->xml);
+  $request->setHeader('Content-Type', 'text/xml');
+  try {
+    $response = $request->send();
+  }
+  catch (BadResponseException $exception) {
+    $response = $exception->getResponse();
+    xmlrpc_error($response->getStatusCode(), $response->getReasonPhrase());
+    return FALSE;
+  }
+  catch (RequestException $exception) {
+    xmlrpc_error(NULL, $exception->getMethod());
     return FALSE;
   }
-  $message = xmlrpc_message($result->data);
+  $message = xmlrpc_message($response->getBody(TRUE));
   // Now parse what we've got back
   if (!xmlrpc_message_parse($message)) {
     // XML error

core/modules/xmlrpc/xmlrpc.module

@@ -44,14 +44,14 @@ function xmlrpc_menu() {
  * ));
  * @endcode
  *
- * @param $url
+ * @param string $url
  *   An absolute URL of the XML-RPC endpoint.
- * @param $args
+ * @param array $args
  *   An associative array whose keys are the methods to call and whose values
  *   are the arguments to pass to the respective method. If multiple methods
  *   are specified, a system.multicall is performed.
- * @param $options
- *   (optional) An array of options to pass along to drupal_http_request().
+ * @param array $headers
+ *   (optional) An array of headers to pass along.
  *
  * @return
  *   For one request:
@@ -62,7 +62,7 @@ function xmlrpc_menu() {
  *     returned by the method called, or an xmlrpc_error object if the call
  *     failed. See xmlrpc_error().
  */
-function xmlrpc($url, $args, $options = array()) {
+function xmlrpc($url, array $args, array $headers = array()) {
   module_load_include('inc', 'xmlrpc');
-  return _xmlrpc($url, $args, $options);
+  return _xmlrpc($url, $args, $headers);
 }