Remove version check //cc #92

Author: mkoppanen

php_memcached.c

@@ -1211,54 +1211,8 @@ PHP_METHOD(Memcached, setMultiByKey)
 				}	\
 				break;	\
 		}	\
-	}	\
-
-
-static
-memcached_return s_user_flag_cb(const memcached_st *ptr, php_memcached_instance_st instance, void *in_context)
-{
-	uint32_t version;
-	uint8_t major, minor, micro;
-
-#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
-	major = memcached_server_major_version (instance);
-	minor = memcached_server_minor_version (instance);
-	micro = memcached_server_micro_version (instance);
-#else
-	major = instance->major_version;
-	minor = instance->minor_version;
-	micro = instance->micro_version;
-#endif
-
-	if ((major < 1) || (major == 1 && minor < 2) || (major == 1 && minor == 2 && micro < 1)) {
-		MEMC_G (user_flag_check_result) = 0;
-	}
-	return MEMCACHED_SUCCESS;
-}
-
-static
-zend_bool s_user_flags_possible (const memcached_st *memc TSRMLS_DC)
-{
-	memcached_server_function callbacks [1];
-
-	if (MEMC_G (user_flag_check_done))
-		return MEMC_G (user_flag_check_result);
-
-	if (memcached_version(memc) != MEMCACHED_SUCCESS) {
-		MEMC_G (user_flag_check_done)   = 1;
-		MEMC_G (user_flag_check_result) = 0;
-		return 0;
 	}
 
-	MEMC_G (user_flag_check_done)   = 1;
-	MEMC_G (user_flag_check_result) = 1;
-
-	callbacks[0] =& s_user_flag_cb;
-	memcached_server_cursor(memc, callbacks, NULL, 1);
-	return MEMC_G (user_flag_check_result);
-}
-
-
 /* {{{ -- php_memc_setMulti_impl */
 static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 {
@@ -1298,11 +1252,6 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
 	 * We use 8 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
-		if (!s_user_flags_possible (m_obj->memc TSRMLS_CC)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "memcached server 1.2.1+ needed to store user flags");
-			i_obj->rescode = MEMC_RES_VERSION_FAILURE;
-			RETURN_FALSE;
-		}
 		if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);
 		}
@@ -1512,11 +1461,6 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool
 	 * We use 8 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
-		if (!s_user_flags_possible (m_obj->memc TSRMLS_CC)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "memcached server 1.2.1+ needed to store user flags");
-			i_obj->rescode = MEMC_RES_VERSION_FAILURE;
-			RETURN_FALSE;
-		}
 		if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);
 		}
@@ -1661,11 +1605,6 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 	 * We use 8 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
-		if (!s_user_flags_possible (m_obj->memc TSRMLS_CC)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "memcached server 1.2.1+ needed to store user flags");
-			i_obj->rescode = MEMC_RES_VERSION_FAILURE;
-			RETURN_FALSE;
-		}
 		if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);
 		}
@@ -3327,8 +3266,6 @@ static void php_memc_init_globals(zend_php_memcached_globals *php_memcached_glob
 #if HAVE_MEMCACHED_SASL
 	MEMC_G(use_sasl) = 0;
 #endif
-	MEMC_G(user_flag_check_done) = 0;
-	MEMC_G(user_flag_check_result) = 0;
 }
 
 static void php_memc_destroy_globals(zend_php_memcached_globals *php_memcached_globals_p TSRMLS_DC)

php_memcached.h

@@ -93,8 +93,6 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 #if HAVE_MEMCACHED_SASL
 	zend_bool use_sasl;
 #endif
-    zend_bool user_flag_check_done;
-    zend_bool user_flag_check_result;
 ZEND_END_MODULE_GLOBALS(php_memcached)
 
 PHP_MEMCACHED_API zend_class_entry *php_memc_get_ce(void);