Include cloudControl introduced functions

 - Cherry-pick setSaslData and configureSasl with tests
 - Add deprecation warning
 - Add vagrant

Author: TooAngel

.gitignore

@@ -69,3 +69,4 @@ tests/*/*/*.php
 tests/*/*/*.exp
 tests/*/*/*.sh
 tmp-php.ini
+.vagrant/

Vagrantfile

@@ -0,0 +1,12 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "precise"
+
+  config.vm.synced_folder ".", "/vagrant_data"
+  config.vm.provision "shell", path: "script.sh"
+
+end

memcached-api.php

@@ -202,7 +202,7 @@ public function getDelayed( array $keys, $with_cas = null, $value_cb = null ) {}
 	public function getDelayedByKey( $server_key, array $keys, $with_cas = null, $value_cb = null ) {}
 
 	public function fetch( ) {}
-	
+
 	public function fetchAll( ) {}
 
 	public function set( $key, $value, $expiration = 0, $udf_flags = 0 ) {}
@@ -250,7 +250,7 @@ public function increment( $key, $offset = 1, $initial_value = 0, $expiry = 0) {
 	public function decrement( $key, $offset = 1, $initial_value = 0, $expiry = 0) {}
 
 	public function getOption( $option ) {}
-	
+
 	public function setOption( $option, $value ) {}
 
 	public function setOptions( array $options ) {}
@@ -276,7 +276,7 @@ public function getLastDisconnectedServer( ) {}
 	public function flush( $delay = 0 ) {}
 
 	public function getStats( ) {}
-	
+
 	public function getVersion( ) {}
 
 	public function getResultCode( ) {}
@@ -289,6 +289,10 @@ public function isPristine( ) {}
 
 	public function setSaslAuthData( $username, $password ) {}
 
+	public function setSaslData($username, $password) {}
+
+	public function configureSasl($username, $password) {}
+
 }
 
 class MemcachedException extends Exception {

php_memcached.c

@@ -2749,6 +2749,81 @@ static PHP_METHOD(Memcached, setSaslAuthData)
 	RETURN_TRUE;
 }
 /* }}} */
