698 Commits

Author SHA1 Message Date
Mikko 7ad95cc555 The year is 2014 2.2.0 2014-04-01 18:23:00 +08:00
Mikko f4c3977865 Update version number to indicate stable 2014-04-01 18:21:58 +08:00
Mikko ea6d0d83ea Prepare a stable release 2014-04-01 09:33:42 +08:00
Mikko Koppanen 94f64446e7 Merge pull request #130 from poison/feature-servertimeoutlimit
Added the OPT_SERVER_TIMEOUT_LIMIT behaviour.
2014-03-21 17:43:30 +08:00
Mikko Koppanen 68e764d850 Merge pull request #131 from remicollet/issue-220RC1
Fix build warnings
2014-03-21 17:42:28 +08:00
Remi Collet 573c978f8a Fix php_memcached.c:781:45: warning: 'orig_cas_flag' may be used uninitialized in this function (again... just to make gcc happy) 2014-03-13 10:52:42 +01:00
Remi Collet ccea7be732 Fix warning: 'status' may be used uninitialized in this function 2014-03-13 10:50:07 +01:00
Remi Collet 697e500b88 php_memcached.c:3317:11: warning: 'buffer' may be used uninitialized in this function (just to make gcc happy) 2014-03-13 10:48:06 +01:00
Remi Collet c616a1be16 Fix php_memcached_server.c:589:49: warning: array subscript is above array bounds 2014-03-13 10:41:21 +01:00
Remi Collet cb7a7fd65e fix warning: 'payload' may be used uninitialized in this function (ok, was a false positive) 2014-03-13 10:35:53 +01:00
Remi Collet 2bce9bc097 fix php_memcached.c:3737:21: warning: variable 'intern' set but not used 2014-03-13 10:30:35 +01:00
Nicolas Van Eenaeme 77a8089666 Added the OPT_SERVER_TIMEOUT_LIMIT behaviour.
The option MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT was added in libmemcached 1.0.18 (0x01000018).

For more information see https://answers.launchpad.net/libmemcached/+question/239497

The merge request for libmemcached:
https://code.launchpad.net/~493pocbrcycmdw7yksonho9o2qzz-o18bz-d18ecat4t1b76tkfi3vttrkfngli/libmemcached/feature-server_timeout
2014-03-12 15:42:28 +01:00
Mikko 03811a17f4 Update dates 2.2.0RC1 2014-03-12 17:20:16 +08:00
Mikko 303b9e5de3 Remove the tests 2014-03-01 21:57:13 +08:00
Mikko cba40ff772 Merge branch 'master' of github.com:php-memcached-dev/php-memcached 2014-03-01 21:07:16 +08:00
Mikko b37618ddf4 Prepare this as RC1, we need to get this stuff out 2014-03-01 21:07:04 +08:00
Mikko Koppanen b1590cfaf0 Merge pull request #129 from mkoppanen/master
Update package.xml for release
2014-03-01 21:05:46 +08:00
Mikko eb12debade Update package.xml for release 2014-03-01 21:04:49 +08:00
Mikko Koppanen caacbe217a Merge pull request #124 from vincentbernat/fix/failing-tests-memcached-049
Revert "Move tests using serialized objects and compression out of experimental
2014-01-16 00:20:25 -08:00
Vincent Bernat 43460341a2 Revert "Move tests using serialized objects and compression out of experimental"
This reverts commit 391d0c14eb.

Conflicts:
	package.xml
