Fixed a bug with config options and test for it

Author: mkoppanen

php_memcached.c

@@ -2540,7 +2540,7 @@ static int php_memc_set_option(php_memc_t *i_obj, long option, zval *value TSRML
 			flag = (memcached_behavior) option;
 			convert_to_long(value);
 
-			if (Z_LVAL_P(value) >= 0 && Z_LVAL_P(value) < MEMCACHED_BEHAVIOR_MAX) {
+			if (flag >= 0 && flag < MEMCACHED_BEHAVIOR_MAX) {
 				rc = memcached_behavior_set(m_obj->memc, flag, (uint64_t) Z_LVAL_P(value));
 			}
 			else {

tests/setoptions.phpt

@@ -3,7 +3,7 @@ Set options using setOptions
 --SKIPIF--
 <?php if (!extension_loaded("memcached")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $m = new Memcached();
 
 /* existing options */
@@ -12,6 +12,7 @@ var_dump($m->setOptions(array(
 	Memcached::OPT_SERIALIZER => Memcached::SERIALIZER_PHP,
 	Memcached::OPT_COMPRESSION => 0,
 	Memcached::OPT_LIBKETAMA_COMPATIBLE => 1,
+	Memcached::OPT_CONNECT_TIMEOUT => 5000,
 )));
 
 var_dump($m->getOption(Memcached::OPT_PREFIX_KEY) == 'a_prefix');
@@ -20,18 +21,14 @@ var_dump($m->getOption(Memcached::OPT_COMPRESSION) == 0);
 var_dump($m->getOption(Memcached::OPT_LIBKETAMA_COMPATIBLE) == 1);
 
 echo "test invalid options\n";
-error_reporting(0);
 
 var_dump($m->setOptions(array(
 	"asdf" => 123
 )));
-echo $php_errormsg, "\n";
 
-$php_errormsg = '';
 var_dump($m->setOptions(array(
 	-1 => 123
 )));
-echo $php_errormsg, "\n";
 
 --EXPECTF--
 bool(true)
@@ -40,7 +37,9 @@ bool(true)
 bool(true)
 bool(true)
 test invalid options
+
+Warning: Memcached::setOptions(): invalid configuration option in %s on line %d
 bool(false)
-%s::setOptions(): invalid configuration option
+
+Warning: Memcached::setOptions(): error setting memcached option: %s in %s on line %d
 bool(false)
-%s::setOptions(): error setting memcached option: %s