summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordormando <dormando@rydia.net>2011-07-12 00:31:58 -0700
committerdormando <dormando@rydia.net>2011-07-12 00:32:53 -0700
commitb8c40b08672fe5637b2266f726a1e8961780f840 (patch)
tree5e2330a0c2928e6a4ca325434a6f07adcf5b8313
parentac939723874f1ebe1f0738af3855e81c026e9bc4 (diff)
downloadmemcached-b8c40b08672fe5637b2266f726a1e8961780f840.tar.gz
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".
-rw-r--r--memcached.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/memcached.c b/memcached.c
index 39012b0..effb8a1 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);
}