ZOOKEEPER-1494. C client: socket leak after receive timeout in zookeeper_interest() (Michi Mutsuzaki via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1382661 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -249,6 +249,9 @@ BUGFIXES:
   ZOOKEEPER-1437. Client uses session before SASL authentication complete
   (Eugene Koontz via mahadev)
 
+  ZOOKEEPER-1494. C client: socket leak after receive timeout in
+  zookeeper_interest() (Michi Mutsuzaki via mahadev)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

src/c/src/zookeeper.c

@@ -1641,12 +1641,14 @@ int zookeeper_interest(zhandle_t *zh, int *fd, int *interest,
 #else
             errno = ETIMEDOUT;
 #endif
-            *fd=-1;
             *interest=0;
             *tv = get_timeval(0);
             return api_epilog(zh,handle_socket_error_msg(zh,
                     __LINE__,ZOPERATIONTIMEOUT,
-                    "connection timed out (exceeded timeout by %dms)",-recv_to));
+                    "connection to %s timed out (exceeded timeout by %dms)",
+                    format_endpoint_info(&zh->addrs[zh->connect_index]),
+                    -recv_to));
+
         }
         // We only allow 1/3 of our timeout time to expire before sending
         // a PING