Merge pull request #124

Author: jmikola

tests/connect/standalone-x509-0001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Connect to MongoDB with using SSL and X.509 auth
+Connect to MongoDB with using SSL and X.509 auth (stream context)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--

tests/connect/standalone-x509-0002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Connect to MongoDB with using X509 retrieving username from certificate #002
+Connect to MongoDB with using X509 retrieving username from certificate (stream context)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--

tests/connect/standalone-x509-0003.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Connect to MongoDB with using SSL and X.509 auth
+Connect to MongoDB with using SSL and X.509 auth (SSL options)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--

tests/connect/standalone-x509-0004.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Connect to MongoDB with using X509 retrieving username from certificate #002
+Connect to MongoDB with using X509 retrieving username from certificate (SSL options)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--

tests/connect/standalone-x509-error-0001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Connect to MongoDB with using X509 retrieving username from certificate #002
+X509 connection should not reuse previous stream after an auth failure
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--
@@ -18,23 +18,23 @@ function connect($dsn, $opts) {
         echo get_class($e), ": ", $e->getMessage(), "\n";
     }
     return $manager;
-
 }
-$SSL_DIR = realpath(__DIR__ . "/" . "./../../scripts/ssl/");
 
+$SSL_DIR = realpath(__DIR__ . "/" . "./../../scripts/ssl/");
 $opts = array(
         "peer_name" => "server",
         "verify_peer" => true,
         "verify_peer_name" => true,
         "allow_self_signed" => false,
         "cafile" => $SSL_DIR . "/ca.pem", /* Defaults to openssl.cafile */
         "capath" => $SSL_DIR, /* Defaults to openssl.capath */
-        "local_cert" => $SSL_DIR . "/src/libmongoc/tests/certificates/client.pem",
+        "local_cert" => $SSL_DIR . "/client.pem",
 );
+
+/* Wrong username */
 $parsed = parse_url(STANDALONE_X509);
 $dsn = sprintf("mongodb://username@%s:%d/%s?ssl=true&authMechanism=MONGODB-X509", $parsed["host"], $parsed["port"], DATABASE_NAME);
 
-
 $m1 = connect($dsn, $opts);
 $m2 = connect($dsn, $opts);