diff options
| author | Anatol Belski <ab@php.net> | 2016-12-04 14:01:40 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-12-04 14:01:40 +0100 |
| commit | 10a2ceef3bfada85e7046231476d06f08d3de69c (patch) | |
| tree | 5e3d1aefdc8d40ad9c48fde2540c10dc777da9ae | |
| parent | 46d708a1b655196afef875704672a9372260f1b2 (diff) | |
| download | php-git-10a2ceef3bfada85e7046231476d06f08d3de69c.tar.gz | |
enforce the test ini usage for the child process
| -rw-r--r-- | ext/openssl/tests/ServerClientTestCase.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/openssl/tests/ServerClientTestCase.inc b/ext/openssl/tests/ServerClientTestCase.inc index 03e0c2de87..478b337ef0 100644 --- a/ext/openssl/tests/ServerClientTestCase.inc +++ b/ext/openssl/tests/ServerClientTestCase.inc @@ -48,9 +48,13 @@ class ServerClientTestCase private function spawnWorkerProcess($code) { - $cmd = sprintf('%s "%s" %s', PHP_BINARY, __FILE__, WORKER_ARGV_VALUE); - - $this->workerHandle = proc_open($cmd, [['pipe', 'r'], ['pipe', 'w'], STDERR], $pipes); + if (defined("PHP_WINDOWS_VERSION_MAJOR")) { + $ini = php_ini_loaded_file(); + $cmd = sprintf('%s %s "%s" %s', PHP_BINARY, $ini ? "-n -c $ini" : "", __FILE__, WORKER_ARGV_VALUE); + } else { + $cmd = sprintf('%s "%s" %s', PHP_BINARY, __FILE__, WORKER_ARGV_VALUE); + } + $this->workerHandle = proc_open($cmd, [['pipe', 'r'], ['pipe', 'w'], STDERR], $pipes); $this->workerStdIn = $pipes[0]; $this->workerStdOut = $pipes[1]; |