mongodb · derickr · Aug 31, 2016 · Aug 31, 2016 · Aug 31, 2016 · Aug 31, 2016
diff --git a/config.m4 b/config.m4
@@ -241,13 +241,15 @@ if test "$MONGODB" != "no"; then
     mongoc-cursor-cursorid.c \
     mongoc-cursor-transform.c \
     mongoc-database.c \
+    mongoc-linux-distro-scanner.c \
     mongoc-find-and-modify.c \
     mongoc-host-list.c \
     mongoc-init.c \
     mongoc-gridfs.c \
     mongoc-gridfs-file.c \
     mongoc-gridfs-file-page.c \
     mongoc-gridfs-file-list.c \
+    mongoc-handshake.c \
     mongoc-index.c \
     mongoc-list.c \
     mongoc-log.c \
@@ -414,6 +416,8 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     AC_SUBST(MONGOC_ENABLE_SSL_SECURE_CHANNEL, 0)
     AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)
 
+    AC_SUBST(MONGOC_ENABLE_SSL_LIBRESSL, 0)
+
     AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
     AC_SUBST(MONGOC_EXPERIMENTAL_FEATURES, 0)
   fi

diff --git a/php_phongo.c b/php_phongo.c
@@ -1390,8 +1390,6 @@ static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zv
 	const char                *mongoc_version, *bson_version;
 	mongoc_client_t           *client;
 
-	ENTRY;
-
 #if PHP_VERSION_ID >= 70000
 	if (driverOptions && (zdebug = zend_hash_str_find(Z_ARRVAL_P(driverOptions), "debug", sizeof("debug")-1)) != NULL) {
 		zend_string *key = zend_string_init(PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI)-1, 0);
@@ -1432,17 +1430,17 @@ static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zv
 	client = mongoc_client_new_from_uri(uri);
 
 	if (!client) {
-		RETURN(NULL);
+		return NULL;
 	}
 
 	if (mongoc_uri_get_ssl(uri) && driverOptions) {
 		if (!php_phongo_apply_ssl_opts(client, driverOptions TSRMLS_CC)) {
 			mongoc_client_destroy(client);
-			RETURN(NULL);
+			return NULL;
 		}
 	}
 
-	RETURN(client);
+	return client;
 } /* }}} */
 
 bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string, bson_t *bson_options, zval *driverOptions TSRMLS_DC) /* {{{ */
@@ -1880,11 +1878,17 @@ PHP_MINIT_FUNCTION(mongodb)
 {
 	(void)type; /* We don't care if we are loaded via dl() or extension= */
 
+	char *php_version_string = malloc(4 + sizeof(MONGODB_VERSION_S) + 1);
 
 	REGISTER_INI_ENTRIES();
 
 	/* Initialize libmongoc */
 	mongoc_init();
+
+	/* Set handshake options */
+	snprintf(php_version_string, 4 + sizeof(MONGODB_VERSION_S) + 1, "PHP %s", PHP_VERSION);
+	mongoc_handshake_data_append("ext-mongodb:PHP", MONGODB_VERSION_S, php_version_string);
+
 	/* Initialize libbson */
 	bson_mem_set_vtable(&MONGODB_G(bsonMemVTable));
 

diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -201,6 +201,7 @@ PHP_MINIT_FUNCTION(ReadConcern)
 
 	zend_declare_class_constant_stringl(php_phongo_readconcern_ce, ZEND_STRL("LOCAL"), ZEND_STRL(MONGOC_READ_CONCERN_LEVEL_LOCAL) TSRMLS_CC);
 	zend_declare_class_constant_stringl(php_phongo_readconcern_ce, ZEND_STRL("MAJORITY"), ZEND_STRL(MONGOC_READ_CONCERN_LEVEL_MAJORITY) TSRMLS_CC);
+	zend_declare_class_constant_stringl(php_phongo_readconcern_ce, ZEND_STRL("LINEARIZABLE"), ZEND_STRL(MONGOC_READ_CONCERN_LEVEL_LINEARIZABLE) TSRMLS_CC);
 
 	return SUCCESS;
 }

