diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-29 21:43:28 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-29 21:43:28 +0200 |
| commit | 46c7d3e11f3ab534ce84dfaeadd7c2870dba1a36 (patch) | |
| tree | 742f5653e60dddcd960331a77dedaf50fb602b75 /Http/Firewall.php | |
| parent | a940d57cac60a12146e2fd1cd543c59109105ad9 (diff) | |
| parent | 8969dd88b7a4c3e60cee10ad4094dcd05de62965 (diff) | |
| download | symfony-security-46c7d3e11f3ab534ce84dfaeadd7c2870dba1a36.zip symfony-security-46c7d3e11f3ab534ce84dfaeadd7c2870dba1a36.tar.gz symfony-security-46c7d3e11f3ab534ce84dfaeadd7c2870dba1a36.tar.bz2 | |
Merge branch '2.3'
* 2.3:
fixed Client when using the terminable event
Fix problem with Windows file links (backslash in JavaScript string)
[Security] fixed wrong phpdoc
[DependencyInjection] Prevented inlining of lazy loaded private service definitions.
[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/Routing/Router.php
src/Symfony/Component/Security/Http/Firewall.php
Diffstat (limited to 'Http/Firewall.php')
| -rw-r--r-- | Http/Firewall.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Http/Firewall.php b/Http/Firewall.php index 5a1e9d5..98fda5e 100644 --- a/Http/Firewall.php +++ b/Http/Firewall.php @@ -84,6 +84,9 @@ class Firewall implements EventSubscriberInterface } } + /** + * {@inheritDoc} + */ public static function getSubscribedEvents() { return array( |