Skip to content

Commit 7274d49

Browse files
authored
Bump libmongoc to latest version (#1152)
* PHPC-1420: Fix stack smashing when using mixed replica set config * Support new debug assertion switch for libmongoc * Only set MONGOC_ENABLE_DEBUG_ASSERTIONS when compiling against bundled libs
1 parent be630dc commit 7274d49

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

config.m4

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,12 @@ if test "$PHP_MONGODB" != "no"; then
365365
AC_SUBST(MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION, 0)
366366
fi
367367

368+
if test "$PHP_MONGODB_DEVELOPER_FLAGS" = "yes"; then
369+
AC_SUBST(MONGOC_ENABLE_DEBUG_ASSERTIONS, 1)
370+
else
371+
AC_SUBST(MONGOC_ENABLE_DEBUG_ASSERTIONS, 0)
372+
fi
373+
368374
dnl On MacOS, use gcut from the coreutils brew package instead of cut
369375
dnl Generated with: find src/libmongoc/src/common -name '*.c' -print0 | cut -sz -d / -f 5- | sort -dz | tr '\000' ' '
370376
PHP_MONGODB_COMMON_SOURCES="common-b64.c common-md5.c common-thread.c"
@@ -412,6 +418,7 @@ if test "$PHP_MONGODB" != "no"; then
412418
ac_config_dir=PHP_EXT_SRCDIR(mongodb)
413419

414420
AC_CONFIG_FILES([
421+
${ac_config_dir}/src/libmongoc/src/common/common-config.h
415422
${ac_config_dir}/src/libmongoc/src/libbson/src/bson/bson-config.h
416423
${ac_config_dir}/src/libmongoc/src/libbson/src/bson/bson-version.h
417424
${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h

config.w32

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ if (PHP_MONGODB != "no") {
174174
MONGOC_ENABLE_COMPRESSION_ZLIB: 0,
175175
MONGOC_ENABLE_COMPRESSION_ZSTD: 0,
176176
MONGOC_ENABLE_COMPRESSION: 0,
177+
MONGOC_ENABLE_DEBUG_ASSERTIONS: 0,
177178
MONGOC_ENABLE_MONGODB_AWS_AUTH: 0,
178179
MONGOC_ENABLE_SASL: 0,
179180
MONGOC_ENABLE_SASL_CYRUS: 0,
@@ -352,6 +353,12 @@ if (PHP_MONGODB != "no") {
352353
mongoc_opts
353354
);
354355

356+
mongodb_generate_header(
357+
configure_module_dirname + "/src/libmongoc/src/common/common-config.h.in",
358+
configure_module_dirname + "/src/libmongoc/src/common/common-config.h",
359+
mongoc_opts
360+
);
361+
355362
mongodb_generate_header(
356363
configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h.in",
357364
configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h",

src/LIBMONGOC_VERSION_CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.0-rc0
1+
1.18.0-20200727+git60267532b6

src/libmongoc

Submodule libmongoc updated 48 files

0 commit comments

Comments
 (0)