Skip to content

Update libmongoc to latest version #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2021
Merged

Update libmongoc to latest version #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ if test "$PHP_MONGODB" != "no"; then
PHP_MONGODB_JSONSL_SOURCES="jsonsl.c"

dnl Generated with: find src/libmongoc/src/libmongoc/src/mongoc -name '*.c' -print0 | cut -sz -d / -f 7- | sort -dz | tr '\000' ' '
PHP_MONGODB_MONGOC_SOURCES="mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-error.c mongoc-find-and-modify.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-openssl.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c"
PHP_MONGODB_MONGOC_SOURCES="mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-error.c mongoc-find-and-modify.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-openssl.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c"

dnl Generated with: find src/libmongoc/src/zlib-1.2.11 -maxdepth 1 -name '*.c' -print0 | cut -sz -d / -f 5- | sort -dz | tr '\000' ' '
PHP_MONGODB_ZLIB_SOURCES="adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c"
Expand Down
2 changes: 1 addition & 1 deletion config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ if (PHP_MONGODB != "no") {
var PHP_MONGODB_JSONSL_SOURCES="jsonsl.c";

// Generated with: find src/libmongoc/src/libmongoc/src/mongoc -name '*.c' -print0 | cut -sz -d / -f 7- | sort -dz | tr '\000' ' '
var PHP_MONGODB_MONGOC_SOURCES="mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-error.c mongoc-find-and-modify.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-openssl.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c";
var PHP_MONGODB_MONGOC_SOURCES="mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-error.c mongoc-find-and-modify.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-openssl.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c";

EXTENSION("mongodb", "php_phongo.c phongo_compat.c", null, PHP_MONGODB_CFLAGS);
MONGODB_ADD_SOURCES("/src", "bson.c bson-encode.c");
Expand Down
2 changes: 1 addition & 1 deletion src/LIBMONGOC_VERSION_CURRENT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.18.0-20210209+git8c202f4ee0
1.18.0-20210317+git7b143c65af
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 90 files
+11 −4 src/libbson/CMakeLists.txt
+1 −2 src/libbson/doc/bson_get_monotonic_time.rst
+1 −1 src/libbson/src/bson/bson-context.c
+0 −5 src/libbson/src/bson/bson-json.c
+5 −6 src/libbson/tests/test-json.c
+3 −0 src/libmongoc/CMakeLists.txt
+2 −0 src/libmongoc/doc/api.rst
+2 −0 src/libmongoc/doc/errors.rst
+2 −0 src/libmongoc/doc/includes/init_cleanup.txt
+6 −1 src/libmongoc/doc/logging.rst
+24 −0 src/libmongoc/doc/mongoc_client_get_timeout_ms.rst
+28 −0 src/libmongoc/doc/mongoc_client_pool_set_server_api.rst
+1 −0 src/libmongoc/doc/mongoc_client_pool_t.rst
+28 −0 src/libmongoc/doc/mongoc_client_set_server_api.rst
+2 −0 src/libmongoc/doc/mongoc_client_t.rst
+24 −0 src/libmongoc/doc/mongoc_collection_get_timeout_ms.rst
+30 −0 src/libmongoc/doc/mongoc_collection_set_timeout_ms.rst
+2 −0 src/libmongoc/doc/mongoc_collection_t.rst
+24 −0 src/libmongoc/doc/mongoc_database_get_timeout_ms.rst
+30 −0 src/libmongoc/doc/mongoc_database_set_timeout_ms.rst
+2 −0 src/libmongoc/doc/mongoc_database_t.rst
+24 −0 src/libmongoc/doc/mongoc_server_api_copy.rst
+21 −0 src/libmongoc/doc/mongoc_server_api_deprecation_errors.rst
+14 −0 src/libmongoc/doc/mongoc_server_api_destroy.rst
+19 −0 src/libmongoc/doc/mongoc_server_api_new.rst
+20 −0 src/libmongoc/doc/mongoc_server_api_strict.rst
+30 −0 src/libmongoc/doc/mongoc_server_api_t.rst
+26 −0 src/libmongoc/doc/mongoc_server_api_version_from_string.rst
+34 −0 src/libmongoc/doc/mongoc_server_api_version_t.rst
+24 −0 src/libmongoc/doc/mongoc_server_api_version_to_string.rst
+3 −0 src/libmongoc/src/mongoc/CMakeLists.txt
+25 −0 src/libmongoc/src/mongoc/mongoc-client-pool.c
+5 −0 src/libmongoc/src/mongoc/mongoc-client-pool.h
+4 −0 src/libmongoc/src/mongoc/mongoc-client-private.h
+38 −2 src/libmongoc/src/mongoc/mongoc-client.c
+9 −0 src/libmongoc/src/mongoc/mongoc-client.h
+8 −1 src/libmongoc/src/mongoc/mongoc-cmd-private.h
+43 −1 src/libmongoc/src/mongoc/mongoc-cmd.c
+3 −1 src/libmongoc/src/mongoc/mongoc-collection-private.h
+42 −8 src/libmongoc/src/mongoc/mongoc-collection.c
+8 −0 src/libmongoc/src/mongoc/mongoc-collection.h
+3 −1 src/libmongoc/src/mongoc/mongoc-database-private.h
+36 −4 src/libmongoc/src/mongoc/mongoc-database.c
+7 −0 src/libmongoc/src/mongoc/mongoc-database.h
+2 −1 src/libmongoc/src/mongoc/mongoc-error-private.h
+9 −2 src/libmongoc/src/mongoc/mongoc-error.c
+9 −1 src/libmongoc/src/mongoc/mongoc-error.h
+32 −0 src/libmongoc/src/mongoc/mongoc-server-api-private.h
+99 −0 src/libmongoc/src/mongoc/mongoc-server-api.c
+57 −0 src/libmongoc/src/mongoc/mongoc-server-api.h
+2 −2 src/libmongoc/src/mongoc/mongoc-timeout.c
+2 −0 src/libmongoc/src/mongoc/mongoc-uri.h
+32 −13 src/libmongoc/tests/bsonutil/bson-match.c
+2 −0 src/libmongoc/tests/bsonutil/bson-match.h
+12 −3 src/libmongoc/tests/bsonutil/bson-val.c
+99 −0 ...c/tests/json/server_discovery_and_monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json
+84 −0 ...c/tests/json/server_discovery_and_monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json
+99 −0 ...n/server_discovery_and_monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json
+69 −0 src/libmongoc/tests/json/server_discovery_and_monitoring/errors/post-42-LegacyNotPrimary.json
+69 −0 src/libmongoc/tests/json/server_discovery_and_monitoring/errors/pre-42-LegacyNotPrimary.json
+130 −0 src/libmongoc/tests/json/server_discovery_and_monitoring/errors/prefer-error-code.json
+174 −0 .../json/server_discovery_and_monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json
+2 −2 ...goc/tests/json/server_discovery_and_monitoring/errors/stale-generation-afterHandshakeCompletes-network.json
+2 −2 ...goc/tests/json/server_discovery_and_monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json
+174 −0 ...json/server_discovery_and_monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json
+2 −2 ...oc/tests/json/server_discovery_and_monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json
+2 −2 ...oc/tests/json/server_discovery_and_monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json
+146 −0 src/libmongoc/tests/json/server_discovery_and_monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json
+96 −0 src/libmongoc/tests/json/server_discovery_and_monitoring/errors/write_errors_ignored.json
+1,076 −0 src/libmongoc/tests/json/versioned_api/crud-api-version-1-strict.json
+1,067 −0 src/libmongoc/tests/json/versioned_api/crud-api-version-1.json
+117 −0 src/libmongoc/tests/json/versioned_api/runcommand-helper-no-api-version-declared.json
+74 −0 src/libmongoc/tests/json/versioned_api/test-commands-deprecation-errors.json
+74 −0 src/libmongoc/tests/json/versioned_api/test-commands-strict-mode.json
+388 −0 src/libmongoc/tests/json/versioned_api/transaction-handling.json
+3 −0 src/libmongoc/tests/test-libmongoc.c
+8 −8 src/libmongoc/tests/test-mongoc-async.c
+18 −0 src/libmongoc/tests/test-mongoc-client.c
+72 −0 src/libmongoc/tests/test-mongoc-collection.c
+13 −7 src/libmongoc/tests/test-mongoc-cursor.c
+46 −0 src/libmongoc/tests/test-mongoc-database.c
+26 −2 src/libmongoc/tests/test-mongoc-error.c
+15 −19 src/libmongoc/tests/test-mongoc-topology.c
+150 −0 src/libmongoc/tests/test-mongoc-versioned-api.c
+25 −4 src/libmongoc/tests/unified/entity-map.c
+1 −0 src/libmongoc/tests/unified/entity-map.h
+122 −5 src/libmongoc/tests/unified/operation.c
+7 −4 src/libmongoc/tests/unified/result.c
+26 −9 src/libmongoc/tests/unified/runner.c
+6 −0 src/libmongoc/tests/unified/runner.h