Upgrade libbson and libmongoc to latest master (1.5.0-dev)

Author: derickr

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

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) /* {{{ */