Skip to content

Commit ce99c07

Browse files
committed
With SASL set use_sasl to 1
Due to the fact the the php inis are copied in the buildpack from the stack image to the deployment image, introducing memcached.use_sasl=1 gets more complicated. use_sasl is not set to 1 by default.
1 parent 195f172 commit ce99c07

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

php_memcached.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ PHP_INI_BEGIN()
304304

305305
STD_PHP_INI_ENTRY("memcached.serializer", SERIALIZER_DEFAULT_NAME, PHP_INI_ALL, OnUpdateSerializer, serializer_name, zend_php_memcached_globals, php_memcached_globals)
306306
#if HAVE_MEMCACHED_SASL
307-
STD_PHP_INI_ENTRY("memcached.use_sasl", "0", PHP_INI_SYSTEM, OnUpdateBool, use_sasl, zend_php_memcached_globals, php_memcached_globals)
307+
STD_PHP_INI_ENTRY("memcached.use_sasl", "1", PHP_INI_SYSTEM, OnUpdateBool, use_sasl, zend_php_memcached_globals, php_memcached_globals)
308308
#endif
309309
STD_PHP_INI_ENTRY("memcached.store_retry_count", "2", PHP_INI_ALL, OnUpdateLong, store_retry_count, zend_php_memcached_globals, php_memcached_globals)
310310
PHP_INI_END()
@@ -4303,7 +4303,7 @@ PHP_GINIT_FUNCTION(php_memcached)
43034303
php_memcached_globals->compression_type_real = COMPRESSION_TYPE_FASTLZ;
43044304
php_memcached_globals->compression_factor = 1.30;
43054305
#if HAVE_MEMCACHED_SASL
4306-
php_memcached_globals->use_sasl = 0;
4306+
php_memcached_globals->use_sasl = 1;
43074307
#endif
43084308
php_memcached_globals->store_retry_count = 2;
43094309
}

script.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cd /tmp
22
export LC_ALL="en_US.UTF-8"
33
locale-gen en_US.UTF-8
4+
aptitude update
45

56
# libmemcache
67
apt-get install -y libsasl2-dev

0 commit comments

Comments
 (0)