Merge remote-tracking branch 'origin/master' into pr-167

Author: hanumantmk

CMakeLists.txt

@@ -13,9 +13,10 @@ set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 
 set (MONGOC_MAJOR_VERSION 1)
 set (MONGOC_MINOR_VERSION 1)
-set (MONGOC_MICRO_VERSION 1)
+set (MONGOC_MICRO_VERSION 5)
+set (MONGOC_PRERELEASE_VERSION dev)
 set (MONGOC_API_VERSION 1.0)
-set (MONGOC_VERSION 1.1.1)
+set (MONGOC_VERSION 1.1.5-dev)
 
 set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING")
 set (CPACK_PACKAGE_VERSION_MAJOR ${MONGOC_MAJOR_VERSION})
@@ -51,6 +52,10 @@ if (UNIX AND NOT APPLE)
    set(LIBS ${LIBS} rt)
 endif()
 
+if (APPLE)
+   cmake_policy(SET CMP0042 OLD)
+endif()
+
 add_definitions(-D_GNU_SOURCE)
 add_definitions(-D_BSD_SOURCE)
 add_definitions("-DBINARY_DIR=\"${SOURCE_DIR}/tests/binary\"")
@@ -228,7 +233,8 @@ if (OPENSSL_FOUND)
    set(test-libmongoc-sources ${test-libmongoc-sources}
       ${SOURCE_DIR}/tests/test-x509.c
       ${SOURCE_DIR}/tests/ssl-test.c
-      ${SOURCE_DIR}/tests/test-mongoc-stream-tls.c)
+      ${SOURCE_DIR}/tests/test-mongoc-stream-tls.c
+      ${SOURCE_DIR}/tests/test-mongoc-stream-tls-hangup.c)
    mongoc_add_test(test-replica-set-ssl FALSE
       ${SOURCE_DIR}/tests/test-replica-set-ssl.c
       ${SOURCE_DIR}/tests/ha-test.c

CONTRIBUTING.md

@@ -95,6 +95,16 @@ typedef enum
 } my_flags_t;
 ```
 
+### Adding a new symbol
+
+This should be done rarely but there are several things that you need to do
+when adding a new symbol.
+
+ - Add the symbol to `src/libmongoc.symbols`
+ - Add the symbol to `build/autotools/versions.ldscript`
+ - Add the symbol to `build/cmake/libmongoc.def`
+ - Add the symbol to `build/cmake/libmongoc-ssl.def`
+ - Add documentation for the new symbol in `doc/mongoc_your_new_symbol_name.page`
 
 ### Documentation
 
@@ -110,5 +120,12 @@ have a locally running `mongod` instance available on `127.0.0.1:27017`. All
 tests should pass. Alternatively, you can specify `MONGOC_TEST_HOST`
 environment variable to specify a non-localhost hostname or ip address.
 
+Set the `MONGOC_TEST_SSL` environment variable `on` to connect to the server via
+SSL with default options. Configure SSL options with paths
+`MONGOC_TEST_SSL_PEM_FILE`, `MONGOC_TEST_SSL_PEM_PWD`,
+`MONGOC_TEST_SSL_CA_FILE`, `MONGOC_TEST_SSL_CA_DIR`, and
+`MONGOC_TEST_SSL_CRL_FILE`. Set the `MONGOC_TEST_SSL_WEAK_CERT_VALIDATION`
+environment variable `on` to relax server certificate validation.
+
 All tests should pass before submitting a patch.
 

NEWS

@@ -1,3 +1,76 @@
+Next release
+============
+
+Changes include:
+ * The fsync and j write concern flags imply acknowledged writes
+ * Prevent using fsync or j with conflicting w=0 write concern
+
+mongo-c-driver 1.1.4
+====================
+
+It is my pleasure to announce to you the 1.1.4 release of the MongoDB C driver.
+
+This release is a stable release with performance enhancements and bugfixes.
+
+Changes include:
+ * Fixed client pool concurrency issues
+ * Fixed some scenarios where replica sets would fail to reconnect on primary
+   step down.
+ * Improved write concern handling
+ * Validate port number in URI
+ * Various other fixes
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+ * Jason Carey
+ * Andrew Clayton
+ * A. Jesse Jiryu Davis
+ * Jeremy Mikola
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.1.2
+====================
+
+It is my pleasure to announce to you the 1.1.2 release of the MongoDB C driver.
+
+This release is a stable release with performance enhancements and bugfixes.
+
+Changes include:
+ * Process connectTimeoutMS cast insensitively
+ * Addition of missing trace macros
+ * Improvement of internal error messages
+ * Fix a segfault in OpenSSL cleanup routines
+ * Fix for IPv66 support for replica sets
+ * Coalesce small vectorized TLS writes
+ * MinGW fixups
+ * Fix for a memory leak in get_database_names()
+ * Fixes for patching write concern through the bulk api
+ * Fix to normalize hostnames in uri parsing
+ * Fix for managing connections in the client pool
+ * Various other fixes
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+ * Andrew Clayton
+ * Denis Gladkikh
+ * Hannes Magnusson
+ * Jason Carey
+ * Jeremy Mikola
+ * mschoenlaub
+ * Samantha Ritter
+ * Tyler Brock
+
+Enjoy!
+
+-- Jason Carey
+
+
 mongo-c-driver 1.1.0
 ====================
 

README.rst

@@ -62,7 +62,7 @@ communications to ascertain the necessary details, delaying a useful response.
 Here is a made-up example of a help request that provides the relevant
 information:
 
-  Hello, I'm trying to build the C driver with SSL, from mongo-c-driver-1.1.1.tar.gz. I'm on Ubuntu
+  Hello, I'm trying to build the C driver with SSL, from mongo-c-driver-1.1.4.tar.gz. I'm on Ubuntu
   14.04, 64-bit Intel, with gcc 4.8.2. I run configure like::
 
     $ ./configure --enable-sasl=yes
@@ -95,13 +95,13 @@ Building from Release Tarball
 Unless you intend on contributing to the mongo-c-driver, you will want to build
 from a release tarball.
 
-The most current release is 1.1.1 which you can download here.
-`mongo-c-driver-1.1.1.tar.gz <https://github.com/mongodb/mongo-c-driver/releases/download/1.1.1/mongo-c-driver-1.1.1.tar.gz>`_.
+The most current release is 1.1.4 which you can download here.
+`mongo-c-driver-1.1.4.tar.gz <https://github.com/mongodb/mongo-c-driver/releases/download/1.1.4/mongo-c-driver-1.1.4.tar.gz>`_.
 
 To build on UNIX-like systems, do the following::
 
