"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "proto_bin.c" between
memcached-1.6.8.tar.gz and memcached-1.6.9.tar.gz

About: memcached is a high-performance, distributed memory object caching system, generic in nature, but originally intended for use in speeding up dynamic web applications by alleviating database load.

proto_bin.c  (memcached-1.6.8):proto_bin.c  (memcached-1.6.9)
/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
/* /*
* Functions for handling the binary protocol. * Functions for handling the binary protocol.
* NOTE: The binary protocol is deprecated as of 1.6.0. * NOTE: The binary protocol is deprecated as of 1.6.0.
*/ */
#include "memcached.h" #include "memcached.h"
#include "proto_bin.h" #include "proto_bin.h"
#include "storage.h"
#ifdef TLS #ifdef TLS
#include "tls.h" #include "tls.h"
#endif #endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
/** binprot handlers **/ /** binprot handlers **/
static void process_bin_flush(conn *c, char *extbuf); static void process_bin_flush(conn *c, char *extbuf);
static void process_bin_append_prepend(conn *c); static void process_bin_append_prepend(conn *c);
static void process_bin_update(conn *c, char *extbuf); static void process_bin_update(conn *c, char *extbuf);
skipping to change at line 525 skipping to change at line 526
resp_add_iov(c->resp, &rsp->message.body, sizeof(rsp->message.body)); resp_add_iov(c->resp, &rsp->message.body, sizeof(rsp->message.body));
if (should_return_key) { if (should_return_key) {
resp_add_iov(c->resp, ITEM_key(it), nkey); resp_add_iov(c->resp, ITEM_key(it), nkey);
} }
if (should_return_value) { if (should_return_value) {
/* Add the data minus the CRLF */ /* Add the data minus the CRLF */
#ifdef EXTSTORE #ifdef EXTSTORE
if (it->it_flags & ITEM_HDR) { if (it->it_flags & ITEM_HDR) {
if (_get_extstore(c, it, c->resp) != 0) { if (storage_get_item(c, it, c->resp) != 0) {
pthread_mutex_lock(&c->thread->stats.mutex); pthread_mutex_lock(&c->thread->stats.mutex);
c->thread->stats.get_oom_extstore++; c->thread->stats.get_oom_extstore++;
pthread_mutex_unlock(&c->thread->stats.mutex); pthread_mutex_unlock(&c->thread->stats.mutex);
failed = true; failed = true;
} }
} else if ((it->it_flags & ITEM_CHUNKED) == 0) { } else if ((it->it_flags & ITEM_CHUNKED) == 0) {
resp_add_iov(c->resp, ITEM_data(it), it->nbytes - 2); resp_add_iov(c->resp, ITEM_data(it), it->nbytes - 2);
} else { } else {
// Allow transmit handler to find the item and expand iov's // Allow transmit handler to find the item and expand iov's
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)