Skip to content

Php7 #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jan 20, 2016
Merged

Php7 #209

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9e11ffa
Revert the user flags and move into Memcached::getLastUserFlags
mkoppanen Jan 16, 2016
0b57cd0
Merge branch 'php7' of github.com:php-memcached-dev/php-memcached int…
mkoppanen Jan 16, 2016
9d5f3b9
Use cache with travis
mkoppanen Jan 16, 2016
852d60c
More travis updates
mkoppanen Jan 16, 2016
f3bfce3
Run our own memcached
mkoppanen Jan 16, 2016
dcdd3b8
Allow specifying memcached version
mkoppanen Jan 16, 2016
5eb3bfd
Fixes to keys and tests
mkoppanen Jan 18, 2016
029784c
Show diff
mkoppanen Jan 18, 2016
00d99de
Should fix sasl
mkoppanen Jan 18, 2016
238a403
Should fix sasl
mkoppanen Jan 18, 2016
5a1d092
Run right memcached
mkoppanen Jan 18, 2016
37f2618
Memcached log
mkoppanen Jan 18, 2016
7e5f092
SASL is tricky
mkoppanen Jan 18, 2016
1aab3f7
Remove debug logging
mkoppanen Jan 18, 2016
e6946ee
Remove debug logging
mkoppanen Jan 18, 2016
fd8fead
Remove really old libmemcached versions. If anyone is using this old …
mkoppanen Jan 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Should fix sasl
  • Loading branch information
@mkoppanen
mkoppanen committed Jan 18, 2016
commit 238a403ea87036c18982dfcb1d7d3fea26cb367b
7 changes: 4 additions & 3 deletions .travis/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function install_msgpack() {
}

function install_memcached() {
local prefix="${HOME}/cache/memcached-${MEMCACHED_VERSION}"
local prefix="${HOME}/cache/memcached-sasl-${MEMCACHED_VERSION}"

if test -d "$prefix"
then
Expand All @@ -100,7 +100,7 @@ function install_memcached() {
tar xfz memcached-${MEMCACHED_VERSION}.tar.gz

pushd memcached-${MEMCACHED_VERSION}
./configure --enable-sasl --prefix="${prefix}"
./configure --enable-sasl --enable-sasl-pwdb --prefix="${prefix}"
make
make install
popd
Expand Down Expand Up @@ -137,7 +137,8 @@ function run_memcached() {
"${prefix}/bin/memcached" -d -p 11211

# Run memcached on port 11212 with SASL support
MEMCACHED_SASL_PWDB="${SASL_CONF_PATH}/sasldb2" "${prefix}/bin/memcached" -S -d -p 11212
export MEMCACHED_SASL_PWDB="${SASL_CONF_PATH}/sasldb2"
"${prefix}/bin/memcached" -S -d -p 11212
}

function build_php_memcached() {
Expand Down