Fix serializers

Author: mkoppanen

.travis/travis.sh

@@ -67,8 +67,8 @@ function install_libmemcached() {
 }
 
 function install_igbinary() {
-    git clone https://github.com/igbinary/igbinary.git
-    pushd igbinary
+    git clone https://github.com/igbinary/igbinary7.git
+    pushd igbinary7
         phpize
         ./configure
         make
@@ -79,7 +79,7 @@ function install_igbinary() {
 function install_msgpack() {
     git clone https://github.com/msgpack/msgpack-php.git
     pushd msgpack-php
-		git checkout php7
+        git checkout php7
         phpize
         ./configure
         make
@@ -152,9 +152,9 @@ function build_php_memcached() {
             sasl_flag="--enable-memcached-sasl"
         fi
 
-        # ./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag --enable-memcached-json --enable-memcached-msgpack --enable-memcached-igbinary
-		./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag
-		make
+        # ./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag 
+        ./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag --enable-memcached-json --enable-memcached-msgpack --enable-memcached-igbinary
+        make
         make install
     popd
 }
@@ -184,7 +184,7 @@ function run_memcached_tests() {
         rm ./tests/expire.phpt
 
         # Run normal tests
-        php run-tests.php --show-diff -d extension=memcached.so -n ./tests/*.phpt
+        php run-tests.php --show-diff -d extension=modules/memcached.so -d extension=msgpack.so -d extension=igbinary.so -n ./tests/*.phpt
         retval=$?
     popd
     return $retval;
@@ -236,10 +236,10 @@ case $ACTION in
         install_libmemcached
 
         # Install igbinary extension
-        # install_igbinary
+        install_igbinary
 
         # install msgpack
-        # install_msgpack
+        install_msgpack
 
         install_memcached
         run_memcached

php_memcached.c

@@ -3187,11 +3187,18 @@ zend_bool s_serialize_value (enum memcached_serializer serializer, zval *value,
 		*/
 #ifdef HAVE_MEMCACHED_IGBINARY
 		case SERIALIZER_IGBINARY:
-			if (igbinary_serialize((uint8_t **) &(buf->s), &buf->s->len, value) != 0) {
+		{
+			uint8_t *buffer;
+			size_t buffer_len;
+
+			if (igbinary_serialize(&buffer, &buffer_len, value) != 0) {
 				php_error_docref(NULL, E_WARNING, "could not serialize value with igbinary");
 				return 0;
 			}
+			smart_str_appendl (buf, buffer, buffer_len);
+			efree(buffer);
 			MEMC_VAL_SET_TYPE(*flags, MEMC_VAL_IS_IGBINARY);
+		}
 			break;
 #endif
 
@@ -3395,7 +3402,7 @@ zend_bool s_unserialize_value (memcached_st *memc, int val_type, zend_string *pa
 
 		case MEMC_VAL_IS_IGBINARY:
 #ifdef HAVE_MEMCACHED_IGBINARY
-			if (igbinary_unserialize((uint8_t *) payload->val, payload->len, &value)) {
+			if (igbinary_unserialize((uint8_t *) payload->val, payload->len, return_value)) {
 				ZVAL_FALSE(return_value);
 				php_error_docref(NULL, E_WARNING, "could not unserialize value with igbinary");
 				return 0;