diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-11-20 14:24:23 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-11-20 14:24:23 +0100 |
commit | b3fc90d88bd2fe87ac8049c8e363c73781248866 (patch) | |
tree | e5b0e7a190fdda09c8d9d7c9f6aba84b2f067b4b /Http/Authentication | |
parent | e3edd18b37e848d4870c521f53746de8acb5eed1 (diff) | |
parent | 4fb524b3675e3fc507a841e82b3344be050f5030 (diff) | |
download | symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.zip symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.tar.gz symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.tar.bz2 |
Merge branch '2.5' into 2.6v2.6.0-BETA2
* 2.5:
[SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners
be smarter when guessing the document root
Azerbaijani locale
Fixed grammar error in docblock
Adjust upgrade file rendering
[Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions
compare version using PHP_VERSION_ID
[Form] Add doc for FormEvents
don't override internal PHP constants
[Session] Fix parameter names in WriteCheckSessionHandler
Add consistency with request type checking
[FrameworkBundle] Fix server run in case the router script does not exist
Conflicts:
composer.json
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Debug/ExceptionHandler.php
Diffstat (limited to 'Http/Authentication')
0 files changed, 0 insertions, 0 deletions