Working now

Author: sodabrew

php_memcached.c

@@ -333,7 +333,7 @@ PHP_INI_MH(OnUpdateConsistentHash)
 	} else if (!strcmp(ZSTR_VAL(new_value), "ketama_weighted")) {
 		MEMC_SESS_INI(consistent_hash_type) = MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED;
 	} else {
-		php_error_docref(NULL, E_WARNING, "memcached.consistent_has_type must be ketama or ketama_weighted");
+		php_error_docref(NULL, E_WARNING, "memcached.sess_consistent_hash_type must be ketama or ketama_weighted");
 		return FAILURE;
 	}
 	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
@@ -373,7 +373,7 @@ PHP_INI_BEGIN()
 	MEMC_SESSION_INI_BOOL ("binary_protocol",        "1",          OnUpdateBool,           binary_protocol_enabled)
 #endif
 	MEMC_SESSION_INI_BOOL ("consistent_hash",        "1",          OnUpdateBool,           consistent_hash_enabled)
-	MEMC_SESSION_INI_ENTRY("consistent_hash_type",   "ketama",     OnUpdateConsistentHash, consistent_hash_type)
+	MEMC_SESSION_INI_ENTRY("consistent_hash_type",   "ketama",     OnUpdateConsistentHash, consistent_hash_name)
 	MEMC_SESSION_INI_ENTRY("number_of_replicas",     "0",          OnUpdateLongGEZero,     number_of_replicas)
 	MEMC_SESSION_INI_BOOL ("randomize_replica_read", "0",          OnUpdateBool,           randomize_replica_read_enabled)
 	MEMC_SESSION_INI_BOOL ("remove_failed_servers",  "0",          OnUpdateBool,           remove_failed_servers_enabled)
@@ -1271,7 +1271,6 @@ static PHP_METHOD(Memcached, __construct)
 
 	/* Set default behaviors */
 	if (MEMC_G(default_behavior.consistent_hash_enabled)) {
-
 		memcached_return rc = memcached_behavior_set(intern->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT);
 		if (rc != MEMCACHED_SUCCESS) {
 			php_error_docref(NULL, E_WARNING, "Failed to turn on consistent hash: %s", memcached_strerror(intern->memc, rc));

php_memcached_private.h

@@ -156,7 +156,8 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 
 		zend_bool binary_protocol_enabled;
 		zend_bool consistent_hash_enabled;
-		int consistent_hash_type;
+		char     *consistent_hash_name;
+		int       consistent_hash_type;
 
 		zend_long server_failure_limit;
 		zend_long number_of_replicas;