Merge remote-tracking branch 'origin/master' into 1.2.0-dev

* origin/master:
  1.1.11 Release
  CDRIVER-875 fix writev_full error format
  CDRIVER-875 test_stream_writev_full, better errors
  fix test_command_fq for recent mongos
  copy orchestration_configs/ from 1.2.0-dev
  copy .mci.yml from 1.2.0-dev
  CDRIVER-843: Add a test for flooding sendv()
  CDRIVER-843 & CDRIVER-756: Incorrect error checking
  CDRIVER-826: Improve errno handling
  CDRIVER-756: TRACE the errno, in case it is something, just not 'EGAIN'
  CDRIVER-826: Handle WSAEMSGSIZE
  CDRIVER-756: Improve debugging
  CDRIVER-732: Allow passing test arguments to debug test runs
  CDRIVER-756: Unchecked errors on failed network writes
  edits .gitmodules, fixes libbson url
  B-0 fixed seek method. Bad interpretation of seek_end mode. it should seek from one byte more than number of bytes written. seek_end with offset zero should put pointer exactly at the end ready to receive more data
  CDRIVER-771: Obsolete language needs updating

Conflicts:
	.mci.yml
	CMakeLists.txt
	README.rst
	build/autotools/Versions.m4
	doc/installing.page
	src/libbson
	src/mongoc/mongoc-cluster.c
	src/mongoc/mongoc-socket-private.h
	src/mongoc/mongoc-socket.c
	src/mongoc/mongoc-stream-tls.c
	src/mongoc/mongoc-stream.c
	src/mongoc/mongoc-trace.h
	tests/test-mongoc-stream.c

Author: bjori

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "src/libbson"]
 	path = src/libbson
-	url = git://github.com/mongodb/libbson.git
+	url = https://github.com/mongodb/libbson.git

NEWS

@@ -110,6 +110,28 @@ Peace,
 
   A. Jesse Jiryu Davis
 
+It is my pleasure to announce to you the MongoDB C driver 1.1.11.
+
+This is a patch release with bug fixes:
+
+ * Undetected network errors when sending messages to the server
+ * Off-by-one error in mongoc_gridfs_file_seek with mode SEEK_END
+ * Memory leak parsing a URI that contains an invalid option
+ * The libbson submodule's URL now uses the recommended https://, not git://
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+ * A. Jesse Jiryu Davis
+ * Hannes Magnusson
+ * Jason Carey
+ * Jose Sebastian Battig
+ * rubicks
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
 mongo-c-driver 1.1.10
 =====================
 

README.rst

@@ -44,7 +44,7 @@ the `mongodb-user list`_ to ask for help. Please include in your email all of th
 information:
 
 - The version of the driver you are trying to build (branch or tag).
-    - Examples: master branch, 1.0.2 tag
+    - Examples: master branch, 1.1.11 tag
 - Host OS, version, and architecture.
     - Examples: Windows 8 64-bit x86, Ubuntu 12.04 32-bit x86, OS X Mavericks
 - C Compiler and version.
@@ -59,7 +59,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.2.0.tar.gz. I'm on Ubuntu
+  Hello, I'm trying to build the C driver with SSL, from mongo-c-driver-1.1.11.tar.gz. I'm on Ubuntu
   14.04, 64-bit Intel, with gcc 4.8.2. I run configure like::
 
     $ ./configure --enable-sasl=yes

build/rpm/mongo-c-driver.spec

@@ -1,9 +1,9 @@
 # norootforbuild
 
 %define DriverName    mongo-c-driver
-%define DriverVersion 1.1.10
+%define DriverVersion 1.1.11
 %define BsonName      libbson
-%define BsonVersion   1.1.10
+%define BsonVersion   1.1.11
 
 Name:           %{DriverName}
 Version:        %{DriverVersion}
@@ -117,6 +117,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{DriverName}
+* Wed September 23 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.11-1
+- Release 1.1.11
+
 * Tue July 21 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.10-1
 - Release 1.1.10
 