-  $ tar xzf mongo-c-driver-1.1.1.tar.gz
-  $ cd mongo-c-driver-1.1.1
+  $ tar xzf mongo-c-driver-1.1.4.tar.gz
+  $ cd mongo-c-driver-1.1.4
   $ ./configure
   $ make
   $ sudo make install
@@ -112,7 +112,7 @@ To see all of the options available to you during configuration, run::
 
 To build on Windows Vista or newer with Visual Studio 2010, do the following::
 
-  cd mongo-c-driver-1.1.1
+  cd mongo-c-driver-1.1.4
   cd src\libbson
   cmake -DCMAKE_INSTALL_PREFIX=C:\usr -G "Visual Studio 10 Win64" .
   msbuild.exe ALL_BUILD.vcxproj

build/autotools/CheckCompiler.m4

@@ -15,14 +15,27 @@ AC_PROG_CXX
 c_compiler="unknown"
 AC_LANG_PUSH([C])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER))
 #error Not a supported GCC compiler
 #endif
+#if defined(__GNUC__)
+#define GCC_VERSION (__GNUC__ * 10000 \
+                     + __GNUC_MINOR__ * 100 \
+                     + __GNUC_PATCHLEVEL__)
+#if GCC_VERSION < 40100
+#error Not a supported GCC compiler
+#endif
+#endif
 ])], [c_compiler="gcc"], [])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#if !(defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))
+#if defined(__clang__)
+#define CLANG_VERSION (__clang_major__ * 10000 \
+                       + __clang_minor__ * 100 \
+                       + __clang_patchlevel__)
+#if CLANG_VERSION < 30300
 #error Not a supported Clang compiler
 #endif
+#endif
 ])], [c_compiler="clang"], [])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 #if !(defined(__SUNPRO_C))

build/autotools/FindDependencies.m4

@@ -32,4 +32,7 @@ AS_IF([test "$ac_cv_search_clock_gettime" = "-lrt"],
 AS_IF([test "$enable_rdtscp" = "yes"],
       [CPPFLAGS="$CPPFLAGS -DENABLE_RDTSCP"])
 
+AS_IF([test "$enable_shm_counters" = "yes"],
+      [CPPFLAGS="$CPPFLAGS -DMONGOC_ENABLE_SHM_COUNTERS"])
+
 AX_PTHREAD

build/autotools/PrintBuildConfiguration.m4

@@ -1,6 +1,6 @@
 AC_OUTPUT
 
-if test $(( ${MONGOC_MINOR_VERSION} % 2 )) -eq 1; then
+if test -n "$MONGOC_PRERELEASE_VERSION"; then
 cat << EOF
  *** IMPORTANT *** 
 
@@ -33,6 +33,7 @@ Build configuration:
   Code coverage support                            : ${enable_coverage}
   Cross Compiling                                  : ${enable_crosscompile}
   Fast counters                                    : ${enable_rdtscp}
+  Shared memory performance counters               : ${enable_shm_counters}
   SASL                                             : ${sasl_mode}
   SSL                                              : ${enable_ssl}
   Libbson                                          : ${with_libbson}

build/autotools/ReadCommandLineArguments.m4

@@ -23,6 +23,12 @@ AC_ARG_ENABLE(optimizations,
     ])
 AC_MSG_RESULT([$enable_optimizations])
 
