diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-11-23 03:08:34 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-11-23 03:08:34 +0000 |
| commit | 7aab0ab3680734e2973ce66da5486e1e6f233605 (patch) | |
| tree | 8c8e5a879e4f38f3e0574210ad53cc1b38b50da9 /includes/bootstrap.inc | |
| parent | 952445f5abb3dcd93a3eb208c6b90f1bb4624d7e (diff) | |
| download | brdo-7aab0ab3680734e2973ce66da5486e1e6f233605.tar.gz brdo-7aab0ab3680734e2973ce66da5486e1e6f233605.tar.bz2 | |
- Patch #557298 by Arancaytar, David_Rothstein: drupal_override_server_variables() does not properly override SCRIPT_NAME.
Diffstat (limited to 'includes/bootstrap.inc')
| -rw-r--r-- | includes/bootstrap.inc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 3c550b759..9060a0e20 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -443,21 +443,23 @@ function conf_path($require_settings = TRUE, $reset = FALSE) { * @see ip_address() */ function drupal_override_server_variables($variables = array()) { - // Set defaults based on the provided URL. + // Allow the provided URL to override any existing values in $_SERVER. if (isset($variables['url'])) { $url = parse_url($variables['url']); + if (isset($url['host'])) { + $_SERVER['HTTP_HOST'] = $url['host']; + } + if (isset($url['path'])) { + $_SERVER['SCRIPT_NAME'] = $url['path']; + } unset($variables['url']); } - else { - $url = array(); - } - $url += array( - 'path' => '', - 'host' => 'localhost', - ); + // Define default values for $_SERVER keys. These will be used if $_SERVER + // does not already define them and no other values are passed in to this + // function. $defaults = array( - 'HTTP_HOST' => $url['host'], - 'SCRIPT_NAME' => $url['path'], + 'HTTP_HOST' => 'localhost', + 'SCRIPT_NAME' => NULL, 'REMOTE_ADDR' => '127.0.0.1', 'REQUEST_METHOD' => 'GET', 'SERVER_NAME' => NULL, |