udp warning message1.2.0

git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@407 b0b603af-a30f-0410-a34e-baf09ae79d0b

3 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d4820d9..3040982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-20
+
+	* don't listen on UDP by default; more clear message when UDP port in use
+
+2006-09-09
+	* release 1.2.0 (along with 1.1.13, which is the more tested branch)
+
+	nobody has run 1.2.0 in production, to my knowledge.  facebook has run
+	their pre-merge-with-trunk version, but bugs were discovered (and fixed)
+	after the merge.  there might be more.  you've been warned.  :)
+
 2006-09-04
 	* improved autoconf libevent detection, from the Tor project.
 
diff --git a/configure.ac b/configure.ac
index 754d4b7..f977d58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.52)
-AC_INIT(memcached, 1.2.0-rc1, brad@danga.com)
+AC_INIT(memcached, 1.2.0, brad@danga.com)
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR(memcached.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
diff --git a/memcached.c b/memcached.c
index 32814ae..194524f 100644
--- a/memcached.c
+++ b/memcached.c
@@ -109,7 +109,7 @@ void stats_reset(void) {
 
 void settings_init(void) {
     settings.port = 11211;
-    settings.udpport = 11211;
+    settings.udpport = 0;
     settings.interface.s_addr = htonl(INADDR_ANY);
     settings.maxbytes = 64*1024*1024; /* default is 64MB */
     settings.maxconns = 1024;         /* to limit connections-related memory to about 5MB */
@@ -2173,7 +2173,7 @@ int main (int argc, char **argv) {
         /* create the UDP listening socket and bind it */
         u_socket = server_socket(settings.udpport, 1);
         if (u_socket == -1) {
-            fprintf(stderr, "failed to listen\n");
+            fprintf(stderr, "failed to listen on UDP port %d\n", settings.udpport);
             exit(1);
         }
     }