+
+/* {{{ Memcached::setSaslData(string user, string pass)
+   Sets sasl credentials (the same as Memcached::setSaslAuthData, for backward compatibility only) */
+static PHP_METHOD(Memcached, setSaslData)
+{
+	zend_error(E_DEPRECATED, "setSaslData is deprecated, use setSaslAuthData instead");
+
+	MEMC_METHOD_INIT_VARS;
+	memcached_return status;
+
+	char *user, *pass;
+	int user_len, pass_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &user, &user_len, &pass, &pass_len) == FAILURE) {
+		return;
+	}
+
+	if (!MEMC_G(use_sasl)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SASL support (memcached.use_sasl) isn't enabled in php.ini");
+		RETURN_FALSE;
+	}
+
+	MEMC_METHOD_FETCH_OBJECT;
+
+	if (!memcached_behavior_get(m_obj->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SASL is only supported with binary protocol");
+		RETURN_FALSE;
+	}
+	m_obj->has_sasl_data = 1;
+	status = memcached_set_sasl_auth_data(m_obj->memc, user, pass);
+
+	if (php_memc_handle_error(i_obj, status TSRMLS_CC) < 0) {
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ Memcached::configureSasl(string user, string pass)
+   Sets sasl credentials and changes the behavior to binary protocol */
+static PHP_METHOD(Memcached, configureSasl)
+{
+	zend_error(E_DEPRECATED, "configureSasl is deprecated, use setSaslAuthData instead and set binary protocol");
+
+	MEMC_METHOD_INIT_VARS;
+	memcached_return status;
+
+	char *user, *pass;
+	int user_len, pass_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &user, &user_len, &pass, &pass_len) == FAILURE) {
+		return;
+	}
+
+	if (!MEMC_G(use_sasl)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SASL support (memcached.use_sasl) isn't enabled in php.ini");
+		RETURN_FALSE;
+	}
+
+	MEMC_METHOD_FETCH_OBJECT;
+
+	if (memcached_behavior_set(m_obj->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) != MEMCACHED_SUCCESS) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set SASL binary protocol");
+		RETURN_FALSE;
+	}
+	m_obj->has_sasl_data = 1;
+	status = memcached_set_sasl_auth_data(m_obj->memc, user, pass);
+
+	if (php_memc_handle_error(i_obj, status TSRMLS_CC) < 0) {
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
 #endif /* HAVE_MEMCACHED_SASL */
 
 /* {{{ Memcached::getResultCode()
@@ -4040,6 +4115,16 @@ ZEND_BEGIN_ARG_INFO(arginfo_setSaslAuthData, 0)
 	ZEND_ARG_INFO(0, password)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO(arginfo_setSaslData, 0)
+        ZEND_ARG_INFO(0, username)
+        ZEND_ARG_INFO(0, password)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_configureSasl, 0)
+        ZEND_ARG_INFO(0, username)
+        ZEND_ARG_INFO(0, password)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO(arginfo_setOption, 0)
 	ZEND_ARG_INFO(0, option)
 	ZEND_ARG_INFO(0, value)
@@ -4143,7 +4228,9 @@ static zend_function_entry memcached_class_methods[] = {
 	MEMC_ME(setOptions,         arginfo_setOptions)
 	MEMC_ME(setBucket,          arginfo_setBucket)
 #ifdef HAVE_MEMCACHED_SASL
-    MEMC_ME(setSaslAuthData,    arginfo_setSaslAuthData)
+	MEMC_ME(setSaslAuthData,    arginfo_setSaslAuthData)
+	MEMC_ME(setSaslData,        arginfo_setSaslData)
+	MEMC_ME(configureSasl,      arginfo_configureSasl)
 #endif
 	MEMC_ME(isPersistent,       arginfo_isPersistent)
 	MEMC_ME(isPristine,         arginfo_isPristine)

script.sh

@@ -0,0 +1,28 @@
+cd /tmp
+export LC_ALL="en_US.UTF-8"
+locale-gen en_US.UTF-8
+
+# libmemcache
+apt-get install -y libsasl2-dev
+wget https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
+tar -zxvf libmemcached-1.0.18.tar.gz
+cd libmemcached-1.0.18
+./configure
+make
+make install
+cd ..
+
+# php-memcached
+apt-get install -y git
+apt-get install -y php5-dev
+apt-get install -y pkg-config
+
+git clone /vagrant_data php-memcached
+cd php-memcached
+
+phpize
+./configure
+make
+
+apt-get install -y php5-cli
+#make test

tests/setSaslAuth/set_sasl_auth.ini

@@ -0,0 +1,3 @@
+password = yourpassword
+servers = yourhost
+username = yourusername

tests/setSaslAuth/set_sasl_auth_data.phpt

@@ -0,0 +1,37 @@
+--TEST--
+set sasl authentification
+--FILE--
+<?php
+$config = parse_ini_file('./tests/setSaslAuth/set_sasl_auth.ini');
+if(empty($config)){
+    die('To set the authentification data please provide them in the set_sasl_auth.ini file');
+}
+
+$server = $config['servers'];
+$user = $config['username'];
+$password = $config['password'];
+
+$m = new Memcached();
+$m->addServer($server, 11211);
+
+$m->set('visitorcount', 0);
+$m->increment('visitorcount');
+echo sprintf(">%d<\n", $m->get('visitorcount'));
+
+// with authentification
+var_dump($m->setOption(Memcached::OPT_BINARY_PROTOCOL, true));
+var_dump($m->setSaslAuthData($user, $password));
+var_dump($m->configureSasl($user, $password));
+var_dump($m->setSaslData($user, $password));
+
+$m->set('private_visitorcount', 0);
+$m->increment('private_visitorcount');
+echo sprintf(">%d<", $m->get('private_visitorcount'));
+?>
+--EXPECT--
+>0<
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+>1<