Skip to content

Merge v1.19 into master #1620

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 3 commits into from
Aug 27, 2024
Merged

Merge v1.19 into master #1620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03f72d4
PHPC-2422: Update libmongoc to 1.27.5 (#1619)
alcaeus Aug 27, 2024
67f4315
Merge branch 'v1.19' into merge-v1.19-into-master-1724751089635
alcaeus Aug 27, 2024
affbb06
Don't build libmongoc version in pull requests
alcaeus Aug 27, 2024
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
8 changes: 4 additions & 4 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,10 @@ if test "$PHP_MONGODB" != "no"; then

if test "x$bundled_zlib" = "xyes"; then
PHP_MONGODB_ZLIB_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_ZLIB_CFLAGS"
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/zlib-1.2.13/], $PHP_MONGODB_ZLIB_SOURCES, $PHP_MONGODB_ZLIB_CFLAGS)
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/zlib-1.2.13/])
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/zlib-1.2.13/])
AC_CONFIG_FILES([${ac_config_dir}/src/libmongoc/src/zlib-1.2.13/zconf.h])
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/zlib-1.3.1/], $PHP_MONGODB_ZLIB_SOURCES, $PHP_MONGODB_ZLIB_CFLAGS)
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/zlib-1.3.1/])
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/zlib-1.3.1/])
AC_CONFIG_FILES([${ac_config_dir}/src/libmongoc/src/zlib-1.3.1/zconf.h])
fi

if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-submodule-sources.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
'PHP_MONGODB_JSONSL_SOURCES' => 'src/libmongoc/src/libbson/src/jsonsl',
'PHP_MONGODB_MONGOC_SOURCES' => 'src/libmongoc/src/libmongoc/src/mongoc',
'PHP_MONGODB_UTF8PROC_SOURCES' => 'src/libmongoc/src/utf8proc-2.8.0',
'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.2.13',
'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.3.1',
'PHP_MONGODB_MONGOCRYPT_SOURCES' => 'src/libmongocrypt/src',
'PHP_MONGODB_MONGOCRYPT_CRYPTO_SOURCES' => 'src/libmongocrypt/src/crypto',
'PHP_MONGODB_MONGOCRYPT_OS_POSIX_SOURCES' => 'src/libmongocrypt/src/os_posix',
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.27.4
1.27.5
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 17 files
+11 −2 .evergreen/etc/mongo-c-driver.spec
+6 −4 .evergreen/etc/spec.patch
+13 −0 NEWS
+1 −1 VERSION_CURRENT
+10 −9 etc/cyclonedx.sbom.json
+1 −1 etc/purls.txt
+5 −13 src/common/bson-dsl.h
+4 −4 src/common/bson-dsl.md
+10 −0 src/libbson/NEWS
+11 −0 src/libbson/src/bson/bson.c
+ − src/libmongoc/doc/includes/libbson.inv
+1 −0 src/libmongoc/src/mongoc/mongoc-cmd.c
+4 −4 src/libmongoc/src/mongoc/mongoc-uri.c
+1 −1 src/libmongoc/tests/test-mongoc-client-session.c
+3 −3 src/libmongoc/tests/test-mongoc-client-side-encryption.c
+7 −7 src/libmongoc/tests/unified/entity-map.c
+2 −2 src/libmongoc/tests/unified/operation.c