svn commit: r1382661 - in /zookeeper/trunk: CHANGES.txt src/c/src/zookeeper.c

[ma...@apache.org]

Author: mahadev
Date: Mon Sep 10 07:00:50 2012
New Revision: 1382661

URL: http://svn.apache.org/viewvc?rev=1382661&view=rev
Log:
ZOOKEEPER-1494. C client: socket leak after receive timeout in zookeeper_interest() (Michi Mutsuzaki via mahadev)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/c/src/zookeeper.c

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1382661&r1=1382660&r2=1382661&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Sep 10 07:00:50 2012
@@ -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,

Modified: zookeeper/trunk/src/c/src/zookeeper.c
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/src/zookeeper.c?rev=1382661&r1=1382660&r2=1382661&view=diff
==============================================================================
--- zookeeper/trunk/src/c/src/zookeeper.c (original)
+++ zookeeper/trunk/src/c/src/zookeeper.c Mon Sep 10 07:00:50 2012
@@ -1641,12 +1641,14 @@ int zookeeper_interest(zhandle_t *zh, in
 #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