Merge pull request php-memcached-dev#130 from poison/feature-servertimeoutlimit

Added the OPT_SERVER_TIMEOUT_LIMIT behaviour.

Author: mkoppanen

memcached-api.php

@@ -65,6 +65,8 @@ class Memcached {
 
 	const OPT_SERVER_FAILURE_LIMIT;
 
+	const OPT_SERVER_TIMEOUT_LIMIT;
+
 	const OPT_CACHE_LOOKUPS;
 
 	const OPT_AUTO_EJECT_HOSTS;

php_libmemcached_compat.h

@@ -46,6 +46,9 @@ memcached_st *php_memc_create_str (const char *str, size_t str_len);
 #  define HAVE_LIBMEMCACHED_MEMCACHED 1
 #endif
 
+#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000018
+#  define HAVE_MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT 1
+#endif
 
 #ifdef HAVE_MEMCACHED_INSTANCE_ST
 typedef const memcached_instance_st * php_memcached_instance_st;

php_memcached.c

@@ -4348,6 +4348,9 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
 #ifdef HAVE_MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS
 	REGISTER_MEMC_CLASS_CONST_LONG(OPT_REMOVE_FAILED_SERVERS, MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS);
 #endif
+#ifdef HAVE_MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT
+	REGISTER_MEMC_CLASS_CONST_LONG(OPT_SERVER_TIMEOUT_LIMIT, MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT);
+#endif
 
 	/*
 	 * libmemcached result codes