Merge pull request #623

Author: jmikola

php_phongo.c

@@ -1166,20 +1166,24 @@ static bool php_phongo_apply_rp_options_to_uri(mongoc_uri_t *uri, bson_t *option
 
 	/* Handle maxStalenessSeconds, and make sure it is not combined with primary
 	 * readPreference */
-	if (bson_iter_init_find_case(&iter, options, MONGOC_URI_MAXSTALENESSSECONDS) && BSON_ITER_HOLDS_INT32(&iter)) {
-		int32_t max_staleness_seconds = bson_iter_int32(&iter);
+	if (bson_iter_init_find_case(&iter, options, MONGOC_URI_MAXSTALENESSSECONDS) && BSON_ITER_HOLDS_INT(&iter)) {
+		int64_t max_staleness_seconds = bson_iter_as_int64(&iter);
 
 		if (max_staleness_seconds != MONGOC_NO_MAX_STALENESS) {
 
 			if (max_staleness_seconds < MONGOC_SMALLEST_MAX_STALENESS_SECONDS) {
-				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected maxStalenessSeconds to be >= %d, %" PRId32 " given", MONGOC_SMALLEST_MAX_STALENESS_SECONDS, max_staleness_seconds);
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected maxStalenessSeconds to be >= %d, %" PRId64 " given", MONGOC_SMALLEST_MAX_STALENESS_SECONDS, max_staleness_seconds);
 				mongoc_read_prefs_destroy(new_rp);
 
 				return false;
 			}
 
-			/* max_staleness_seconds is fetched as an INT32, so there is no need to check
-			 * if it exists INT32_MAX as we do in the ReadPreference constructor. */
+			if (max_staleness_seconds > INT32_MAX) {
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected maxStalenessSeconds to be <= %d, %" PRId64 " given", INT32_MAX, max_staleness_seconds);
+				mongoc_read_prefs_destroy(new_rp);
+
+				return false;
+			}
 
 			if (mongoc_read_prefs_get_mode(new_rp) == MONGOC_READ_PRIMARY) {
 				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Primary read preference mode conflicts with maxStalenessSeconds");

tests/manager/manager-ctor-read_preference-error-002.phpt

@@ -13,6 +13,10 @@ echo throws(function() {
     $manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?maxStalenessSeconds=1231');
 }, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
 
+echo throws(function() {
+    $manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?readPreference=secondary&maxStalenessSeconds=2147483648');
+}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
+
 echo throws(function() {
     $manager = new MongoDB\Driver\Manager(null, ['maxstalenessseconds' => 1231]);
 }, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
@@ -42,6 +46,8 @@ Failed to parse MongoDB URI: 'mongodb://127.0.0.1/?maxstalenessseconds=1231'. In
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Failed to parse MongoDB URI: 'mongodb://127.0.0.1/?maxStalenessSeconds=1231'. Invalid readPreferences.
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Failed to parse MongoDB URI: 'mongodb://127.0.0.1/?readPreference=secondary&maxStalenessSeconds=2147483648'. Unknown option or value for 'maxStalenessSeconds=2147483648'.
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Primary read preference mode conflicts with maxStalenessSeconds
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Primary read preference mode conflicts with maxStalenessSeconds

tests/manager/manager-ctor-read_preference-error-004.phpt

@@ -0,0 +1,20 @@
+--TEST--
+MongoDB\Driver\Manager::__construct(): invalid read preference (maxStalenessSeconds range)
+--SKIPIF--
+<?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo throws(function() {
+    $manager = new MongoDB\Driver\Manager(null, ['readPreference' => 'secondary', 'maxStalenessSeconds' => 2147483648]);
+}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected maxStalenessSeconds to be <= 2147483647, 2147483648 given
+===DONE===