From 82264b4399dbb797287fbc18c7ece03d6a362c79 Mon Sep 17 00:00:00 2001
From: davidsteinsland <david@davidsteinsland.net>
Date: Sun, 17 Nov 2013 11:25:50 +0100
Subject: [PATCH 1/2] Fixed whitespaces

---
 php_memcached.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/php_memcached.c b/php_memcached.c
index 0c7b9491..9dccb05a 100644
--- a/php_memcached.c
+++ b/php_memcached.c
@@ -2804,18 +2804,18 @@ static char *php_memc_zval_to_payload(zval *value, size_t *payload_len, uint32_t
 				}
 #endif
 #ifdef HAVE_MEMCACHED_MSGPACK
-                case SERIALIZER_MSGPACK:
-                    php_msgpack_serialize(&buf, value TSRMLS_CC);
+				case SERIALIZER_MSGPACK:
+					php_msgpack_serialize(&buf, value TSRMLS_CC);
 					if(!buf.c) {
 						php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not serialize value with msgpack");
-                        smart_str_free(&buf);
-                        return NULL;
-                    } 
-                    p = buf.c;
-                    l = buf.len;
-                    buf_used = 1;
-                    MEMC_VAL_SET_TYPE(*flags, MEMC_VAL_IS_MSGPACK);
-                    break;
+						smart_str_free(&buf);
+						return NULL;
+					}
+					p = buf.c;
+					l = buf.len;
+					buf_used = 1;
+					MEMC_VAL_SET_TYPE(*flags, MEMC_VAL_IS_MSGPACK);
+					break;
 #endif
 				default:
 				{
@@ -3048,14 +3048,14 @@ static int php_memc_zval_from_payload(zval *value, char *payload, size_t payload
 #endif
 			break;
 
-        case MEMC_VAL_IS_MSGPACK:
+		case MEMC_VAL_IS_MSGPACK:
 #ifdef HAVE_MEMCACHED_MSGPACK
 			php_msgpack_unserialize(value, payload, payload_len TSRMLS_CC);
 #else
-            php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not unserialize value, no msgpack support");
-            goto my_error;
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not unserialize value, no msgpack support");
+			goto my_error;
 #endif
-            break;
+			break;
 
 		default:
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown payload type");
@@ -3709,13 +3709,13 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
 	REGISTER_MEMC_CLASS_CONST_LONG(HAVE_JSON, 0);
 #endif
 
-    /*
-     * Indicate whether msgpack serializer is available
-     */
+	/*
+	 * Indicate whether msgpack serializer is available
+	 */
 #ifdef HAVE_MEMCACHED_MSGPACK
-    REGISTER_MEMC_CLASS_CONST_LONG(HAVE_MSGPACK, 1);
+	REGISTER_MEMC_CLASS_CONST_LONG(HAVE_MSGPACK, 1);
 #else
-    REGISTER_MEMC_CLASS_CONST_LONG(HAVE_MSGPACK, 0);
+	REGISTER_MEMC_CLASS_CONST_LONG(HAVE_MSGPACK, 0);
 #endif
 
 #ifdef HAVE_MEMCACHED_SESSION
@@ -3960,9 +3960,9 @@ PHP_MINFO_FUNCTION(memcached)
 #endif
 
 #ifdef HAVE_MEMCACHED_MSGPACK
-    php_info_print_table_row(2, "msgpack support", "yes");
+	php_info_print_table_row(2, "msgpack support", "yes");
 #else
-    php_info_print_table_row(2, "msgpack support", "no");
+	php_info_print_table_row(2, "msgpack support", "no");
 #endif
 
 	php_info_print_table_end();

From 8982f17f4db32fce48052fb97cd24336df243e0f Mon Sep 17 00:00:00 2001
From: davidsteinsland <david@davidsteinsland.net>
Date: Sun, 17 Nov 2013 11:28:33 +0100
Subject: [PATCH 2/2] Added msgpack test

---
 tests/experimental/serializer_msgpack.phpt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/experimental/serializer_msgpack.phpt

diff --git a/tests/experimental/serializer_msgpack.phpt b/tests/experimental/serializer_msgpack.phpt
new file mode 100644
index 00000000..aa68d0ca
--- /dev/null
+++ b/tests/experimental/serializer_msgpack.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Serialize msgpack
+--SKIPIF--
+<?php
+	if (!extension_loaded("memcached")) print "skip";
+	if (!extension_loaded('msgpack')) echo "skip no msgpack loaded";
+	if (!Memcached::HAVE_MSGPACK) echo "skip msgpack support not enabled";
+?>
+--REDIRECTTEST--
+
+$path = implode(DIRECTORY_SEPARATOR, array('tests', 'experimental', 'serializer'));
+
+return array(
+	'TESTS' => $path,
+	'ENV' => array('TEST_MEMC_SERIALIZER' => 'Memcached::SERIALIZER_MSGPACK'),
+);