From 7cae38d2980a26dbf68db115d289edb4982b01d1 Mon Sep 17 00:00:00 2001
From: Chris Leppanen <chris.leppanen@gmail.com>
Date: Tue, 5 Mar 2013 15:46:54 -0800
Subject: [PATCH] Ensure that headers is always set.
---
libraries/http_request.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libraries/http_request.inc b/libraries/http_request.inc
index ace2fb0e..0690f58e 100644
--- a/libraries/http_request.inc
+++ b/libraries/http_request.inc
@@ -139,6 +139,7 @@ function http_request_get($url, $username = NULL, $password = NULL, $accept_inva
if ($curl) {
$headers[] = 'User-Agent: Drupal (+http://drupal.org/)';
$result = new stdClass();
+ $result->headers = array();
// Parse the URL and make sure we can handle the schema.
// cURL can only support either http:// or https://.
@@ -194,7 +195,6 @@ function http_request_get($url, $username = NULL, $password = NULL, $accept_inva
$result->data = substr($data, $header_size);
$headers = preg_split("/(\r\n){2}/", $header);
$header_lines = preg_split("/\r\n|\n|\r/", end($headers));
- $result->headers = array();
array_shift($header_lines); // skip HTTP response status
while ($line = trim(array_shift($header_lines))) {
@@ -218,6 +218,7 @@ function http_request_get($url, $username = NULL, $password = NULL, $accept_inva
}
else {
$result = drupal_http_request($url, array('headers' => $headers, 'timeout' => $request_timeout));
+ $result->headers = isset($result->headers) ? $result->headers : array();
}
$result->code = isset($result->code) ? $result->code : 200;
--
GitLab