svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/bug51647.phpt trunk/ext/mysqli/tests/bug51647.phpt

andrey Mon, 14 Jun 2010 18:23:17 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300437 Log: 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. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug51647.phpt U php/php-src/trunk/ext/mysqli/tests/bug51647.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug51647.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug51647.phpt 2010-06-14 18:19:13 UTC (rev 300436) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug51647.phpt 2010-06-14 18:23:17 UTC (rev 300437) @@ -12,7 +12,8 @@ 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 @@ printf("[006] [%d] %s\n", $link->errno, $link->error); } - - var_dump($row); print "done!"; Modified: php/php-src/trunk/ext/mysqli/tests/bug51647.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/bug51647.phpt 2010-06-14 18:19:13 UTC (rev 300436) +++ php/php-src/trunk/ext/mysqli/tests/bug51647.phpt 2010-06-14 18:23:17 UTC (rev 300437) @@ -12,7 +12,8 @@ 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 @@ printf("[006] [%d] %s\n", $link->errno, $link->error); } - - var_dump($row); print "done!";