diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/session.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index ab86ad11ce..780c6b9e14 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -214,15 +214,8 @@ class session $this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : ''; $this->referer = (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : ''; $this->forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : ''; -<<<<<<< .mine - $this->host = $this->get_validated_hostname(); -======= ->>>>>>> .r8847 -<<<<<<< .mine -======= $this->host = $this->extract_current_hostname(); ->>>>>>> .r8847 $this->page = $this->extract_current_page($phpbb_root_path); // if the forwarded for header shall be checked we have to validate its contents |