Update 1.2

3 files changed, 56 insertions, 0 deletions

diff --git a/libmemcached-1.2/feature.h b/libmemcached-1.2/feature.h
new file mode 100644
index 00000000..731a2963
--- /dev/null
+++ b/libmemcached-1.2/feature.h
@@ -0,0 +1,53 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once
+
+enum libmemcached_feature_t {
+    LIBMEMCACHED_FEATURE_HAS_SASL,
+    LIBMEMCACHED_FEATURE_MAX
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LIBMEMCACHED_API
+bool libmemcached_has_feature(enum libmemcached_feature_t arg);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/libmemcached-1.2/include.am b/libmemcached-1.2/include.am
index 9e597d0a..11a8f0fb 100644
--- a/libmemcached-1.2/include.am
+++ b/libmemcached-1.2/include.am
@@ -27,6 +27,7 @@ nobase_include_HEADERS+= libmemcached-1.2/encoding_key.h
 nobase_include_HEADERS+= libmemcached-1.2/error.h 
 nobase_include_HEADERS+= libmemcached-1.2/exception.hpp 
 nobase_include_HEADERS+= libmemcached-1.2/exist.h 
+nobase_include_HEADERS+= libmemcached-1.2/feature.h 
 nobase_include_HEADERS+= libmemcached-1.2/fetch.h 
 nobase_include_HEADERS+= libmemcached-1.2/flush.h 
 nobase_include_HEADERS+= libmemcached-1.2/flush_buffers.h 
diff --git a/libmemcached-1.2/memcached.h b/libmemcached-1.2/memcached.h
index 2a2b54a7..8afd8948 100644
--- a/libmemcached-1.2/memcached.h
+++ b/libmemcached-1.2/memcached.h
@@ -59,6 +59,8 @@
 #include <libmemcached-1.2/configure.h>
 #include <libmemcached-1.2/platform.h>
 
+#include <libmemcached-1.2/feature.h>
+
 #include <libmemcached-1.2/limits.h>
 #include <libmemcached-1.2/defaults.h>