2014-01-16 09:19:18 +01:00
Mikko Koppanen 96fd7260c1 Merge pull request #118 from vincentbernat/fix/test-getserverbykey
`getServerByKey` cannot report weight anymore
2014-01-11 22:18:28 -08:00
Vincent Bernat 77a217a21d Move getserverbykey test out of experimental 2014-01-09 16:36:03 +01:00
Vincent Bernat 82227e5084 getServerByKey cannot report weight anymore
Due to a change in libmemcached (exposed in
5450f45a3e), `getServerByKey` is not able
any more to report a server weight. It reports 0 instead. This makes the
test on this function fails. We fix this by expecting a weight of 0
instead of a weight of 1.
2014-01-09 16:35:24 +01:00
Mikko Koppanen 304806f5cc Merge pull request #120 from vincentbernat/fix/compression-bigendian
Fix compression on big-endian architecture
2014-01-09 07:31:08 -08:00
Mikko Koppanen 03d224485b Merge pull request #119 from vincentbernat/fix/compress-serialized
Fix compression of serialized objects.
2014-01-09 07:30:14 -08:00
Vincent Bernat 391d0c14eb Move tests using serialized objects and compression out of experimental 2014-01-09 16:28:05 +01:00
Mikko Koppanen 0eae1de7d9 Merge pull request #121 from vincentbernat/fix/phpinfo-test
Test moduleinfo test
2014-01-08 07:10:40 -08:00
Vincent Bernat 50651d5884 Make output of use_sasl entry in moduleinfo test optional
When SASL support is compiled out, this entry is absent. Nonetheless,
test should succeed in a such case.
2014-01-08 11:53:35 +01:00
Vincent Bernat a8a837d7f1 Add sess_lock_* and store_retry_count entries to moduleinfo test
Those entries have been added recently but the test was not updated.
2014-01-08 11:49:48 +01:00
Vincent Bernat 98e7e6bc15 Fix compression on big-endian architecture
On big-endian architecture where size_t is a 64-bit long,
copying the 4 first bytes as the size is incorrect. We cast it to an
unsigned 32-bit integer before copying it at the beginning of the
provided buffer.
2014-01-08 11:43:46 +01:00
Vincent Bernat f794ebed54 Fix compression of serialized objects.
Due to commit 0f5550efe0, compressing a
serialized object provided an inappropriate size to `s_compress_value()`
which will eventually lead to a segfault during compression. Provide the
the previously computed length instead.
2014-01-08 11:36:21 +01:00
Mikko 3d324df8b4 Change windows stuff here, not that anyone uses it 2013-11-26 13:47:28 +08:00
Mikko a555e381f0 Add a note regarding user flags 2.2.0b1 2013-11-25 17:11:53 +08:00
Mikko c3079ae8f5 Fix release date 2013-11-25 17:10:40 +08:00
Mikko Koppanen 0d50293de1 Merge pull request #114 from mkoppanen/master
These settings are not needed if sasl is disabled
2013-11-25 00:38:25 -08:00
Mikko 619302c1ef These settings are not needed if sasl is disabled 2013-11-25 16:23:06 +08:00
Mikko Koppanen 1ef51bfd7c Merge pull request #113 from mkoppanen/master
Use ginit to initialise globals
2013-11-24 23:54:15 -08:00
Mikko b1d21a7943 Use ginit to initialise globals 2013-11-25 15:42:01 +08:00
Mikko Koppanen 3bc932fbf9 Merge pull request #112 from mkoppanen/master
Remove checks from config.m4 and use versions
2013-11-24 23:03:26 -08:00
Mikko f738d17c45 Remove 0.40 2013-11-25 15:02:54 +08:00
Mikko 9a15875122 Skip test if touch is not available 2013-11-25 13:57:54 +08:00
Mikko db9f9ef876 Skip test if touch is not available 2013-11-25 13:44:49 +08:00
Mikko 2aca48aa19 Add a few more versions 2013-11-25 13:30:04 +08:00
Mikko feed35e220 Version based tests: Do version checks in one place, fix check when setting options 2013-11-25 13:27:55 +08:00
Mikko 411a64fdcb Make config.m4 play nice when building inside the source tree 2013-11-24 15:21:11 +08:00
Mikko a437602912 Reorganise headers a bit, include everything in the private header 2013-11-24 13:48:52 +08:00
Mikko d9d5ce86f6 Fixed a bug with config options and test for it 2013-11-24 01:50:24 +08:00
Mikko 6def3bbc92 Fix the message 2013-11-24 01:12:18 +08:00
Mikko Koppanen c213460a39 Merge pull request #110 from mkoppanen/refactoring
Refactoring
2013-11-23 09:00:20 -08:00
Mikko 797c8bb623 Correct variable here 2013-11-24 00:17:07 +08:00