Fix --disable-memcached-session by ifdef-ing session INI handler callbacks (#420)

sodabrew · web-flow · commit c85d9029fbe5 · 2018-12-24T13:16:42.000-08:00
Resolves #396
diff --git a/php_memcached.c b/php_memcached.c
@@ -302,6 +302,7 @@ static PHP_INI_MH(OnUpdateSerializer)
 	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 }
 
+#ifdef HAVE_MEMCACHED_SESSION
 static
 PHP_INI_MH(OnUpdateDeprecatedLockValue)
 {
@@ -342,6 +343,7 @@ PHP_INI_MH(OnUpdateConsistentHash)
 	}
 	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 }
+#endif // HAVE_MEMCACHED_SESSION
 
 #define MEMC_INI_ENTRY(key, default_value, update_fn, gkey) \
 	STD_PHP_INI_ENTRY("memcached."key, default_value, PHP_INI_ALL, update_fn, memc.gkey, zend_php_memcached_globals, php_memcached_globals)

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,7 @@ static PHP_INI_MH(OnUpdateSerializer)`
`302`	`302`	`return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
`303`	`303`	`}`
`304`	`304`
	`305`	`+#ifdef HAVE_MEMCACHED_SESSION`
`305`	`306`	`static`
`306`	`307`	`PHP_INI_MH(OnUpdateDeprecatedLockValue)`
`307`	`308`	`{`
`@@ -342,6 +343,7 @@ PHP_INI_MH(OnUpdateConsistentHash)`
`342`	`343`	`}`
`343`	`344`	`return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
`344`	`345`	`}`
	`346`	`+#endif // HAVE_MEMCACHED_SESSION`
`345`	`347`
`346`	`348`	`#define MEMC_INI_ENTRY(key, default_value, update_fn, gkey) \`
`347`	`349`	`STD_PHP_INI_ENTRY("memcached."key, default_value, PHP_INI_ALL, update_fn, memc.gkey, zend_php_memcached_globals, php_memcached_globals)`