PHPC-553: Check for connection exceptions in exec and SS methods

executeCommand(), executeQuery(), and selectServer() did not check for a global exception after executing via libmongoc, which meant that connection and SSL exceptions might end up as the previous exception where they could be easily ignored.

This makes these methods consistent with executeBulkWrite(), which happens to be used in our SSL tests where we check for such exceptions.

Author: jmikola

php_phongo.c

@@ -618,6 +618,12 @@ int phongo_execute_query(mongoc_client_t *client, const char *namespace, const p
 	if (!mongoc_cursor_next(cursor, &doc)) {
 		bson_error_t error;
 
+		/* Check for connection related exceptions */
+		if (EG(exception)) {
+			mongoc_cursor_destroy(cursor);
+			return false;
+		}
+
 		/* Could simply be no docs, which is not an error */
 		if (mongoc_cursor_error(cursor, &error)) {
 			phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
@@ -652,6 +658,12 @@ int phongo_execute_command(mongoc_client_t *client, const char *db, const bson_t
 	if (!mongoc_cursor_next(cursor, &doc)) {
 		bson_error_t error;
 
+		/* Check for connection related exceptions */
+		if (EG(exception)) {
+			mongoc_cursor_destroy(cursor);
+			return false;
+		}
+
 		if (mongoc_cursor_error(cursor, &error)) {
 			mongoc_cursor_destroy(cursor);
 			phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);

src/MongoDB/Manager.c

@@ -284,6 +284,11 @@ PHP_METHOD(Manager, selectServer)
 		phongo_server_init(return_value, intern->client, selected_server->id TSRMLS_CC);
 		mongoc_server_description_destroy(selected_server);
 	} else {
+		/* Check for connection related exceptions */
+		if (EG(exception)) {
+			return;
+		}
+
 		phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "%s", error.message);
 	}
 }