Browse Source

Merge pull request #1850 from rk/patch-1

Check application.ssl when setting a secure cookie
Taylor Otwell 11 years ago
parent
commit
936160f907
1 changed files with 4 additions and 0 deletions
  1. 4 0
      laravel/cookie.php

+ 4 - 0
laravel/cookie.php

@@ -82,6 +82,10 @@ class Cookie {
 
 		$value = static::hash($value).'+'.$value;
 
+		// If the developer has explicitly disabled SLL, then we shouldn't force
+		// this cookie over SSL.
+		$secure = $secure && Config::get('application.ssl');
+
 		// If the secure option is set to true, yet the request is not over HTTPS
 		// we'll throw an exception to let the developer know that they are
 		// attempting to send a secure cookie over the insecure HTTP.