diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-29 21:41:41 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-29 21:41:41 +0200 |
| commit | 8969dd88b7a4c3e60cee10ad4094dcd05de62965 (patch) | |
| tree | 04fff6aa504af1451eebca510ea605cfe3e498d0 /Http/AccessMap.php | |
| parent | 83cd64d415724127bd0db09ef1431e19a53afdea (diff) | |
| parent | 974b6da0d0f1f602f80280604eff38a829c23814 (diff) | |
| download | symfony-security-8969dd88b7a4c3e60cee10ad4094dcd05de62965.zip symfony-security-8969dd88b7a4c3e60cee10ad4094dcd05de62965.tar.gz symfony-security-8969dd88b7a4c3e60cee10ad4094dcd05de62965.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
fixed Client when using the terminable event
Fix problem with Windows file links (backslash in JavaScript string)
[Security] fixed wrong phpdoc
[Routing] removed extra argument
[HttpFoundation] Header `HTTP_X_FORWARDED_PROTO` can contain various values Some proxies use `ssl` instead of `https`, as well as Lighttpd mod_proxy allows value chaining (`https, http`, where `https` is always first when request is encrypted).
Added doc comments
Conflicts:
src/Symfony/Component/HttpFoundation/Request.php
Diffstat (limited to 'Http/AccessMap.php')
| -rw-r--r-- | Http/AccessMap.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Http/AccessMap.php b/Http/AccessMap.php index de78e15..051a8c2 100644 --- a/Http/AccessMap.php +++ b/Http/AccessMap.php @@ -36,6 +36,9 @@ class AccessMap implements AccessMapInterface $this->map[] = array($requestMatcher, $roles, $channel); } + /** + * {@inheritDoc} + */ public function getPatterns(Request $request) { foreach ($this->map as $elements) { |