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

- Patch #32440 by ax: drupal_http_request() doesn't send proper Host: header.

4.7.x
Dries Buytaert 2005-09-29 12:33:34 +00:00
parent 1d94bb4a87
commit bf08ab83b6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes/common.inc
View File

@ -332,11 +332,13 @@ function drupal_http_request($url, $headers = array(), $method = 'GET', $data =
$uri = parse_url($url); $uri = parse_url($url);
switch ($uri['scheme']) { switch ($uri['scheme']) {
case 'http': case 'http':
$fp = @fsockopen($uri['host'], ($uri['port'] ? $uri['port'] : 80), $errno, $errstr, 15); $port = $uri['port'] ? $uri['port'] : 80;
$fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
break; break;
case 'https': case 'https':
// Note: Only works for PHP 4.3 compiled with OpenSSL. // Note: Only works for PHP 4.3 compiled with OpenSSL.
$fp = @fsockopen('ssl://'. $uri['host'], ($uri['port'] ? $uri['port'] : 443), $errno, $errstr, 20); $port = $uri['port'] ? $uri['port'] : 443;
$fp = @fsockopen('ssl://'. $uri['host'], $port, $errno, $errstr, 20);
break; break;
default: default:
$result->error = 'invalid schema '. $uri['scheme']; $result->error = 'invalid schema '. $uri['scheme'];
@ -357,7 +359,8 @@ function drupal_http_request($url, $headers = array(), $method = 'GET', $data =
// Create HTTP request. // Create HTTP request.
$defaults = array( $defaults = array(
'Host' => 'Host: '. $uri['host'], // RFC 2616: "non-standard ports MUST, default ports MAY be included". We always add it.
'Host' => "Host: $uri[host]:$port",
'User-Agent' => 'User-Agent: Drupal (+http://www.drupal.org/)', 'User-Agent' => 'User-Agent: Drupal (+http://www.drupal.org/)',
'Content-Length' => 'Content-Length: '. strlen($data) 'Content-Length' => 'Content-Length: '. strlen($data)
); );