Fix issue #499 #1087
Merged
Fix issue #499 #1087
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -189,7 +191,7 @@ public function csrf_set_cookie() | |||
| $expire = time() + $this->_csrf_expire; | |||
| $secure_cookie = (bool) config_item('cookie_secure'); | |||
|
|
|||
| if ($secure_cookie && ( ! isset($_SERVER['HTTPS']) OR $_SERVER['HTTPS'] == 'off' OR ! $_SERVER['HTTPS'])) | |||
| if ($secure_cookie && (empty($_SERVER['HTTPS']) OR $_SERVER['HTTPS'] === 'off')) | |||
There was a problem hiding this comment.
Maybe it's an idea to declare a function that checks if HTTPS is true or false...
There was a problem hiding this comment.
I guess some people might find it useful, but the check performed is way too simple.
There was a problem hiding this comment.
Ok, I created a pull request for a is_https() function...
narfbg
added a commit
that referenced
this pull request
Mar 5, 2012
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Security class constructor used to initialize all CSRF-related properties and call
_csrf_set_hash()regardless of$config['csrf_protection']'s value.Also replaced an
! isset($var) OR ! $varexpression withempty($var)and removed a few spaces on the way.