Changeset 730

Timestamp:

02/29/08 20:01:41 (6 months ago)

Author:

dsallings

Message:

Merge commit 'trunk' into lbinary as of r728

Handle bind errors in server_socket() (Brian Aker) (Dormando helped!)

Files:

• branches/binary/server/memcached.c (modified) (2 diffs)

branches/binary/server/memcached.c

@@ -3051 +3051 @@
-            }
-            close(sfd);
+            continue;
-        } else {
-          success++;
@@ -3087 +3088 @@
-
-    freeaddrinfo(ai);
+
+    if (success == 0)
+        return 1;
-
-    return 0;