From 70af42a682ceb904d479e28b0e3d397f8c37fea9 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 26 Jan 2011 21:01:25 +0000
Subject: [PATCH] [gh-76] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@451 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
includes/unl_bootstrap.inc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/includes/unl_bootstrap.inc b/includes/unl_bootstrap.inc
index 513b05f8..183b31b4 100644
--- a/includes/unl_bootstrap.inc
+++ b/includes/unl_bootstrap.inc
@@ -39,6 +39,11 @@ function unl_bootstrap() {
$previous_script_name = $_SERVER['SCRIPT_NAME'];
}
+ if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && isset($_SERVER['HTTP_X_FORWARDED_PATH'])) {
+ $GLOBALS['base_url'] = 'http://' . $_SERVER['HTTP_X_FORWARDED_HOST'] . $_SERVER['HTTP_X_FORWARDED_PATH'];
+ $GLOBALS['cookie_domain'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
+ }
+
conf_path(TRUE, TRUE);
}
--
GitLab