X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstorage.cc;h=703b0e3081da635fcb58490e6e32ced7bdd86d1a;hb=6c4917af4d1f4da7fa48550843bcbfb2a36c3761;hp=0fc6e234df7d162be7a2646ec4f7629c050f65ce;hpb=7c8b8a571a25e21046d00cd2ef7897504a5ef939;p=awesomized%2Flibmemcached diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc index 0fc6e234..703b0e30 100644 --- a/libmemcached/storage.cc +++ b/libmemcached/storage.cc @@ -126,7 +126,9 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr, request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->_namespace))); request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; if (verb == APPEND_OP || verb == PREPEND_OP) + { send_length -= 8; /* append & prepend does not contain extras! */ + } else { request.message.header.request.extlen= 8; @@ -138,7 +140,9 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr, request.message.header.request.extlen)); if (cas) + { request.message.header.request.cas= memcached_htonll(cas); + } flush= (bool) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1); @@ -355,8 +359,6 @@ static inline memcached_return_t memcached_send(memcached_st *ptr, uint64_t cas, memcached_storage_action_t verb) { - WATCHPOINT_ASSERT(!(value == NULL && value_length > 0)); - memcached_return_t rc; if (memcached_failed(rc= initialize_query(ptr))) {