summaryrefslogtreecommitdiff
path: root/memcached.c
diff options
context:
space:
mode:
authordormando <dormando@rydia.net>2022-11-15 16:18:00 -0800
committerdormando <dormando@rydia.net>2022-11-15 16:18:00 -0800
commitfbb9e0a0c894e96a8b5e4f6f421c299c324a6178 (patch)
treee6141c43bb0b227ae04fa01e60977f05efa631e6 /memcached.c
parent697de11c4e821f9e9edbccc521ec3f1215567799 (diff)
downloadmemcached-fbb9e0a0c894e96a8b5e4f6f421c299c324a6178.tar.gz
core: fix tagged listeners for len < 8
Was not clearing an internal variable in the loop for reading listeners, so if you used a single -l command to create several tagged listeners and the first tag was longer than the next tag, it would not properly read the tag. tag tag tag.
Diffstat (limited to 'memcached.c')
-rw-r--r--memcached.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/memcached.c b/memcached.c
index 196705f..b7cc5d9 100644
--- a/memcached.c
+++ b/memcached.c
@@ -3659,7 +3659,6 @@ static int server_socket(const char *interface,
static int server_sockets(int port, enum network_transport transport,
FILE *portnumber_file) {
bool ssl_enabled = false;
- uint64_t conntag = 0;
#ifdef TLS
const char *notls = "notls";
@@ -3667,7 +3666,7 @@ static int server_sockets(int port, enum network_transport transport,
#endif
if (settings.inter == NULL) {
- return server_socket(settings.inter, port, transport, portnumber_file, ssl_enabled, conntag, settings.binding_protocol);
+ return server_socket(settings.inter, port, transport, portnumber_file, ssl_enabled, 0, settings.binding_protocol);
} else {
// tokenize them and bind to each one of them..
char *b;
@@ -3683,6 +3682,7 @@ static int server_sockets(int port, enum network_transport transport,
for (char *p = strtok_r(list, ";,", &b);
p != NULL;
p = strtok_r(NULL, ";,", &b)) {
+ uint64_t conntag = 0;
int the_port = port;
#ifdef TLS
ssl_enabled = settings.ssl_enabled;