+AC_MSG_CHECKING([whether to enable shared memory performance counters])
+AC_ARG_ENABLE(shm_counters,
+    AC_HELP_STRING([--enable-shm-counters], [turn on shared memory performance counters [default=yes]]),
+    [],[enable_shm_counters="yes"])
+AC_MSG_RESULT([$enable_shm_counters])
+
 AC_MSG_CHECKING([whether to enable code coverage support])
 AC_ARG_ENABLE(coverage,
     AC_HELP_STRING([--enable-coverage], [enable code coverage support [default=no]]),

build/autotools/Versions.m4

@@ -1,17 +1,24 @@
 m4_define([mongoc_major_version], [1])
 m4_define([mongoc_minor_version], [1])
-m4_define([mongoc_micro_version], [1])
-m4_define([mongoc_version], [mongoc_major_version.mongoc_minor_version.mongoc_micro_version])
+m4_define([mongoc_micro_version], [5])
+m4_define([mongoc_prerelease_version], [dev])
+
+m4_define(
+    [mongoc_version],
+    m4_ifset(
+        [mongoc_prerelease_version],
+        [mongoc_major_version.mongoc_minor_version.mongoc_micro_version-mongoc_prerelease_version],
+        [mongoc_major_version.mongoc_minor_version.mongoc_micro_version]))
 
 # bump up by 1 for every micro release with no API changes, otherwise
 # set to 0. after release, bump up by 1
-m4_define([mongoc_interface_age], [1])
+m4_define([mongoc_interface_age], [5])
 m4_define([mongoc_binary_age], [m4_eval(100 * mongoc_minor_version + mongoc_micro_version)])
 
 m4_define([lt_current], [m4_eval(100 * mongoc_minor_version + mongoc_micro_version - mongoc_interface_age)])
 m4_define([lt_revision], [mongoc_interface_age])
 m4_define([lt_age], [m4_eval(mongoc_binary_age - mongoc_interface_age)])
 
-m4_define([libbson_required_version], [1.1.1])
+m4_define([libbson_required_version], [1.1.4])
 
 m4_define([sasl_required_version], [2.1.6])

build/rpm/mongo-c-driver.spec

@@ -1,9 +1,9 @@
 # norootforbuild
 
 %define DriverName    mongo-c-driver
-%define DriverVersion 1.1.1
+%define DriverVersion 1.1.5
 %define BsonName      libbson
-%define BsonVersion   1.1.1
+%define BsonVersion   1.1.5
 
 Name:           %{DriverName}
 Version:        %{DriverVersion}
@@ -117,6 +117,18 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{DriverName}
+* Wed Apr 1 2015 Jason Carey <[email protected]> - 1.1.5-1
+- Post-release bump for 1.1.4
+
+* Wed Apr 1 2015 Jason Carey <[email protected]> - 1.1.4-1
+- Release 1.1.4.
+
+* Tue Mar 10 2015 Jason Carey <[email protected]> - 1.1.3-1
+- Post-release bump for 1.1.2
+
+* Tue Mar 10 2015 Jason Carey <[email protected]> - 1.1.2-1
+- Release 1.1.2.
+
 * Wed Jan 28 2015 Jason Carey <[email protected]> - 1.1.1-1
 - Post-release bump for 1.1.0
 
@@ -167,6 +179,18 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{BsonName}
+* Wed Apr 1 2015 Jason Carey <[email protected]> - 1.1.5-1
+- Post-release bump for 1.1.4
+
+* Wed Apr 1 2015 Jason Carey <[email protected]> - 1.1.4-1
+- Release 1.1.4.
+
+* Tue Mar 10 2015 Jason Carey <[email protected]> - 1.1.3-1
+- Post-release bump for 1.1.2
+
+* Tue Mar 10 2015 Jason Carey <[email protected]> - 1.1.2-1
+- Release 1.1.2.
+
 * Wed Jan 28 2015 Jason Carey <[email protected]> - 1.1.1-1
 - Post-release bump for 1.1.0