projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update changelog
[awesomized/libmemcached]
/
libmemcached
/
memcached_server.c
diff --git
a/libmemcached/memcached_server.c
b/libmemcached/memcached_server.c
index b7dd8a94700eb309b8d54dcbf385ea2b5ec8b722..04364f3a3d31bad4b0c5fe607c353c8acb980c55 100644
(file)
--- a/
libmemcached/memcached_server.c
+++ b/
libmemcached/memcached_server.c
@@
-7,12
+7,11
@@
memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
{
if (ptr == NULL)
{
{
if (ptr == NULL)
{
- ptr= (memcached_server_st *)
malloc(
sizeof(memcached_server_st));
+ ptr= (memcached_server_st *)
calloc(1,
sizeof(memcached_server_st));
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
- memset(ptr, 0, sizeof(memcached_server_st));
ptr->is_allocated= true;
}
else
ptr->is_allocated= true;
}
else
@@
-41,6
+40,11
@@
memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_
host->read_ptr= host->read_buffer;
if (memc)
host->next_retry= memc->retry_timeout;
host->read_ptr= host->read_buffer;
if (memc)
host->next_retry= memc->retry_timeout;
+ if (type == MEMCACHED_CONNECTION_UDP)
+ {
+ host->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
+ memcached_io_init_udp_header(host, 0);
+ }
return host;
}
return host;
}
@@
-56,12
+60,7
@@
void memcached_server_free(memcached_server_st *ptr)
}
if (ptr->is_allocated)
}
if (ptr->is_allocated)
- {
- if (ptr->root && ptr->root->call_free)
- ptr->root->call_free(ptr->root, ptr);
- else
- free(ptr);
- }
+ ptr->root->call_free(ptr->root, ptr);
else
memset(ptr, 0, sizeof(memcached_server_st));
}
else
memset(ptr, 0, sizeof(memcached_server_st));
}
@@
-121,7
+120,7
@@
memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key
return NULL;
}
return NULL;
}
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcach
e
d_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
{
*error= MEMCACHED_BAD_KEY_PROVIDED;
return NULL;
{
*error= MEMCACHED_BAD_KEY_PROVIDED;
return NULL;