Merged pull request #690

Author: derickr

config.m4

@@ -380,6 +380,18 @@ if test "$MONGODB" != "no"; then
   enable_srv=auto
   m4_include(src/libmongoc/build/autotools/FindResSearch.m4)
 
+  with_snappy=auto
+  with_zlib=auto
+  m4_include(src/libmongoc/build/autotools/m4/pkg.m4)
+  m4_include(src/libmongoc/build/autotools/CheckSnappy.m4)
+  m4_include(src/libmongoc/build/autotools/CheckZlib.m4)
+
+  if test "x$with_zlib" != "xno" -o "x$with_snappy" != "xno"; then
+     AC_SUBST(MONGOC_ENABLE_COMPRESSION, 1)
+  else
+     AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
+  fi
+
   m4_include(src/libmongoc/build/autotools/WeakSymbols.m4)
   m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
   AX_PTHREAD
@@ -391,7 +403,7 @@ if test "$MONGODB" != "no"; then
   PHP_SUBST(EXTRA_CFLAGS)
   PHP_SUBST(EXTRA_LDFLAGS)
 
-  MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $PTHREAD_LIBS $SASL_LIBS"
+  MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $PTHREAD_LIBS $SASL_LIBS $SNAPPY_LIBS $ZLIB_LIBS"
   PHP_SUBST(MONGODB_SHARED_LIBADD)
 
   PHP_NEW_EXTENSION(mongodb, $PHP_MONGODB_SOURCES, $ext_shared,, $PHP_MONGODB_CFLAGS)

php_phongo.c

@@ -1394,6 +1394,20 @@ static bool php_phongo_apply_options_to_uri(mongoc_uri_t *uri, bson_t *options T
 
 			continue;
 		}
+
+		if (!strcasecmp(key, MONGOC_URI_COMPRESSORS)) {
+			if (!BSON_ITER_HOLDS_UTF8(&iter)) {
+				PHONGO_URI_INVALID_TYPE(iter, "string");
+				return false;
+			}
+
+			if (!mongoc_uri_set_compressors(uri, bson_iter_utf8(&iter, NULL))) {
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Failed to parse \"%s\" URI option", key);
+				return false;
+			}
+
+			continue;
+		}
 	}
 
 	return true;

tests/connect/compression_error-001.phpt

@@ -0,0 +1,18 @@
+--TEST--
+MongoDB\Driver\Manager: Connecting with unsupported compressor
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php NEEDS('STANDALONE'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+ini_set('mongodb.debug', 'stdout');
+$manager = new MongoDB\Driver\Manager(STANDALONE, [ 'compressors' => 'zli'] );
+ini_set('mongodb.debug', null);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+%AWARNING > Unsupported compressor: 'zli'%A
+===DONE===

tests/connect/compression_error-002.phpt

@@ -0,0 +1,19 @@
+--TEST--
+MongoDB\Driver\Manager: Connecting with invalid compressor values
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php NEEDS('STANDALONE'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+echo throws(function() {
+    $manager = new MongoDB\Driver\Manager(STANDALONE, [ 'compressors' => "foo\xFEbar"] );
+}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+Detected invalid UTF-8 for fieldname "compressors": %s
+===DONE===