projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed SASL authentication bits
[awesomized/libmemcached]
/
libmemcached
/
auto.c
diff --git
a/libmemcached/auto.c
b/libmemcached/auto.c
index fde81d47e3da67ceb19265a2d42cb1f203fee8e0..b73425f08c2f10320dc3d8c78e40336f78fb22e6 100644
(file)
--- a/
libmemcached/auto.c
+++ b/
libmemcached/auto.c
@@
-56,7
+56,12
@@
static memcached_return_t text_incr_decr(memcached_st *ptr,
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
- if (!strncmp(buffer, "ERROR\r\n", 7))
+ if (! strncmp(buffer, "ERROR\r\n", 7))
+ {
+ *value= 0;
+ rc= MEMCACHED_PROTOCOL_ERROR;
+ }
+ else if (! strncmp(buffer, "CLIENT_ERROR\r\n", 14))
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
@@
-103,18
+108,23
@@
static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= cmd;
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= cmd;
- request.message.header.request.keylen= htons((uint16_t)
key_length
);
+ request.message.header.request.keylen= htons((uint16_t)
(key_length + ptr->prefix_key_length)
);
request.message.header.request.extlen= 20;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.extlen= 20;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl((uint32_t)
(key_length +
request.message.header.request.extlen));
+ request.message.header.request.bodylen= htonl((uint32_t)
(key_length + ptr->prefix_key_length +
request.message.header.request.extlen));
request.message.body.delta= htonll(offset);
request.message.body.initial= htonll(initial);
request.message.body.expiration= htonl((uint32_t) expiration);
request.message.body.delta= htonll(offset);
request.message.body.initial= htonll(initial);
request.message.body.expiration= htonl((uint32_t) expiration);
+ struct __write_vector_st vector[]=
+ {
+ { .length= sizeof(request.bytes), .buffer= request.bytes },
+ { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+ { .length= key_length, .buffer= key }
+ };
+
memcached_return_t rc;
memcached_return_t rc;
- if (((rc= memcached_do(instance, request.bytes,
- sizeof(request.bytes), false)) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(instance, key, key_length, true) == -1))
+ if ((rc= memcached_vdo(instance, vector, 3, true)) != MEMCACHED_SUCCESS)
{
memcached_io_reset(instance);
return (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
{
memcached_io_reset(instance);
return (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;