From 2f838ef5471a61e5e62077c8cbc6735ba3be9be1 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Mon, 14 Jun 2010 18:23:17 +0000 Subject: Fix the test for libmysql, which expects the certificates to be in the directory where the interpreter is started. When using mysqlnd they should not include path and will be found in the directory of the script. --- ext/mysqli/tests/bug51647.phpt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt index 33aec04d5c..833f8edbbb 100644 --- a/ext/mysqli/tests/bug51647.phpt +++ b/ext/mysqli/tests/bug51647.phpt @@ -12,7 +12,8 @@ require_once('skipifconnectfailure.inc'); if (!is_object($link = mysqli_init())) printf("[001] Cannot create link\n"); - if (!$link->ssl_set("client-key.pem", "client-cert.pem", "cacert.pem","","")) + $path_to_pems = !$IS_MYSQLND? "ext/mysqli/tests/" : ""; + if (!$link->ssl_set("{$path_to_pems}client-key.pem", "{$path_to_pems}client-cert.pem", "{$path_to_pems}cacert.pem","","")) printf("[002] [%d] %s\n", $link->errno, $link->error); if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) { @@ -37,8 +38,6 @@ require_once('skipifconnectfailure.inc'); printf("[006] [%d] %s\n", $link->errno, $link->error); } - - var_dump($row); print "done!"; -- cgit v1.2.1