From 7b392c7154eb06d8dd19f4e06155b8a4633ac766 Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Thu, 27 Apr 2017 15:10:55 +0100
Subject: [PATCH] Prefer using DIRECTORY_SEPARATOR in OpenSSL config path

---
 ext/openssl/tests/bug36732.phpt | 2 +-
 ext/openssl/tests/bug55646.phpt | 2 +-
 ext/openssl/tests/bug73833.phpt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt
index ec8fedb9d43..87fad9843e6 100644
--- a/ext/openssl/tests/bug36732.phpt
+++ b/ext/openssl/tests/bug36732.phpt
@@ -10,7 +10,7 @@ if (OPENSSL_VERSION_NUMBER < 0x009070af) die("skip");
 $configargs = array(
         "req_extensions" => "v3_req",
         "x509_extensions" => "usr_cert",
-		"config" => __DIR__."/openssl.cnf",
+		"config" => __DIR__. DIRECTORY_SEPARATOR . "openssl.cnf",
 );
 
 $dn = array(
diff --git a/ext/openssl/tests/bug55646.phpt b/ext/openssl/tests/bug55646.phpt
index c11284d72d9..6c504588c8a 100644
--- a/ext/openssl/tests/bug55646.phpt
+++ b/ext/openssl/tests/bug55646.phpt
@@ -19,7 +19,7 @@ $csr_info = array(
 $private = openssl_pkey_new($config);
 while (openssl_error_string()) {}
 $csr_res = openssl_csr_new($csr_info, $private,
-	['config' => __DIR__."/openssl.cnf"]);
+	['config' => __DIR__. DIRECTORY_SEPARATOR . "openssl.cnf"]);
 if (!$csr_res) {
 	while ($e = openssl_error_string()) { $err = $e; }
 	die("Failed; last error: $err");
diff --git a/ext/openssl/tests/bug73833.phpt b/ext/openssl/tests/bug73833.phpt
index cf46092a461..2ea5f9e4118 100644
--- a/ext/openssl/tests/bug73833.phpt
+++ b/ext/openssl/tests/bug73833.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded("openssl")) die("skip openssl not loaded");
 --FILE--
 <?php
 $passwords = ["abc\x00defghijkl", "abcdefghikjl"];
-$conf = ['config' => __DIR__.'/openssl.cnf'];
+$conf = ['config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'];
 
 foreach($passwords as $password) {
 	$key = openssl_pkey_new($conf);