Merge lp:~piotr-sikora/libmemcached/connect-fix into lp:~tangent-org/libmemcached/trunk

Proposed by Piotr Sikora
Status: Merged
Approved by: Brian Aker
Approved revision: 948
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~piotr-sikora/libmemcached/connect-fix
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
libmemcached/connect.cc (+1/-1)
To merge this branch: bzr merge lp:~piotr-sikora/libmemcached/connect-fix
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+67946@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote :

Thanks, I have taken the suggestion!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libmemcached/connect.cc'
2--- libmemcached/connect.cc 2011-06-21 07:38:30 +0000
3+++ libmemcached/connect.cc 2011-07-14 11:38:22 +0000
4@@ -443,7 +443,7 @@
5 if ((connect(ptr->fd, ptr->address_info_next->ai_addr, ptr->address_info_next->ai_addrlen) != SOCKET_ERROR))
6 {
7 ptr->state= MEMCACHED_SERVER_STATE_CONNECTED;
8- break; // Success
9+ return MEMCACHED_SUCCESS;
10 }
11
12 /* An error occurred */

Subscribers

People subscribed via source and target branches

to all changes: