File tree Expand file tree Collapse file tree 2 files changed +14
-4
lines changed Expand file tree Collapse file tree 2 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -126,14 +126,12 @@ public static function create($sessionConfig = []) {
126
126
protected static function _defaultConfig ($ name ) {
127
127
$ defaults = array (
128
128
'php ' => array (
129
- 'checkAgent ' => false ,
130
129
'cookie ' => 'CAKEPHP ' ,
131
130
'ini ' => array (
132
131
'session.use_trans_sid ' => 0 ,
133
132
)
134
133
),
135
134
'cake ' => array (
136
- 'checkAgent ' => false ,
137
135
'cookie ' => 'CAKEPHP ' ,
138
136
'ini ' => array (
139
137
'session.use_trans_sid ' => 0 ,
@@ -145,7 +143,6 @@ protected static function _defaultConfig($name) {
145
143
)
146
144
),
147
145
'cache ' => array (
148
- 'checkAgent ' => false ,
149
146
'cookie ' => 'CAKEPHP ' ,
150
147
'ini ' => array (
151
148
'session.use_trans_sid ' => 0 ,
@@ -159,7 +156,6 @@ protected static function _defaultConfig($name) {
159
156
)
160
157
),
161
158
'database ' => array (
162
- 'checkAgent ' => false ,
163
159
'cookie ' => 'CAKEPHP ' ,
164
160
'ini ' => array (
165
161
'session.use_trans_sid ' => 0 ,
@@ -201,6 +197,10 @@ public function __construct(array $config = []) {
201
197
$ config ['ini ' ]['session.gc_maxlifetime ' ] = 60 * $ config ['timeout ' ];
202
198
}
203
199
200
+ if (!empty ($ config ['cookie ' ])) {
201
+ $ config ['ini ' ]['session.name ' ] = $ config ['cookie ' ];
202
+ }
203
+
204
204
if (!empty ($ config ['ini ' ]) && is_array ($ config ['ini ' ])) {
205
205
$ this ->options ($ config ['ini ' ]);
206
206
}
Original file line number Diff line number Diff line change @@ -485,4 +485,14 @@ public function testFlashKey() {
485
485
$ this ->assertNull ($ session ->readFlash ('foo ' ));
486
486
}
487
487
488
+ /**
489
+ * Tests that the cookie name can be changed with configuration
490
+ *
491
+ * @return void
492
+ */
493
+ public function testSessionName () {
494
+ new Session (['cookie ' => 'made_up_name ' ]);
495
+ $ this ->assertEquals ('made_up_name ' , session_name ());
496
+ }
497
+
488
498
}
You can’t perform that action at this time.
0 commit comments