[gh-127] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@733 20a16fea-79d4-4915-8869-1ea9d5ebf173

includes/unl_bootstrap.inc

@@ -39,9 +39,11 @@ function unl_bootstrap() {
     $previous_script_name = $_SERVER['SCRIPT_NAME'];
   }
   
+  // Fix some paths when used through a ProxyPass
   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'];
+    $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_FORWARDED_PATH'] . '/' . request_path();
   }
   
   conf_path(TRUE, TRUE);