summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2007-10-01 14:17:39 +0200
committerDerek Allard <derek.allard@ellislab.com>2007-10-01 14:17:39 +0200
commit59c26339c0dbf262116c9f1c562bc07034a9ed74 (patch)
treee3e19e9edaff702db1ec6ce26d244cc59404eb6e
parent85f95463c3a46ca53c5588b6f4e0b67e281f8db1 (diff)
Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
-rw-r--r--system/libraries/Session.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 819c3f5ef..9dd277073 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -220,7 +220,7 @@ class CI_Session {
}
// Does the User Agent Match?
- if ($this->CI->config->item('sess_match_useragent') == TRUE AND $session['user_agent'] != substr($this->CI->input->user_agent(), 0, 50))
+ if ($this->CI->config->item('sess_match_useragent') == TRUE AND trim($session['user_agent']) != trim(substr($this->CI->input->user_agent(), 0, 50)))
{
$this->sess_destroy();
return FALSE;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 06215f732..78e1ecb82 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -75,6 +75,7 @@ Change Log
<li>Documented the timezones() function in the <a href="./helpers/date_helper.html">Date Helper</a>.</li>
<li>Documented unset_userdata in the <a href="./libraries/sessions.html">Session class</a>.</li>
<li>Fixed a bug in <a href="./libraries/validation.html">Validation</a> where valid_ip() wasn't called properly</li>
+ <li>Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space. </li>
<li>Fixed a bug in database driver where num_rows property wasn't getting updated.</li>
<li>Fixed a bug in captcha calling an invalid PHP function.</li>
<li>Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.</li>