]> granicus.if.org Git - php/commitdiff
Fix the test for libmysql, which expects the certificates
authorAndrey Hristov <andrey@php.net>
Mon, 14 Jun 2010 18:23:17 +0000 (18:23 +0000)
committerAndrey Hristov <andrey@php.net>
Mon, 14 Jun 2010 18:23:17 +0000 (18:23 +0000)
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

index 33aec04d5ca161a2c9690486cbb54a0d9bdb1eb4..833f8edbbb5db61d2adc88ded3d279d7aa301747 100644 (file)
@@ -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!";