Merge pull request #272

Author: jmikola

php_phongo.c

@@ -1123,7 +1123,7 @@ mongoc_stream_t* phongo_stream_initiator(const mongoc_uri_t *uri, const mongoc_h
 
 	options = mongoc_uri_get_options(uri);
 
-	if (bson_iter_init_find (&iter, options, "connecttimeoutms") && BSON_ITER_HOLDS_INT32 (&iter)) {
+	if (bson_iter_init_find_case (&iter, options, "connecttimeoutms") && BSON_ITER_HOLDS_INT32 (&iter)) {
 		int32_t connecttimeoutms = MONGOC_DEFAULT_CONNECTTIMEOUTMS;
 
 		if (!(connecttimeoutms = bson_iter_int32(&iter))) {
@@ -1134,6 +1134,7 @@ mongoc_stream_t* phongo_stream_initiator(const mongoc_uri_t *uri, const mongoc_h
 		timeout.tv_usec = (connecttimeoutms % 1000) * 1000;
 
 		timeoutp = &timeout;
+		MONGOC_DEBUG("Applying connectTimeoutMS: %d", connecttimeoutms);
 	}
 
 	spprintf(&uniqid, 0, "%s:%d[%s]", host->host, host->port, mongoc_uri_get_string(uri));

tests/standalone/bug0655.phpt

@@ -0,0 +1,46 @@
+--TEST--
+PHPC-655: Use case insensitive parsing for Manager connectTimeoutMS array option
+--SKIPIF--
+<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not use custom streams"); ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$command = new MongoDB\Driver\Command(['ping' => 1]);
+
+// Invalid host cannot be resolved
+$manager = new MongoDB\Driver\Manager('mongodb://invalid.host:27017', ['connectTimeoutMS' => 1]);
+
+ini_set('mongodb.debug', 'stderr');
+
+echo throws(function() use ($manager, $command) {
+    $manager->executeCommand(DATABASE_NAME, $command);
+}, 'MongoDB\Driver\Exception\ConnectionTimeoutException'), "\n";
+
+// Valid host refuses connection
+$manager = new MongoDB\Driver\Manager('mongodb://localhost:54321', ['CONNECTTIMEOUTMS' => 1]);
+
+echo throws(function() use ($manager, $command) {
+    $manager->executeCommand(DATABASE_NAME, $command);
+}, 'MongoDB\Driver\Exception\ConnectionTimeoutException'), "\n";
+
+ini_set('mongodb.debug', 'off');
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+%a
+[%s]     PHONGO: DEBUG   > Applying connectTimeoutMS: 1
+[%s]     PHONGO: DEBUG   > Connecting to 'invalid.host:27017[mongodb://invalid.host:27017]'
+%a
+OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
+No suitable servers found (`serverselectiontryonce` set): %s
+%a
+[%s]     PHONGO: DEBUG   > Applying connectTimeoutMS: 1
+[%s]     PHONGO: DEBUG   > Connecting to 'localhost:54321[mongodb://localhost:54321]'
+%a
+OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
+No suitable servers found (`serverselectiontryonce` set): %s
+===DONE===