Merge remote-tracking branch 'parent/master' into feature-udf

Author: Nicolas Van Eenaeme

.travis.yml

@@ -0,0 +1,43 @@
+language: php
+php:
+    - 5.5
+    #- 5.4
+    #- 5.3
+env:
+    - LIBMEMCACHED_VERSION=1.0.17
+    - LIBMEMCACHED_VERSION=1.0.16
+    - LIBMEMCACHED_VERSION=1.0.15
+    - LIBMEMCACHED_VERSION=1.0.14
+    - LIBMEMCACHED_VERSION=1.0.10
+    - LIBMEMCACHED_VERSION=1.0.8
+    - LIBMEMCACHED_VERSION=1.0.2
+    - LIBMEMCACHED_VERSION=0.53
+    - LIBMEMCACHED_VERSION=0.44
+
+before_script:
+    - for file in tests/*.phpt; do grep $(basename $file) package.xml >/dev/null || (echo "Missing $file from package.xml" ; exit 1); done
+    - wget "https://launchpad.net/libmemcached/1.0/${LIBMEMCACHED_VERSION}/+download/libmemcached-${LIBMEMCACHED_VERSION}.tar.gz"
+    - tar xvfz libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
+    - cd libmemcached-${LIBMEMCACHED_VERSION}
+    - ./configure --prefix="${HOME}/libmemcached-${LIBMEMCACHED_VERSION}" LDFLAGS="-lpthread"
+    - make
+    - make install
+    - cd ..
+
+
+script:
+    - export PHP_MEMCACHED_VERSION=$(php -r '$sxe = simplexml_load_file ("package.xml"); echo (string) $sxe->version->release;')
+    - pear package
+    - mkdir /tmp/php-memcached-build
+    - tar xfz "memcached-${PHP_MEMCACHED_VERSION}.tgz" -C /tmp/php-memcached-build
+    - cd /tmp/php-memcached-build/memcached-${PHP_MEMCACHED_VERSION}
+    - phpize
+    - ./configure --with-libmemcached-dir="${HOME}/libmemcached-${LIBMEMCACHED_VERSION}"
+    - make
+    - export NO_INTERACTION=1
+    - export REPORT_EXIT_STATUS=1
+    - export TEST_PHP_EXECUTABLE=`which php`
+    - php run-tests.php -d extension=memcached.so -d extension_dir=modules -n ./tests/*.phpt
+    - for i in `ls tests/*.out 2>/dev/null`; do echo "-- START ${i}"; cat $i; echo ""; echo "-- END"; done
+
+

ChangeLog

@@ -1,5 +1,22 @@
 memcached extension changelog
 
+Version 2.2.0b1
+---------------
+	* Reinstate support for libememcached 0.x series
+	* Added SASL support to session handler
+	* Added Memcached::flushBuffers as per GH #78
+	* Fixes GH #54: Fixed UDP server adding with newer libmemcached
+	* Fixed PHP bug #65334: (Segfault if uncompress value failed)
+	* Fixes GH #14: get with cas token fails to fetch all results
+	* Fixes GH #68: memcached 2.1.0 requires libmemcached 1.0.10
+	* Fixes GH #69: compiling on CentOS 6.4 with libmemcached 1.0.17
+	* Merged PR #91: memcached.sess_lock_wait and memcached.sess_lock_max_wait
+	*  Added session handler settings:
+		- memcached.sess_number_of_replicas
+		- memcached.sess_randomize_replica_read
+		- memcached.sess_remove_failed
+		- memcached.sess_connect_timeout
+
 Version 2.1.0
 -------------
 	* Drop support for libmemcached 0.x series, now 1.0.x is required
@@ -41,8 +58,6 @@ Version 2.0.0b2
 
 Version 2.0.0b1
 ---------------
-	* Change the return value for non-existing keys to be NULL rather than
-	  'false', affects simple get only
 	* Add fastlz library that provides better/faster payload compression
 	* Add configure switch to enable/disable JSON serialization support
 	* Add getAllKeys() method

README.markdown

@@ -1,3 +1,7 @@
+Build Status
+------------
+[![Build Status](https://travis-ci.org/php-memcached-dev/php-memcached.png?branch=master)](https://travis-ci.org/php-memcached-dev/php-memcached)
+
 Description
 -----------
 This extension uses libmemcached library to provide API for communicating with
@@ -7,8 +11,16 @@ memcached is a high-performance, distributed memory object caching system,
 generic in nature, but intended for use in speeding up dynamic web applications
 by alleviating database load.
 
+Building
+--------
+
+    $ phpize
+    $ ./configure
+    $ make
+    $ make test
+
 Resources
 ---------
- * [libmemcached](http://tangent.org/552/libmemcached.html)
- * [memcached](http://www.danga.com/memcached/)
+ * [libmemcached](http://libmemcached.org/libMemcached.html)
+ * [memcached](http://memcached.org/)
  * [igbinary](https://github.com/phadej/igbinary/)

config.m4

@@ -18,7 +18,7 @@ PHP_ARG_ENABLE(memcached-json, whether to enable memcached json serializer suppo
 [  --enable-memcached-json          Enable memcached json serializer support], no, no)
 
 PHP_ARG_ENABLE(memcached-sasl, whether to disable memcached sasl support,
-[  --disable-memcached-sasl          Disable memcached sasl support], no, no)
+[  --disable-memcached-sasl          Disable memcached sasl support], yes, no)
 
 if test -z "$PHP_ZLIB_DIR"; then
 PHP_ARG_WITH(zlib-dir, for ZLIB,
@@ -224,8 +224,8 @@ if test "$PHP_MEMCACHED" != "no"; then
 
   AC_MSG_CHECKING([for libmemcached location])
   if test "$PHP_LIBMEMCACHED_DIR" != "no" && test "$PHP_LIBMEMCACHED_DIR" != "yes"; then
-    if ! test -r "$PHP_LIBMEMCACHED_DIR/include/libmemcached-1.0/memcached.h"; then
-      AC_MSG_ERROR([Can't find libmemcached 1.0.x headers under "$PHP_LIBMEMCACHED_DIR"])
+    if ! test -r "$PHP_LIBMEMCACHED_DIR/include/libmemcached/memcached.h"; then
+      AC_MSG_ERROR([Can't find libmemcached headers under "$PHP_LIBMEMCACHED_DIR"])
     fi
   else
     PHP_LIBMEMCACHED_DIR="no"
@@ -238,17 +238,108 @@ if test "$PHP_MEMCACHED" != "no"; then
   fi
 
   if test "$PHP_LIBMEMCACHED_DIR" = "no"; then
-    AC_MSG_ERROR([memcached support requires libmemcached 1.0.x. Use --with-libmemcached-dir=<DIR> to specify the prefix where libmemcached headers and library are located])
+    AC_MSG_ERROR([memcached support requires libmemcached. Use --with-libmemcached-dir=<DIR> to specify the prefix where libmemcached headers and library are located])
   else
     AC_MSG_RESULT([$PHP_LIBMEMCACHED_DIR])
 
     PHP_LIBMEMCACHED_INCDIR="$PHP_LIBMEMCACHED_DIR/include"
     PHP_ADD_INCLUDE($PHP_LIBMEMCACHED_INCDIR)
     PHP_ADD_LIBRARY_WITH_PATH(memcached, $PHP_LIBMEMCACHED_DIR/$PHP_LIBDIR, MEMCACHED_SHARED_LIBADD)
 
+    ORIG_CFLAGS="$CFLAGS"
+    ORIG_LIBS="$LIBS"
+
+    CFLAGS="$CFLAGS -I$PHP_LIBMEMCACHED_INCDIR"
+
+    #
+    # Added -lpthread here because AC_TRY_LINK tests on CentOS 6 seem to fail with undefined reference to pthread_once
+    #
+    LIBS="$LIBS -lpthread -lmemcached -L$PHP_LIBMEMCACHED_DIR/$PHP_LIBDIR"
+
+    AC_CACHE_CHECK([whether memcached_instance_st is defined], ac_cv_have_memcached_instance_st, [
+      AC_TRY_COMPILE(
+        [ #include <libmemcached/memcached.h> ],
+        [ const memcached_instance_st *instance = NULL; ],
+        [ ac_cv_have_memcached_instance_st="yes" ],
+        [ ac_cv_have_memcached_instance_st="no" ]
+      )
+    ])
+
+    AC_CACHE_CHECK([whether MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS is defined], ac_cv_have_libmemcached_remove_failed_servers, [
+      AC_TRY_COMPILE(
+        [ #include <libmemcached/memcached.h> ],
+        [ MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS; ],
+        [ ac_cv_have_libmemcached_remove_failed_servers="yes" ],
+        [ ac_cv_have_libmemcached_remove_failed_servers="no" ]
+      )
+    ])
+
+    AC_CACHE_CHECK([whether MEMCACHED_SERVER_TEMPORARILY_DISABLED is defined], ac_cv_have_libmemcached_server_temporarily_disabled, [
+      AC_TRY_COMPILE(
+        [ #include <libmemcached/memcached.h> ],
+        [ MEMCACHED_SERVER_TEMPORARILY_DISABLED; ],
+        [ ac_cv_have_libmemcached_server_temporarily_disabled="yes" ],
+        [ ac_cv_have_libmemcached_server_temporarily_disabled="no" ]
+      )
+    ])
+
+    AC_CACHE_CHECK([whether memcached function exists], ac_cv_have_libmemcached_memcached, [
+      AC_TRY_LINK(
+        [ #include <libmemcached/memcached.h> ],
+        [ memcached("t", sizeof ("t")); ],
+        [ ac_cv_have_libmemcached_memcached="yes" ],
+        [ ac_cv_have_libmemcached_memcached="no" ]
+      )
+    ])
+
+    AC_CACHE_CHECK([whether libmemcached_check_configuration function exists], ac_cv_have_libmemcached_check_configuration, [
+      AC_TRY_LINK(
+        [ #include <libmemcached/memcached.h> ],
+        [ libmemcached_check_configuration("", 1, "", 1); ],
+        [ ac_cv_have_libmemcached_check_configuration="yes" ],
+        [ ac_cv_have_libmemcached_check_configuration="no" ]
+      )
+    ])
+
+    AC_CACHE_CHECK([whether memcached_touch function exists], ac_cv_have_libmemcached_touch, [
+      AC_TRY_LINK(
+        [ #include <libmemcached/memcached.h> ],
+        [ memcached_touch (NULL, NULL, 0, 0); ],
+        [ ac_cv_have_libmemcached_touch="yes" ],
+        [ ac_cv_have_libmemcached_touch="no" ]
+      )
+    ])
+
+    CFLAGS="$ORIG_CFLAGS"
+    LIBS="$ORIG_LIBS"
+
+    if test "$ac_cv_have_memcached_instance_st" = "yes"; then
+       AC_DEFINE(HAVE_MEMCACHED_INSTANCE_ST, [1], [Whether memcached_instance_st is defined])
+    fi
+
+    if test "$ac_cv_have_libmemcached_remove_failed_servers" = "yes"; then
+       AC_DEFINE(HAVE_LIBMEMCACHED_REMOVE_FAILED_SERVERS, [1], [Whether MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS is defined])
+    fi
+
+    if test "$ac_cv_have_libmemcached_server_temporarily_disabled" = "yes"; then
+       AC_DEFINE(HAVE_LIBMEMCACHED_SERVER_TEMPORARILY_MARKER_DISABLED, [1], [Whether MEMCACHED_SERVER_TEMPORARILY_DISABLED is defined])
+    fi
+
+    if test "$ac_cv_have_libmemcached_memcached" = "yes"; then
+       AC_DEFINE(HAVE_LIBMEMCACHED_MEMCACHED, [1], [Whether memcached is defined])
+    fi
+
+    if test "$ac_cv_have_libmemcached_check_configuration" = "yes"; then
+       AC_DEFINE(HAVE_LIBMEMCACHED_CHECK_CONFIGURATION, [1], [Whether libmemcached_check_configuration is defined])
+    fi
+
+    if test "$ac_cv_have_libmemcached_touch" = "yes"; then
+       AC_DEFINE(HAVE_LIBMEMCACHED_TOUCH, [1], [Whether memcached_touch is defined])
+    fi
+
     PHP_SUBST(MEMCACHED_SHARED_LIBADD)
 
-    PHP_MEMCACHED_FILES="php_memcached.c fastlz/fastlz.c g_fmt.c"
+    PHP_MEMCACHED_FILES="php_memcached.c php_libmemcached_compat.c fastlz/fastlz.c g_fmt.c"
 
     if test "$PHP_MEMCACHED_SESSION" != "no"; then
       PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} php_memcached_session.c"

memcached-api.php

@@ -241,9 +241,9 @@ public function deleteMulti( array $keys, $expiration = 0 ) {}
 
 	public function deleteMultiByKey( $server_key, array $keys, $expiration = 0 ) {}
 
-	public function increment( $key, $offset = 1) {}
+	public function increment( $key, $offset = 1, $initial_value = 0, $expiry = 0) {}
 
-	public function decrement( $key, $offset = 1) {}
+	public function decrement( $key, $offset = 1, $initial_value = 0, $expiry = 0) {}
 
 	public function getOption( $option ) {}
 
@@ -281,6 +281,8 @@ public function isPersistent( ) {}
 
 	public function isPristine( ) {}
 
+  public function setSaslAuthData( $username, $password ) {}
+
 }
 
 class MemcachedException extends Exception {

memcached.ini

@@ -12,6 +12,18 @@ memcached.sess_locking = On
 ; the default is 150000
 memcached.sess_lock_wait = 150000
 
+; The maximum time, in seconds, to wait for a session lock
+; before timing out.
+; Setting to 0 results in default behavior, which is to
+; use max_execution_time.
+memcached.sess_lock_max_wait = 0;
+
+; The time, in seconds, before a lock should release itself.
+; Setting to 0 results in the default behaviour, which is to
+; use the memcached.sess_lock_max_wait setting. If that is
+; also 0, max_execution_time will be used.
+memcached.sess_lock_expire = 0;
+
 ; memcached session key prefix
 ; valid values are strings less than 219 bytes long
 ; the default value is "memc.sess.key."
@@ -35,18 +47,28 @@ memcached.sess_remove_failed = 1
 ; from a replica. However, if the failed memcache server
 ; becomes available again it will read the session from there
 ; which could have old data or no data at all
-memcached.sess_num_replicas = 0;
+memcached.sess_number_of_replicas = 0
 
 ; memcached session binary mode
 ; libmemcached replicas only work if binary mode is enabled
 memcached.sess_binary = Off
 
-; memcached session number of replicas
-memcached.sess_number_of_replicas = 0
-
 ; memcached session replica read randomize
 memcached.sess_randomize_replica_read = Off
 
+; memcached connect timeout value
+; In non-blocking mode this changes the value of the timeout 
+; during socket connection in milliseconds. Specifying -1 means an infinite timeout.
+memcached.sess_connect_timeout = 1000
+
+; Session SASL username
+; Both username and password need to be set for SASL to be enabled
+; In addition to this memcached.use_sasl needs to be on
+memcached.sess_sasl_username = NULL
+
+; Session SASL password
+memcached.sess_sasl_password = NULL
+
 ; Set the compression type
 ; valid values are: fastlz, zlib
 ; the default is fastlz
@@ -81,3 +103,9 @@ memcached.compression_threshold = 2000
 ;
 ; The default is igbinary if available and php otherwise.
 memcached.serializer = "igbinary"
+
+; Use SASL authentication for connections
+; valid values: On, Off
+; the default is Off
+memcached.use_sasl = Off
+