mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-25 04:23:38 +01:00
gah, thanks chris. :)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8850 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
619be99cf4
commit
da402759ab
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user