Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
2635feb0
Commit
2635feb0
authored
Dec 01, 2010
by
Pieter Noordhuis
Browse files
Wait with setting CONNECTED until there is an fd
parent
89c69272
Changes
2
Hide whitespace changes
Inline
Side-by-side
hiredis.c
View file @
2635feb0
...
@@ -771,7 +771,6 @@ void redisFree(redisContext *c) {
...
@@ -771,7 +771,6 @@ void redisFree(redisContext *c) {
redisContext
*
redisConnect
(
const
char
*
ip
,
int
port
)
{
redisContext
*
redisConnect
(
const
char
*
ip
,
int
port
)
{
redisContext
*
c
=
redisContextInit
();
redisContext
*
c
=
redisContextInit
();
c
->
flags
|=
REDIS_BLOCK
;
c
->
flags
|=
REDIS_BLOCK
;
c
->
flags
|=
REDIS_CONNECTED
;
redisContextConnectTcp
(
c
,
ip
,
port
);
redisContextConnectTcp
(
c
,
ip
,
port
);
return
c
;
return
c
;
}
}
...
@@ -779,7 +778,6 @@ redisContext *redisConnect(const char *ip, int port) {
...
@@ -779,7 +778,6 @@ redisContext *redisConnect(const char *ip, int port) {
redisContext
*
redisConnectNonBlock
(
const
char
*
ip
,
int
port
)
{
redisContext
*
redisConnectNonBlock
(
const
char
*
ip
,
int
port
)
{
redisContext
*
c
=
redisContextInit
();
redisContext
*
c
=
redisContextInit
();
c
->
flags
&=
~
REDIS_BLOCK
;
c
->
flags
&=
~
REDIS_BLOCK
;
c
->
flags
|=
REDIS_CONNECTED
;
redisContextConnectTcp
(
c
,
ip
,
port
);
redisContextConnectTcp
(
c
,
ip
,
port
);
return
c
;
return
c
;
}
}
...
@@ -787,7 +785,6 @@ redisContext *redisConnectNonBlock(const char *ip, int port) {
...
@@ -787,7 +785,6 @@ redisContext *redisConnectNonBlock(const char *ip, int port) {
redisContext
*
redisConnectUnix
(
const
char
*
path
)
{
redisContext
*
redisConnectUnix
(
const
char
*
path
)
{
redisContext
*
c
=
redisContextInit
();
redisContext
*
c
=
redisContextInit
();
c
->
flags
|=
REDIS_BLOCK
;
c
->
flags
|=
REDIS_BLOCK
;
c
->
flags
|=
REDIS_CONNECTED
;
redisContextConnectUnix
(
c
,
path
);
redisContextConnectUnix
(
c
,
path
);
return
c
;
return
c
;
}
}
...
@@ -795,7 +792,6 @@ redisContext *redisConnectUnix(const char *path) {
...
@@ -795,7 +792,6 @@ redisContext *redisConnectUnix(const char *path) {
redisContext
*
redisConnectUnixNonBlock
(
const
char
*
path
)
{
redisContext
*
redisConnectUnixNonBlock
(
const
char
*
path
)
{
redisContext
*
c
=
redisContextInit
();
redisContext
*
c
=
redisContextInit
();
c
->
flags
&=
~
REDIS_BLOCK
;
c
->
flags
&=
~
REDIS_BLOCK
;
c
->
flags
|=
REDIS_CONNECTED
;
redisContextConnectUnix
(
c
,
path
);
redisContextConnectUnix
(
c
,
path
);
return
c
;
return
c
;
}
}
...
...
net.c
View file @
2635feb0
...
@@ -137,6 +137,7 @@ int redisContextConnectTcp(redisContext *c, const char *addr, int port) {
...
@@ -137,6 +137,7 @@ int redisContextConnectTcp(redisContext *c, const char *addr, int port) {
}
}
c
->
fd
=
s
;
c
->
fd
=
s
;
c
->
flags
|=
REDIS_CONNECTED
;
return
REDIS_OK
;
return
REDIS_OK
;
}
}
...
@@ -163,5 +164,6 @@ int redisContextConnectUnix(redisContext *c, const char *path) {
...
@@ -163,5 +164,6 @@ int redisContextConnectUnix(redisContext *c, const char *path) {
}
}
c
->
fd
=
s
;
c
->
fd
=
s
;
c
->
flags
|=
REDIS_CONNECTED
;
return
REDIS_OK
;
return
REDIS_OK
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment