Skip to content

Commit 011afc7

Browse files
committed
Release 1.0.1
Fix build for libmemcached-0.38.
1 parent 9d4cdd5 commit 011afc7

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
memcached extension changelog
22

3+
Version 1.0.1
4+
-------------
5+
* Fix build for libmemcached-0.38.
6+
37
Version 1.0.0
48
-------------
59
* First stable release.

package.xml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,18 @@ http://pear.php.net/dtd/package-2.0.xsd">
1515
<email>[email protected]</email>
1616
<active>yes</active>
1717
</lead>
18-
<date>2009-07-07</date>
18+
<date>2010-03-11</date>
1919
<version>
20-
<release>1.0.0</release>
21-
<api>1.0.0</api>
20+
<release>1.0.1</release>
21+
<api>1.0.1</api>
2222
</version>
2323
<stability>
2424
<release>stable</release>
2525
<api>stable</api>
2626
</stability>
2727
<license uri="http://www.php.net/license">PHP</license>
2828
<notes>
29-
- First stable release.
30-
- Add getResultMessage() method.
31-
- Fix OPT_RECV_TIMEOUT definition.
32-
- Initialize Session lock wait to max execution time (if max execution
33-
time is unlimited, default to 30 seconds).
29+
- Fix build for libmemcached-0.38.
3430
</notes>
3531
<contents>
3632
<dir name="/">
@@ -60,6 +56,15 @@ http://pear.php.net/dtd/package-2.0.xsd">
6056
<providesextension>memcached</providesextension>
6157
<extsrcrelease/>
6258
<changelog>
59+
<release>
60+
<stability><release>stable</release><api>stable</api></stability>
61+
<version><release>1.0.1</release><api>1.0.1</api></version>
62+
<date>2010-03-11</date>
63+
<notes>
64+
- Fix build for libmemcached-0.38.
65+
</notes>
66+
</release>
67+
6368
<release>
6469
<stability><release>stable</release><api>stable</api></stability>
6570
<version><release>1.0.0</release><api>1.0.0</api></version>

php_memcached.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,8 +1780,14 @@ static PHP_METHOD(Memcached, setOption)
17801780
* (non-weighted) case. We have to clean up ourselves.
17811781
*/
17821782
if (!Z_LVAL_P(value)) {
1783+
#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX > 0x00037000
1784+
(void)memcached_behavior_set_key_hash(i_obj->memc, MEMCACHED_HASH_DEFAULT);
1785+
(void)memcached_behavior_set_distribution_hash(i_obj->memc, MEMCACHED_HASH_DEFAULT);
1786+
(void)memcached_behavior_set_distribution(i_obj->memc, MEMCACHED_DISTRIBUTION_MODULA);
1787+
#else
17831788
i_obj->memc->hash = 0;
17841789
i_obj->memc->distribution = 0;
1790+
#endif
17851791
}
17861792
break;
17871793

php_memcached.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PHP_MINIT_FUNCTION(memcached);
4848
PHP_MSHUTDOWN_FUNCTION(memcached);
4949
PHP_MINFO_FUNCTION(memcached);
5050

51-
#define PHP_MEMCACHED_VERSION "1.0.0"
51+
#define PHP_MEMCACHED_VERSION "1.0.1"
5252

5353
#ifdef ZTS
5454
#define MEMC_G(v) TSRMG(php_memcached_globals_id, zend_php_memcached_globals *, v)

0 commit comments

Comments
 (0)