Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #137138 by jvandyk: fixed problem with drupal_http_request() not setting the proper error code when a network effect occurs. Causes the XML-RPC backend to fail. 

Backport from HEAD.
5.x
Neil Drumm 2007-04-19 02:05:15 +00:00
parent 698ccae8cd
commit 565deb4f64
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/common.inc
View File

@ -429,6 +429,7 @@ function drupal_http_request($url, $headers = array(), $method = 'GET', $data =
// Make sure the socket opened properly. // Make sure the socket opened properly.
if (!$fp) { if (!$fp) {
$result->error = trim($errno .' '. $errstr); $result->error = trim($errno .' '. $errstr);
$result->code = -$errno;
return $result; return $result;
} }

2
includes/xmlrpc.inc
View File

@ -440,7 +440,7 @@ function _xmlrpc() {
$xmlrpc_request = xmlrpc_request($method, $args); $xmlrpc_request = xmlrpc_request($method, $args);
$result = drupal_http_request($url, array("Content-Type" => "text/xml"), 'POST', $xmlrpc_request->xml); $result = drupal_http_request($url, array("Content-Type" => "text/xml"), 'POST', $xmlrpc_request->xml);
if ($result->code != 200) { if ($result->code != 200) {
xmlrpc_error(-$result->code, $result->error); xmlrpc_error($result->code, $result->error);
return FALSE; return FALSE;
} }
$message = xmlrpc_message($result->data); $message = xmlrpc_message($result->data);