From eca74414405eaf4ff9a447dd40695e2fa8e5c14a Mon Sep 17 00:00:00 2001
From: Kamil Madejski <kamil.madejski@yahoo.com>
Date: Mon, 9 Jul 2018 10:20:50 +0200
Subject: [PATCH 1/2] EZP-29390: [Legacy] PHP Warning: Cannot change session
 name when session is active (#1373)

* [Legacy] PHP Warning: Cannot change session name when session is active

* Improved docblock

* fixup! Improved docblock

* fixup! [Legacy] PHP Warning: Cannot change session name when session is active

(cherry picked from commit 7bf5ae6d2afc37798cfcd7f4bf661f4fb038d965)
---
 lib/ezsession/classes/ezsession.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ezsession/classes/ezsession.php b/lib/ezsession/classes/ezsession.php
index 1719f017675..2c134a8accc 100644
--- a/lib/ezsession/classes/ezsession.php
+++ b/lib/ezsession/classes/ezsession.php
@@ -269,7 +269,7 @@ static protected function registerFunctions( $sessionName = false, ezpSessionHan
             return false;
 
         $ini = eZINI::instance();
-        if ( $sessionName !== false )
+        if ( $sessionName !== false && $sessionName !== session_name() )
         {
             session_name( $sessionName );
         }
@@ -282,7 +282,9 @@ static protected function registerFunctions( $sessionName = false, ezpSessionHan
                 // Use md5 to make sure name is only consistent of alphanumeric characters
                 $sessionName .=  md5( $access['name'] );
             }
-            session_name( $sessionName );
+            if ( $sessionName !== session_name() ) {
+                session_name( $sessionName );
+            }
         }
         else
         {

From 11828f6022e6c6f12597581e04a104cda9997642 Mon Sep 17 00:00:00 2001
From: Gunnstein Lye <gunnstein.lye@ez.no>
Date: Fri, 6 Jul 2018 10:42:21 +0200
Subject: [PATCH 2/2] Skip tests that depend on critmon1.ez.no as it has been
 shut down. (#1374)

(cherry picked from commit ea83877753e80722257b82c81aac48dbc72db84e)
---
 tests/tests/lib/ezsoap/ezsoapclient_test.php | 2 ++
 tests/tests/lib/ezutils/ezhttptool_test.php  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/tests/lib/ezsoap/ezsoapclient_test.php b/tests/tests/lib/ezsoap/ezsoapclient_test.php
index 9ec4622acfd..8852c06bb3c 100644
--- a/tests/tests/lib/ezsoap/ezsoapclient_test.php
+++ b/tests/tests/lib/ezsoap/ezsoapclient_test.php
@@ -70,6 +70,8 @@ public static function providerTestSoapClientSend()
      */
     public function testSoapClientSend( $expectedSendResult, $server, $path, $port, $name, $namespace, $parameters = array() )
     {
+        self::markTestSkipped( "Test disabled as critmon has been shut down. Needs a different server or way of doing this." );
+
         $client = new eZSOAPClient( $server, $path, $port );
         $request = new eZSOAPRequest( $name, $namespace, $parameters );
         $response = $client->send( $request );
diff --git a/tests/tests/lib/ezutils/ezhttptool_test.php b/tests/tests/lib/ezutils/ezhttptool_test.php
index 1e9040244cd..b6248beac9a 100644
--- a/tests/tests/lib/ezutils/ezhttptool_test.php
+++ b/tests/tests/lib/ezutils/ezhttptool_test.php
@@ -30,6 +30,8 @@ public static function providerTestGetDataByURL()
      */
     public function testGetDataByURL( $expectedDataResult, $url, $justCheckURL = false, $userAgent = false )
     {
+        self::markTestSkipped( "Test disabled as critmon has been shut down. Needs a different server or way of doing this." );
+
         $this->assertEquals( eZHTTPTool::getDataByURL( $url, $justCheckURL, $userAgent ), $expectedDataResult );
 
         // There's no way to test the whole method without refactoring it.