From 51e0309f56a69de3be7f03624b4a01b9168382bb Mon Sep 17 00:00:00 2001 From: Robert Marks Date: Thu, 21 Feb 2019 00:23:19 +0000 Subject: [PATCH] Update shm key setting --- VERSION | 2 +- doc/phpdoc/aerospike.php | 4 ++-- src/aerospike.c | 2 +- src/php_aerospike.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index ba7f754d..815da58b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.4.0 +7.4.1 diff --git a/doc/phpdoc/aerospike.php b/doc/phpdoc/aerospike.php index a59e26ae..fe8dbfcc 100644 --- a/doc/phpdoc/aerospike.php +++ b/doc/phpdoc/aerospike.php @@ -47,7 +47,7 @@ * aerospike.shm.use = false; * // Explicitly sets the shm key for this client to store shared-memory * // cluster tending results in. - * aerospike.shm.key = 0xA7000000; // integer value + * aerospike.shm.key = 0xA8000000; // integer value * // Shared memory maximum number of server nodes allowed. Leave a cushion so * // new nodes can be added without needing a client restart. * aerospike.shm.max_nodes = 16; @@ -122,7 +122,7 @@ class Aerospike { * (even an empty one) is provided. Disabled by default. * * _shm\_key_ explicitly sets the shm key for the cluster. It is * otherwise implicitly evaluated per unique hostname, and can be - * inspected with shmKey(). (default: 0xA7000000) + * inspected with shmKey(). (default: 0xA8000000) * * _shm\_max\_nodes_ maximum number of nodes allowed. Pad so new nodes * can be added without configuration changes (default: 16) * * _shm\_max\_namespaces_ maximum number of namespaces allowed (default: 8) diff --git a/src/aerospike.c b/src/aerospike.c index 523d6356..ca4d2325 100644 --- a/src/aerospike.c +++ b/src/aerospike.c @@ -37,7 +37,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("aerospike.key_policy", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateLong, key_policy, zend_aerospike_globals, aerospike_globals) STD_PHP_INI_ENTRY("aerospike.key_gen", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateLong, key_gen, zend_aerospike_globals, aerospike_globals) STD_PHP_INI_ENTRY("aerospike.shm.use", "false", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateBool, shm_use, zend_aerospike_globals, aerospike_globals) - STD_PHP_INI_ENTRY("aerospike.shm.key", "0xA7000000", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateLong, shm_key, zend_aerospike_globals, aerospike_globals) + STD_PHP_INI_ENTRY("aerospike.shm.key", "0xA8000000", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateLong, shm_key, zend_aerospike_globals, aerospike_globals) STD_PHP_INI_ENTRY("aerospike.shm.max_nodes", "16", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateLong, shm_max_nodes, zend_aerospike_globals, aerospike_globals) STD_PHP_INI_ENTRY("aerospike.shm.max_namespaces", "8", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateLong, shm_max_namespaces, zend_aerospike_globals, aerospike_globals) STD_PHP_INI_ENTRY("aerospike.shm.takeover_threshold_sec", "30", PHP_INI_PERDIR|PHP_INI_SYSTEM|PHP_INI_USER, OnUpdateLong, shm_takeover_threshold_sec, zend_aerospike_globals, aerospike_globals) diff --git a/src/php_aerospike.h b/src/php_aerospike.h index a3c8f478..a3b9bd1e 100644 --- a/src/php_aerospike.h +++ b/src/php_aerospike.h @@ -6,7 +6,7 @@ extern zend_module_entry aerospike_module_entry; #define phpext_aerospike_ptr &aerospike_module_entry -#define PHP_AEROSPIKE_VERSION "7.4.0" +#define PHP_AEROSPIKE_VERSION "7.4.1" #ifdef PHP_WIN32 # define PHP_AEROSPIKE_API __declspec(dllexport)