Skip to content

Commit f14af4f

Browse files
committed
Re-adding ability to configure the session cookie name
1 parent c5f1d81 commit f14af4f

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/Network/Session.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,12 @@ public static function create($sessionConfig = []) {
126126
protected static function _defaultConfig($name) {
127127
$defaults = array(
128128
'php' => array(
129-
'checkAgent' => false,
130129
'cookie' => 'CAKEPHP',
131130
'ini' => array(
132131
'session.use_trans_sid' => 0,
133132
)
134133
),
135134
'cake' => array(
136-
'checkAgent' => false,
137135
'cookie' => 'CAKEPHP',
138136
'ini' => array(
139137
'session.use_trans_sid' => 0,
@@ -145,7 +143,6 @@ protected static function _defaultConfig($name) {
145143
)
146144
),
147145
'cache' => array(
148-
'checkAgent' => false,
149146
'cookie' => 'CAKEPHP',
150147
'ini' => array(
151148
'session.use_trans_sid' => 0,
@@ -159,7 +156,6 @@ protected static function _defaultConfig($name) {
159156
)
160157
),
161158
'database' => array(
162-
'checkAgent' => false,
163159
'cookie' => 'CAKEPHP',
164160
'ini' => array(
165161
'session.use_trans_sid' => 0,
@@ -201,6 +197,10 @@ public function __construct(array $config = []) {
201197
$config['ini']['session.gc_maxlifetime'] = 60 * $config['timeout'];
202198
}
203199

200+
if (!empty($config['cookie'])) {
201+
$config['ini']['session.name'] = $config['cookie'];
202+
}
203+
204204
if (!empty($config['ini']) && is_array($config['ini'])) {
205205
$this->options($config['ini']);
206206
}

tests/TestCase/Network/SessionTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,4 +485,14 @@ public function testFlashKey() {
485485
$this->assertNull($session->readFlash('foo'));
486486
}
487487

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+
488498
}

0 commit comments

Comments
 (0)