More work

Author: sodabrew

php_memcached.c

@@ -326,14 +326,16 @@ PHP_INI_MH(OnUpdateSessionPrefixString)
 static
 PHP_INI_MH(OnUpdateConsistentHash)
 {
-	if (!strcmp(ZSTR_VAL(new_value), "ketama")) {
-        MEMC_SESS_INI(consistent_hash_type) = MEMCACHED_BEHAVIOR_KETAMA;
+	if (!new_value) {
+		MEMC_SESS_INI(consistent_hash_type) = MEMCACHED_BEHAVIOR_KETAMA;
+	} else if (!strcmp(ZSTR_VAL(new_value), "ketama")) {
+		MEMC_SESS_INI(consistent_hash_type) = MEMCACHED_BEHAVIOR_KETAMA;
 	} else if (!strcmp(ZSTR_VAL(new_value), "ketama_weighted")) {
-        MEMC_SESS_INI(consistent_hash_type) = MEMCACHED_BEHAVIOR_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");
 		return FAILURE;
 	}
-
 	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 }
 
@@ -371,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_BOOL ("consistent_hash_type",   "ketama",     OnUpdateConsistentHash, consistent_hash_type)
+	MEMC_SESSION_INI_ENTRY("consistent_hash_type",   "ketama",     OnUpdateConsistentHash, consistent_hash_type)
 	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)

php_memcached_private.h

@@ -79,19 +79,6 @@ typedef unsigned long int uint32_t;
 #  define GC_SET_REFCOUNT(p, rc)  GC_REFCOUNT(p) = rc
 #endif
 
-/* Globals accessor macros */
-#ifdef ZTS
-#  define MEMC_G(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, memc.v)
-#  define MEMC_SERVER_G(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, server.v)
-#  define MEMC_SESS_INI(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, session.v)
-#else
-#  define MEMC_G(v) (php_memcached_globals.memc.v)
-#  define MEMC_SERVER_G(v) (php_memcached_globals.server.v)
-#  define MEMC_SESS_INI(v) (php_memcached_globals.session.v)
-#endif
-
-#define MEMC_SESS_STR_INI(vv) ((MEMC_SESS_INI(vv) && *MEMC_SESS_INI(vv)) ? MEMC_SESS_INI(vv) : NULL)
-
 /****************************************
   Structures and definitions
 ****************************************/
@@ -169,7 +156,7 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 
 		zend_bool binary_protocol_enabled;
 		zend_bool consistent_hash_enabled;
-		zend_bool consistent_hash_type;
+		int consistent_hash_type;
 
 		zend_long server_failure_limit;
 		zend_long number_of_replicas;
@@ -221,6 +208,19 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 
 ZEND_END_MODULE_GLOBALS(php_memcached)
 
+/* Globals accessor macros */
+#ifdef ZTS
+#  define MEMC_G(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, memc.v)
+#  define MEMC_SERVER_G(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, server.v)
+#  define MEMC_SESS_INI(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, session.v)
+#else
+#  define MEMC_G(v) (php_memcached_globals.memc.v)
+#  define MEMC_SERVER_G(v) (php_memcached_globals.server.v)
+#  define MEMC_SESS_INI(v) (php_memcached_globals.session.v)
+#endif
+
+#define MEMC_SESS_STR_INI(vv) ((MEMC_SESS_INI(vv) && *MEMC_SESS_INI(vv)) ? MEMC_SESS_INI(vv) : NULL)
+
 PHP_RINIT_FUNCTION(memcached);
 PHP_RSHUTDOWN_FUNCTION(memcached);
 PHP_MINIT_FUNCTION(memcached);

php_memcached_session.c

@@ -179,9 +179,11 @@ static
 zend_bool s_configure_from_ini_values(memcached_st *memc, zend_bool silent)
 {
 #define check_set_behavior(behavior, value) \
-	if ((value) != memcached_behavior_get(memc, (behavior))) { \
+	int b = (behavior); \
+	uint64_t v = (value); \
+	if (v != memcached_behavior_get(memc, b)) { \
 		memcached_return rc; \
-		if ((rc = memcached_behavior_set(memc, (behavior), (value))) != MEMCACHED_SUCCESS) { \
+		if ((rc = memcached_behavior_set(memc, b, v)) != MEMCACHED_SUCCESS) { \
 			if (!silent) { \
 				php_error_docref(NULL, E_WARNING, "failed to initialise session memcached configuration: %s", memcached_strerror(memc, rc)); \
 			} \