@@ -194,6 +197,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{BsonName}
+* Wed September 23 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.11-1
+- Release 1.1.11
+
 * Tue July 21 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.10-1
 - Release 1.1.10
 

debian/changelog

@@ -1,3 +1,9 @@
+mongo-c-driver (1.1.11-0) unstable; urgency=low
+
+  * Release 1.1.11
+
+ -- A. Jesse Jiryu Davis <[email protected]>  Wed, 23 September 2015 12:00:00 -0400
+
 mongo-c-driver (1.1.10-0) unstable; urgency=low
 
   * Release 1.1.10

doc/installing.page

@@ -58,11 +58,11 @@
 
     <p>The following instructions are for UNIX-like systems such as GNU/Linux, FreeBSD, and Solaris. To build on Windows, see the instructions for <link xref="installing#building-windows">Building on Windows</link>.</p>
 
-    <p>The most recent release of libmongoc is 1.1.10 and can be <link href="https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.tar.gz">downloaded here</link>. The following snippet will download and extract the current release of the driver.</p>
+    <p>The most recent release of libmongoc is 1.1.11 and can be <link href="https://github.com/mongodb/mongo-c-driver/releases/download/1.1.11/mongo-c-driver-1.1.11.tar.gz">downloaded here</link>. The following snippet will download and extract the current release of the driver.</p>
 
-    <screen><output style="prompt">$ </output><input>wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.tar.gz</input>
-<output style="prompt">$ </output><input>tar -xzf mongo-c-driver-1.1.10.tar.gz</input>
-<output style="prompt">$ </output><input>cd mongo-c-driver-1.1.10/</input></screen>
+    <screen><output style="prompt">$ </output><input>wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.11/mongo-c-driver-1.1.11.tar.gz</input>
+<output style="prompt">$ </output><input>tar -xzf mongo-c-driver-1.1.11.tar.gz</input>
+<output style="prompt">$ </output><input>cd mongo-c-driver-1.1.11/</input></screen>
 
     <p>Minimal dependencies are needed to build the MongoDB C driver. Optionally, if you want Kerberos (GSSAPI) or SSL support, you need to install <code>libsasl2</code> and <code>OpenSSL</code> libraries and development headers respectively.</p>
 
@@ -138,9 +138,9 @@ Install man pages                                : yes
     <p>The following commands will download the most recent MongoDB binary release and install it using the <code>pkgadd</code> command on Solaris 10.</p>
       <screen><output style="prompt">$ </output><input>bash</input>
 <output style="prompt">bash-3.2$ </output><input>export ARCH=`uname -m`</input>
-<output style="prompt">bash-3.2$ </output><input>/usr/sfw/bin/wget --no-check-certificate "https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.${ARCH}.pkg.tar.gz"</input>
-<output style="prompt">bash-3.2$ </output><input>gunzip -c "mongo-c-driver-1.1.10.${ARCH}.pkg.tar.gz" | tar -xf -</input>
-<output style="prompt">bash-3.2$ </output><input>pkgadd -d . mongo-c-driver</input></screen>
+<output style="prompt">bash-3.2$ </output><input>/usr/sfw/bin/wget --no-check-certificate "https://github.com/mongodb/mongo-c-driver/releases/download/1.1.11/MONGOmongo-c-driver-1.1.11.${ARCH}.pkg.tar.gz"</input>
+<output style="prompt">bash-3.2$ </output><input>gunzip -c "MONGOmongo-c-driver-1.1.11.${ARCH}.pkg.tar.gz" | tar -xf -</input>
+<output style="prompt">bash-3.2$ </output><input>pkgadd -d . MONGOmongo-c-driver</input></screen>
 
   </section>
 
@@ -151,7 +151,7 @@ Install man pages                                : yes
 
     <p>Let's start by generating Visual Studio project files for libbson, a dependency of the C driver. The following assumes we are compiling for 64-bit Windows using Visual Studio 2010 Express which can be freely downloaded from Microsoft.</p>
 
