Merge pull request #98 from mkoppanen/feature-server

Added libmemcachedprotocol support

Author: Mikko Koppanen

Diff for: .travis.yml

@@ -1,8 +1,8 @@
 language: php
 php:
     - 5.5
-    #- 5.4
-    #- 5.3
+    - 5.4
+    - 5.3
 env:
     - LIBMEMCACHED_VERSION=1.0.17
     - LIBMEMCACHED_VERSION=1.0.16
@@ -14,38 +14,5 @@ env:
     - 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 ..
-    - git clone https://github.com/igbinary/igbinary.git
-    - cd igbinary
-    - phpize
-    - ./configure
-    - 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}" --enable-memcached-json --enable-memcached-igbinary
-    - make
-    - make install
-    - 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=igbinary.so -n ./tests/*.phpt
-    - for i in `ls tests/*.out 2>/dev/null`; do echo "-- START ${i}"; cat $i; echo ""; echo "-- END"; done
-
-
+    - ./travis.sh $LIBMEMCACHED_VERSION

Diff for: ChangeLog

@@ -16,6 +16,8 @@ Version 2.2.0b1
 		- memcached.sess_randomize_replica_read
 		- memcached.sess_remove_failed
 		- memcached.sess_connect_timeout
+	* Added support for memcached protocol handlers
+	* Added Memcached::setBucket for virtual bucket support
 
 Version 2.1.0
 -------------

Diff for: config.m4

@@ -20,6 +20,9 @@ PHP_ARG_ENABLE(memcached-json, whether to enable memcached json serializer suppo
 PHP_ARG_ENABLE(memcached-sasl, whether to disable memcached sasl support,
 [  --disable-memcached-sasl          Disable memcached sasl support], yes, no)
 
+PHP_ARG_ENABLE(memcached-protocol, whether to enable memcached protocol support,
+[  --enable-memcached-protocol          Enable memcached protocoll support], no, no)
+
 if test -z "$PHP_ZLIB_DIR"; then
 PHP_ARG_WITH(zlib-dir, for ZLIB,
 [  --with-zlib-dir[=DIR]   Set the path to ZLIB install prefix.], no)
@@ -337,15 +340,75 @@ if test "$PHP_MEMCACHED" != "no"; then
        AC_DEFINE(HAVE_LIBMEMCACHED_TOUCH, [1], [Whether memcached_touch is defined])
     fi
 
-    PHP_SUBST(MEMCACHED_SHARED_LIBADD)
-
     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"
     fi
 
-    PHP_NEW_EXTENSION(memcached, $PHP_MEMCACHED_FILES, $ext_shared,,$SESSION_INCLUDES $IGBINARY_INCLUDES)
+    LIBEVENT_INCLUDES=""
+    AC_MSG_CHECKING([for memcached protocol support])
+    if test "$PHP_MEMCACHED_PROTOCOL" != "no"; then
+      AC_MSG_RESULT([enabled])
+
+      AC_MSG_CHECKING([for libmemcachedprotocol])
+      if test "$PHP_LIBMEMCACHED_DIR" != "no" && test "$PHP_LIBMEMCACHED_DIR" != "yes"; then
+        if ! test -r "$PHP_LIBMEMCACHED_DIR/include/libmemcachedprotocol-0.0/handler.h"; then
+          AC_MSG_ERROR([Can't find libmemcachedprotocol headers under "$PHP_LIBMEMCACHED_DIR"])
+        fi
+      fi
+      AC_MSG_RESULT([found])
+
+      ORIG_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -I$PHP_LIBMEMCACHED_INCDIR"
+
+      AC_CACHE_CHECK([whether libmemcachedprotocol is usable], ac_cv_have_libmemcachedprotocol, [
+        AC_TRY_COMPILE(
+          [ #include <libmemcachedprotocol-0.0/handler.h> ],
+          [ memcached_binary_protocol_callback_st s_test_impl;
+            s_test_impl.interface.v1.delete_object = 0;
+          ],
+          [ ac_cv_have_libmemcachedprotocol="yes" ],
+          [ ac_cv_have_libmemcachedprotocol="no" ]
+        )
+      ])
+      CFLAGS="$ORIG_CFLAGS"
+
+      if test "$ac_cv_have_libmemcachedprotocol" != "yes"; then
+        AC_MSG_ERROR([Cannot enable libmemcached protocol])
+      fi
+
+      PHP_ADD_LIBRARY_WITH_PATH(memcachedprotocol, $PHP_LIBMEMCACHED_DIR/$PHP_LIBDIR, MEMCACHED_SHARED_LIBADD)
+
+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+      if test "x$PKG_CONFIG" = "xno"; then
+        AC_MSG_RESULT([pkg-config not found])
+        AC_MSG_ERROR([Please reinstall the pkg-config distribution])
+      fi
+
+      AC_MSG_CHECKING([for libevent])
+      if $PKG_CONFIG --exists libevent; then
+        PHP_MEMCACHED_LIBEVENT_VERSION=`$PKG_CONFIG libevent --modversion`
+        PHP_MEMCACHED_LIBEVENT_PREFIX=`$PKG_CONFIG libevent --variable=prefix`
+
+        AC_MSG_RESULT([found version $PHP_MEMCACHED_LIBEVENT_VERSION, under $PHP_MEMCACHED_LIBEVENT_PREFIX])
+        LIBEVENT_LIBS=`$PKG_CONFIG libevent --libs`
+        LIBEVENT_INCLUDES=`$PKG_CONFIG libevent --cflags`
+
+        PHP_EVAL_LIBLINE($LIBEVENT_LIBS, MEMCACHED_SHARED_LIBADD)
+        PHP_EVAL_INCLINE($LIBEVENT_INCLUDES)
+      else
+        AC_MSG_ERROR(Unable to find libevent installation)
+      fi
+      PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} php_memcached_server.c"
+      AC_DEFINE(HAVE_MEMCACHED_PROTOCOL,1,[Whether memcached protocol is enabled])
+    else
+      AC_MSG_RESULT([disabled])
+    fi
+
+    PHP_SUBST(MEMCACHED_SHARED_LIBADD)
+
+    PHP_NEW_EXTENSION(memcached, $PHP_MEMCACHED_FILES, $ext_shared,,$SESSION_INCLUDES $IGBINARY_INCLUDES $LIBEVENT_INCLUDES)
     PHP_ADD_BUILD_DIR($ext_builddir/fastlz, 1)
 
     ifdef([PHP_ADD_EXTENSION_DEP],

Diff for: package.xml

@@ -46,6 +46,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   * memcached.sess_randomize_replica_read
   * memcached.sess_remove_failed
   * memcached.sess_connect_timeout
+- Added support for memcached protocol handlers
+- Added Memcached::setBucket for virtual bucket support
  </notes>
  <contents>
   <dir name="/">
@@ -64,6 +66,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file role='src' name='php_memcached_session.h'/>
    <file role='src' name='php_libmemcached_compat.h'/>
    <file role='src' name='php_libmemcached_compat.c'/>
+   <file role='src' name='php_memcached_server.h'/>
+   <file role='src' name='php_memcached_server.c'/>
    <file role='src' name='g_fmt.c'/>
    <file role='src' name='g_fmt.h'/>
    <file role='src' name='fastlz/fastlz.c'/>
@@ -117,6 +121,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <file role='test' name='types_multi.phpt'/>
     <file role='test' name='undefined_set.phpt'/>
     <file role='test' name='vbucket.phpt'/>
+    <file role='test' name='user-flags.phpt'/>
+    <file role='test' name='gh_93.phpt'/>
     <file role='test' name='testdata.res'/>
     <file role='test' name='config.inc'/>
   </dir>