From cbe554bf314452b82add1f568d7278063c8c502e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 22 Jun 2018 10:36:08 +0200
Subject: update to 4.1.0RC3 (beta, no change) drop patches merged upstream

---
 1365.patch | 67 --------------------------------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 1365.patch

(limited to '1365.patch')

diff --git a/1365.patch b/1365.patch
deleted file mode 100644
index bc6beb8..0000000
--- a/1365.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c4e4248dbe3352274304e766d6020a4c319fdef6 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 8 Jun 2018 10:46:04 +0200
-Subject: [PATCH] use PHP_BINARY instead of php and allow override honours
- TEST_PHP_EXECUTABLE and TEST_PHP_ARGS (as standard php tests)
-
----
- tests/RedisTest.php | 27 +++++++++++++++++++++++----
- 1 file changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/tests/RedisTest.php b/tests/RedisTest.php
-index ff0b7537..cdfa5fd3 100644
---- a/tests/RedisTest.php
-+++ b/tests/RedisTest.php
-@@ -5560,9 +5560,8 @@ private function startSessionProcess($sessionId, $sleepTime, $background, $maxEx
-             }
-             $commandParameters = array_map('escapeshellarg', $commandParameters);
- 
--            $command = 'php ' . __DIR__ . '/startSession.php ' . implode(' ', $commandParameters);
-+            $command = self::getPhpCommand('startSession.php') . implode(' ', $commandParameters);
-             $command .= $background ? ' 2>/dev/null > /dev/null &' : ' 2>&1';
--
-             exec($command, $output);
-             return ($background || (count($output) == 1 && $output[0] == 'SUCCESS')) ? true : false;
-         }
-@@ -5576,7 +5575,7 @@ private function startSessionProcess($sessionId, $sleepTime, $background, $maxEx
-      */
-     private function getSessionData($sessionId, $sessionLifetime = 1440)
-     {
--        $command = 'php ' . __DIR__ . '/getSessionData.php ' . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . escapeshellarg($sessionId) . ' ' . escapeshellarg($sessionLifetime);
-+        $command = self::getPhpCommand('getSessionData.php') . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . escapeshellarg($sessionId) . ' ' . escapeshellarg($sessionLifetime);
-         exec($command, $output);
- 
-         return $output[0];
-@@ -5594,11 +5593,31 @@ private function regenerateSessionId($sessionId, $locking = false, $destroyPrevi
-     {
- 	$args = array_map('escapeshellarg', array($sessionId, $locking, $destroyPrevious, $sessionProxy));
- 
--        $command = 'php --no-php-ini --define extension=igbinary.so --define extension=' . __DIR__ . '/../modules/redis.so ' . __DIR__ . '/regenerateSessionId.php ' . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . implode(' ', $args);
-+        $command = self::getPhpCommand('regenerateSessionId.php') . escapeshellarg($this->getFullHostPath()) . ' ' . $this->sessionSaveHandler . ' ' . implode(' ', $args);
- 
-         exec($command, $output);
- 
-         return $output[0];
-     }
-+
-+    /**
-+     * Return command to launch PHP with built extension enabled
-+     * taking care of environment (TEST_PHP_EXECUTABLE and TEST_PHP_ARGS)
-+     *
-+     * @param string $script
-+     *
-+     * @return string
-+     */
-+    private function getPhpCommand($script)
-+    {
-+        static $cmd = NULL;
-+
-+        if (!$cmd) {
-+            $cmd  = (getenv('TEST_PHP_EXECUTABLE') ?: (defined('PHP_BINARY') ? PHP_BINARY : 'php')); // PHP_BINARY is 5.4+
-+            $cmd .= ' ';
-+            $cmd .= (getenv('TEST_PHP_ARGS') ?: '--no-php-ini --define extension=igbinary.so --define extension=' . dirname(__DIR__) . '/modules/redis.so');
-+        }
-+        return $cmd . ' ' . __DIR__ . '/' . $script . ' ';
-+    }
- }
- ?>
-- 
cgit