-    <screen>cd mongo-c-driver-1.1.10\src\libbson
+    <screen>cd mongo-c-driver-1.1.11\src\libbson
 cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"</screen>
 
     <p>Now that we have project files generated, we can either open the project in Visual Studio or compile from the command line. Let's build using the command line program <code>msbuild.exe</code></p>
@@ -166,7 +166,7 @@ cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"</sc
 
     <p>Now let's do the same for the MongoDB C driver.</p>
 
-    <screen>cd mongo-c-driver-1.1.10
+    <screen>cd mongo-c-driver-1.1.11
 cmake -G "Visual Studio 2010 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver" "-DBSON_ROOT_DIR=C:\mongo-c-driver"
 msbuild.exe ALL_BUILD.vcxproj
 msbuild.exe INSTALL.vcxproj</screen>

doc/mongoc_version.page

@@ -17,8 +17,8 @@
 
 #define MONGOC_MAJOR_VERSION (1)
 #define MONGOC_MINOR_VERSION (1)
-#define MONGOC_MICRO_VERSION (10)
-#define MONGOC_VERSION_S     "1.1.10"
+#define MONGOC_MICRO_VERSION (11)
+#define MONGOC_VERSION_S     "1.1.11"
 #define MONGOC_VERSION_HEX   ((1 << 24) | (0 << 16) | (0 << 8) | 0)
 #define MONGOC_CHECK_VERSION(major, minor, micro)
 ]]></screen>

src/mongoc/mongoc-cluster.c

@@ -269,6 +269,7 @@ _mongoc_cluster_run_ismaster (mongoc_cluster_t *cluster,
    return false;
 }
 
+
 /*
  *--------------------------------------------------------------------------
  *
@@ -2293,6 +2294,7 @@ mongoc_cluster_sendv_to_server (mongoc_cluster_t              *cluster,
          gle.query.response_to = 0;
          gle.query.opcode = MONGOC_OPCODE_QUERY;
          gle.query.flags = MONGOC_QUERY_NONE;
+
          switch (rpcs[i].header.opcode) {
          case MONGOC_OPCODE_INSERT:
             DB_AND_CMD_FROM_COLLECTION(cmdname, rpcs[i].insert.collection);
@@ -2308,6 +2310,7 @@ mongoc_cluster_sendv_to_server (mongoc_cluster_t              *cluster,
             DB_AND_CMD_FROM_COLLECTION(cmdname, "admin.$cmd");
             break;
          }
+
          gle.query.collection = cmdname;
          gle.query.skip = 0;
          gle.query.n_return = 1;

src/mongoc/mongoc-gridfs-file.c

@@ -709,7 +709,7 @@ mongoc_gridfs_file_seek (mongoc_gridfs_file_t *file,
       offset = file->pos + delta;
       break;
    case SEEK_END:
-      offset = (file->length - 1) + delta;
+      offset = file->length + delta;
       break;
    default:
       errno = EINVAL;

src/mongoc/mongoc-stream-tls.c

@@ -44,6 +44,7 @@
 
 #define MONGOC_STREAM_TLS_BUFFER_SIZE 4096
 
+
 /**
  * mongoc_stream_tls_t:
  *
@@ -533,15 +534,10 @@ _mongoc_stream_tls_write (mongoc_stream_tls_t *tls,
       }
    }
 
-   if (ret <= 0 && BIO_should_retry (tls->bio)) {
-      if (tls->timeout_msec > 0) {
-         TRACE("I do have %dmsec left", tls->timeout_msec);
-      }
-   }
-
    RETURN (ret);
 }
 
+
 /*
  *--------------------------------------------------------------------------
  *
@@ -667,9 +663,7 @@ _mongoc_stream_tls_writev (mongoc_stream_t *stream,
    if (buf_head != buf_tail) {
       /* If we have any bytes buffered, send */
 
-      TRACE("buffered writing %ld", buf_tail - buf_head);
       child_ret = _mongoc_stream_tls_write (tls, buf_head, buf_tail - buf_head);
-      TRACE("Got %ld written", child_ret);
 
       if (child_ret < 0) {
          RETURN (child_ret);