projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge fixes from build.
[awesomized/libmemcached]
/
libmemcached
/
connect.c
diff --git
a/libmemcached/connect.c
b/libmemcached/connect.c
index 75d174b459e3418839a251a9dd2fa14483088d19..58a6cfd2756f037ff3d130e981c40fcfeb5674fc 100644
(file)
--- a/
libmemcached/connect.c
+++ b/
libmemcached/connect.c
@@
-19,16
+19,12
@@
static memcached_return_t connect_poll(memcached_server_st *ptr)
fds[0].fd = ptr->fd;
fds[0].events = POLLOUT;
fds[0].fd = ptr->fd;
fds[0].events = POLLOUT;
- int timeout= ptr->root->connect_timeout;
- if (ptr->root->flags.no_block == true)
- timeout= -1;
-
int error;
size_t loop_max= 5;
while (--loop_max) // Should only loop on cases of ERESTART or EINTR
{
int error;
size_t loop_max= 5;
while (--loop_max) // Should only loop on cases of ERESTART or EINTR
{
- error= poll(fds, 1, timeout);
+ error= poll(fds, 1,
ptr->root->connect_
timeout);
switch (error)
{
switch (error)
{
@@
-339,7
+335,7
@@
static memcached_return_t unix_socket_connect(memcached_server_st *ptr)
memset(&servAddr, 0, sizeof (struct sockaddr_un));
servAddr.sun_family= AF_UNIX;
memset(&servAddr, 0, sizeof (struct sockaddr_un));
servAddr.sun_family= AF_UNIX;
- str
cpy(servAddr.sun_path, ptr->hostname
); /* Copy filename */
+ str
ncpy(servAddr.sun_path, ptr->hostname, sizeof(servAddr.sun_path)
); /* Copy filename */
test_connect:
if (connect(ptr->fd,
test_connect:
if (connect(ptr->fd,