Permalink
Browse files

Release 1.0.1

Fix build for libmemcached-0.38.
  • Loading branch information...
1 parent 9d4cdd5 commit 011afc7462a7ee812028840fa22e573f3c97ad0b @andreiz andreiz committed Mar 11, 2010
Showing with 24 additions and 9 deletions.
  1. +4 −0 ChangeLog
  2. +13 −8 package.xml
  3. +6 −0 php_memcached.c
  4. +1 −1 php_memcached.h
View
@@ -1,5 +1,9 @@
memcached extension changelog
+Version 1.0.1
+-------------
+ * Fix build for libmemcached-0.38.
+
Version 1.0.0
-------------
* First stable release.
View
@@ -15,22 +15,18 @@ http://pear.php.net/dtd/package-2.0.xsd">
<email>andrei@php.net</email>
<active>yes</active>
</lead>
- <date>2009-07-07</date>
+ <date>2010-03-11</date>
<version>
- <release>1.0.0</release>
- <api>1.0.0</api>
+ <release>1.0.1</release>
+ <api>1.0.1</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
-- First stable release.
-- Add getResultMessage() method.
-- Fix OPT_RECV_TIMEOUT definition.
-- Initialize Session lock wait to max execution time (if max execution
- time is unlimited, default to 30 seconds).
+- Fix build for libmemcached-0.38.
</notes>
<contents>
<dir name="/">
@@ -62,6 +58,15 @@ http://pear.php.net/dtd/package-2.0.xsd">
<changelog>
<release>
<stability><release>stable</release><api>stable</api></stability>
+ <version><release>1.0.1</release><api>1.0.1</api></version>
+ <date>2010-03-11</date>
+ <notes>
+- Fix build for libmemcached-0.38.
+ </notes>
+ </release>
+
+ <release>
+ <stability><release>stable</release><api>stable</api></stability>
<version><release>1.0.0</release><api>1.0.0</api></version>
<date>2009-07-04</date>
<notes>
View
@@ -1780,8 +1780,14 @@ static PHP_METHOD(Memcached, setOption)
* (non-weighted) case. We have to clean up ourselves.
*/
if (!Z_LVAL_P(value)) {
+#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX > 0x00037000
+ (void)memcached_behavior_set_key_hash(i_obj->memc, MEMCACHED_HASH_DEFAULT);
+ (void)memcached_behavior_set_distribution_hash(i_obj->memc, MEMCACHED_HASH_DEFAULT);
+ (void)memcached_behavior_set_distribution(i_obj->memc, MEMCACHED_DISTRIBUTION_MODULA);
+#else
i_obj->memc->hash = 0;
i_obj->memc->distribution = 0;
+#endif
}
break;
View
@@ -48,7 +48,7 @@ PHP_MINIT_FUNCTION(memcached);
PHP_MSHUTDOWN_FUNCTION(memcached);
PHP_MINFO_FUNCTION(memcached);
-#define PHP_MEMCACHED_VERSION "1.0.0"
+#define PHP_MEMCACHED_VERSION "1.0.1"
#ifdef ZTS
#define MEMC_G(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, v)

0 comments on commit 011afc7

Please sign in to comment.