From 52f7955416c1661ba8dc4ca14e4f910ad75604f2 Mon Sep 17 00:00:00 2001 From: Drak Date: Wed, 21 Mar 2012 12:53:00 +0545 Subject: [PATCH] [FrameworkBundle] Remove default from gc_* session configuration keys. --- CHANGELOG-2.1.md | 6 +++--- .../FrameworkBundle/DependencyInjection/Configuration.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md index 1082c244c8..fd07fb8193 100644 --- a/CHANGELOG-2.1.md +++ b/CHANGELOG-2.1.md @@ -52,9 +52,9 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c 'httponly' are now prefixed with cookie_ when dumped to the container * Added `handler_id` configuration under `session` key to represent `session.handler` service, defaults to `session.handler.native_file`. - * Added `gc_maxlifetime` (default 86400 seconds), `gc_probability` (default 1), - and `gc_divisor` (default 100) to session configuration. This means session - garbage collection has 1/100 chance of being run. The `gc_maxlifetime` means + * Added `gc_maxlifetime`, `gc_probability`, and `gc_divisor` to session + configuration.This means session garbage collection has a + `gc_probability`/`gc_divisor` chance of being run. The `gc_maxlifetime` means how long a session can idle for which is separate from cookie lifetime which defines how long a cookie can be store on the remote client. diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index a1b4ce7554..f96cd7dfbe 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -175,9 +175,9 @@ class Configuration implements ConfigurationInterface ->scalarNode('cookie_domain')->end() ->booleanNode('cookie_secure')->end() ->booleanNode('cookie_httponly')->end() - ->scalarNode('gc_divisor')->defaultValue(100)->end() - ->scalarNode('gc_probability')->defaultValue(1)->end() - ->scalarNode('gc_maxlifetime')->defaultValue(86400)->end() + ->scalarNode('gc_divisor')->end() + ->scalarNode('gc_probability')->end() + ->scalarNode('gc_maxlifetime')->end() ->scalarNode('lifetime')->setInfo('DEPRECATED! Please use: cookie_lifetime')->end() ->scalarNode('path')->setInfo('DEPRECATED! Please use: cookie_path')->end() ->scalarNode('domain')->setInfo('DEPRECATED! Please use: cookie_domain')->end()