From b8c40b08672fe5637b2266f726a1e8961780f840 Mon Sep 17 00:00:00 2001 From: dormando Date: Tue, 12 Jul 2011 00:31:58 -0700 Subject: [PATCH] Revert "Fix incorrect udp_port bind selection." Patch was incorrect; it wired in some dead code which broke tests. Starting memcached with -p 11212 -U 0 should disable UDP, but with this patch -U 0 means "use the tcp port". --- memcached.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/memcached.c b/memcached.c index 39012b03e8..effb8a1cdb 100644 --- a/memcached.c +++ b/memcached.c @@ -4804,9 +4804,9 @@ int main (int argc, char **argv) { /* create the UDP listening socket and bind it */ errno = 0; - if (udp_port && server_sockets(udp_port, udp_transport, + if (settings.udpport && server_sockets(settings.udpport, udp_transport, portnumber_file)) { - vperror("failed to listen on UDP port %d", udp_port); + vperror("failed to listen on UDP port %d", settings.udpport); exit(EX_OSERR); }