Re-adding ability to configure the session cookie name

cakephp · May 22, 2014 · f14af4f · f14af4f
1 parent c5f1d81
commit f14af4f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Network/Session.php b/src/Network/Session.php
@@ -126,14 +126,12 @@ public static function create($sessionConfig = []) {
 	protected static function _defaultConfig($name) {
 		$defaults = array(
 			'php' => array(
-				'checkAgent' => false,
 				'cookie' => 'CAKEPHP',
 				'ini' => array(
 					'session.use_trans_sid' => 0,
 				)
 			),
 			'cake' => array(
-				'checkAgent' => false,
 				'cookie' => 'CAKEPHP',
 				'ini' => array(
 					'session.use_trans_sid' => 0,
@@ -145,7 +143,6 @@ protected static function _defaultConfig($name) {
 				)
 			),
 			'cache' => array(
-				'checkAgent' => false,
 				'cookie' => 'CAKEPHP',
 				'ini' => array(
 					'session.use_trans_sid' => 0,
@@ -159,7 +156,6 @@ protected static function _defaultConfig($name) {
 				)
 			),
 			'database' => array(
-				'checkAgent' => false,
 				'cookie' => 'CAKEPHP',
 				'ini' => array(
 					'session.use_trans_sid' => 0,
@@ -201,6 +197,10 @@ public function __construct(array $config = []) {
 			$config['ini']['session.gc_maxlifetime'] = 60 * $config['timeout'];
 		}
 
+		if (!empty($config['cookie'])) {
+			$config['ini']['session.name'] = $config['cookie'];
+		}
+
 		if (!empty($config['ini']) && is_array($config['ini'])) {
 			$this->options($config['ini']);
 		}

diff --git a/tests/TestCase/Network/SessionTest.php b/tests/TestCase/Network/SessionTest.php
@@ -485,4 +485,14 @@ public function testFlashKey() {
 		$this->assertNull($session->readFlash('foo'));
 	}
 
+/**
+ * Tests that the cookie name can be changed with configuration
+ *
+ * @return void
+ */
+	public function testSessionName() {
+		new Session(['cookie' => 'made_up_name']);
+		$this->assertEquals('made_up_name', session_name());
+	}
+
 }