Skip to content

Commit f3b19a8

Browse files
committed
bug fix: run auth before setting resp version
1 parent 677d74b commit f3b19a8

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/sw/redis++/async_connection.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,14 @@ void AsyncConnection::connect_callback(std::exception_ptr err) {
189189
_connecting_callback();
190190
break;
191191

192-
case State::SET_RESP:
193-
_set_resp_callback();
194-
break;
195-
196192
case State::AUTHING:
197193
_authing_callback();
198194
break;
199195

196+
case State::SET_RESP:
197+
_set_resp_callback();
198+
break;
199+
200200
case State::SELECTING_DB:
201201
_select_db_callback();
202202
break;
@@ -316,10 +316,10 @@ void AsyncConnection::_fail_events(std::exception_ptr err) {
316316
}
317317

318318
void AsyncConnection::_connecting_callback() {
319-
if (_need_set_resp()) {
320-
_set_resp();
321-
} else if (_need_auth()) {
319+
if (_need_auth()) {
322320
_auth();
321+
} else if (_need_set_resp()) {
322+
_set_resp();
323323
} else if (_need_select_db()) {
324324
_select_db();
325325
} else if (_need_enable_readonly()) {
@@ -330,9 +330,7 @@ void AsyncConnection::_connecting_callback() {
330330
}
331331

332332
void AsyncConnection::_set_resp_callback() {
333-
if (_need_auth()) {
334-
_auth();
335-
} else if (_need_select_db()) {
333+
if (_need_select_db()) {
336334
_select_db();
337335
} else if (_need_enable_readonly()) {
338336
_enable_readonly();
@@ -342,7 +340,9 @@ void AsyncConnection::_set_resp_callback() {
342340
}
343341

344342
void AsyncConnection::_authing_callback() {
345-
if (_need_select_db()) {
343+
if (_need_set_resp()) {
344+
_set_resp();
345+
} else if (_need_select_db()) {
346346
_select_db();
347347
} else if (_need_enable_readonly()) {
348348
_enable_readonly();

src/sw/redis++/connection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,12 @@ void Connection::set_push_callback(redisPushFn *push_func) {
235235
#endif
236236

237237
void Connection::_set_options() {
238+
_auth();
239+
238240
if (_opts.resp > 2) {
239241
_set_resp_version();
240242
}
241243

242-
_auth();
243-
244244
_select_db();
245245

246246
if (_opts.readonly) {

0 commit comments

Comments
 (0)