diff --git a/src/libbson b/src/libbson
diff --git a/src/libmongoc b/src/libmongoc
diff --git a/tests/bson/bug0544.phpt b/tests/bson/bug0544.phpt
@@ -2,8 +2,6 @@
 PHPC-544: Consult SIZEOF_ZEND_LONG for 64-bit integer support
 --SKIPIF--
 <?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
---INI--
-mongodb.debug=stderr
 --FILE--
 <?php
 

diff --git a/tests/bson/bug0623.phpt b/tests/bson/bug0623.phpt
@@ -2,8 +2,6 @@
 PHPC-623: Numeric keys limited to unsigned 32-bit integer
 --SKIPIF--
 <?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
---INI--
-mongodb.debug=stderr
 --FILE--
 <?php
 

diff --git a/tests/manager/manager-debug-003.phpt b/tests/manager/manager-debug-003.phpt
diff --git a/tests/manager/manager-var-dump-001.phpt b/tests/manager/manager-var-dump-001.phpt
@@ -50,7 +50,7 @@ object(MongoDB\Driver\Manager)#%d (%d) {
       ["is_passive"]=>
       bool(false)
       ["last_is_master"]=>
-      array(8) {
+      array(%d) {
         ["ismaster"]=>
         bool(true)
         ["maxBsonObjectSize"]=>
@@ -68,6 +68,7 @@ object(MongoDB\Driver\Manager)#%d (%d) {
         int(%d)
         ["minWireVersion"]=>
         int(0)
+        %a
         ["ok"]=>
         float(1)
       }

diff --git a/tests/server/server-debug.phpt b/tests/server/server-debug.phpt
@@ -33,7 +33,7 @@ object(MongoDB\Driver\Server)#%d (%d) {
   ["is_passive"]=>
   bool(false)
   ["last_is_master"]=>
-  array(8) {
+  array(%d) {
     ["ismaster"]=>
     bool(true)
     ["maxBsonObjectSize"]=>
@@ -51,6 +51,7 @@ object(MongoDB\Driver\Server)#%d (%d) {
     int(%d)
     ["minWireVersion"]=>
     int(0)
+    %a
     ["ok"]=>
     float(1)
   }
+16 −0		.evergreen/cmake.sh
+16 −4		.evergreen/compile-unix.sh
+1 −2		.evergreen/compile-windows.sh
+17 −0		.evergreen/compile.sh
+129 −21		.evergreen/config.yml
+2 −0		.evergreen/llvm-gcov.sh
+5 −0		.gitignore
+12 −42		CMakeLists.txt
+30 −0		NEWS
+1 −1		VERSION_CURRENT
+1 −1		build/autotools/Coverage.m4
+1 −8		build/autotools/PrintBuildConfiguration.m4
+0 −10		build/autotools/ReadCommandLineArguments.m4
+0 −2		build/autotools/SetupAutomake.m4
+0 −191		build/cmake/libbson-experimental.def
+10 −5		build/cmake/libbson.def
+1 −4		doc/html/Makefile.am
+10 −0		examples/Makefile.am
+2 −10		src/bson/Makefile.am
+0 −12		src/bson/bcon.c
+0 −8		src/bson/bcon.h
+0 −8		src/bson/bson-config.h.in
+0 −12		src/bson/bson-iter.c
+0 −6		src/bson/bson-iter.h
+0 −8		src/bson/bson-json.c
+0 −10		src/bson/bson-types.h
+0 −4		src/bson/bson-value.c
+0 −10		src/bson/bson.c
+0 −6		src/bson/bson.h
+7 −12		tests/Makefile.am
+0 −4		tests/test-bcon-basic.c
+0 −4		tests/test-bcon-extract.c
+0 −10		tests/test-bson.c
+0 −1		tests/test-decimal128.c
+0 −16		tests/test-iter.c
+0 −17		tests/test-json.c
+1 −2		tests/test-libbson.c
+0 −3		tests/test-type.c
+0 −4		tests/test-value.c