symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+5-4Lines changed: 5 additions & 4 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+5-4Lines changed: 5 additions & 4 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+5-4Lines changed: 5 additions & 4 deletions
@@ -106,8 +106,9 @@ public function __construct(array $options = array(), $handler = null, MetadataB
         if (empty($options)) {
             $options += array('cache_limiter' => 'public');
         }
-
-        ini_set('session.use_cookies', 1);
+        if (1 !== (int) ini_get('session.use_cookies')) {
+            ini_set('session.use_cookies', 1);
+        }
 
         if (\PHP_VERSION_ID >= 50400) {
             session_register_shutdown();
@@ -351,7 +352,7 @@ public function setOptions(array $options)
         ));
 
         foreach ($options as $key => $value) {
-            if (isset($validOptions[$key])) {
+            if (isset($validOptions[$key]) && false === headers_sent()) {
                 ini_set('session.'.$key, $value);
             }
         }
@@ -397,7 +398,7 @@ public function setSaveHandler($saveHandler = null)
         }
         $this->saveHandler = $saveHandler;
 
-        if ($this->saveHandler instanceof \SessionHandlerInterface) {
+        if ($this->saveHandler instanceof \SessionHandlerInterface && false === headers_sent()) {
             if (\PHP_VERSION_ID >= 50400) {
                 session_set_save_handler($this->saveHandler, false);
             } else {
 
@@ -271,7 +271,7 @@ public function testSessionDestroy()
 
     public function testSessionGC()
     {
-        $previousLifeTime = ini_set('session.gc_maxlifetime', 1000);
+        $previousLifeTime = false === headers_sent() && ini_set('session.gc_maxlifetime', 1000);
         $pdo = $this->getMemorySqlitePdo();
         $storage = new PdoSessionHandler($pdo);
 
@@ -283,18 +283,19 @@ public function testSessionGC()
         $storage->open('', 'sid');
         $storage->read('gc_id');
         // IN 7.2 this does not work
-        ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
+        false === headers_sent() && ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
         $storage->write('gc_id', 'data');
         $storage->close();
         $this->assertEquals(2, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'No session pruned because gc not called');
+        // @TODO: Really not sure about this at all....
+        true === headers_sent() && $storage->destroy('gc_id');
 
         $storage->open('', 'sid');
         $data = $storage->read('gc_id');
         $storage->gc(-1);
         $storage->close();
 
-        ini_set('session.gc_maxlifetime', $previousLifeTime);
-
+        false === headers_sent() && ini_set('session.gc_maxlifetime', $previousLifeTime);
         $this->assertSame('', $data, 'Session already considered garbage, so not returning data even if it is not pruned yet');
         $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'Expired session is pruned');
     }