Merge lp:~brianaker/gearmand/sockexec into lp:gearmand

Proposed by Brian Aker on 2013-06-30
Status: Merged
Merged at revision: 794
Proposed branch: lp:~brianaker/gearmand/sockexec
Merge into: lp:gearmand
Diff against target: 25 lines (+1/-14)
1 file modified
libgearman/connection.cc (+1/-14)
To merge this branch: bzr merge lp:~brianaker/gearmand/sockexec
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-06-30 Pending
Review via email: mp+172225@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgearman/connection.cc'
2--- libgearman/connection.cc 2013-06-30 02:48:43 +0000
3+++ libgearman/connection.cc 2013-06-30 05:23:28 +0000
4@@ -711,20 +711,7 @@
5 }
6
7 // rewrite tye if HAVE_SOCK_CLOEXEC
8- {
9- int type= addrinfo_next->ai_socktype;
10- if (SOCK_CLOEXEC)
11- {
12- type|= SOCK_CLOEXEC;
13- }
14-
15- if (SOCK_NONBLOCK)
16- {
17- type|= SOCK_NONBLOCK;
18- }
19-
20- fd= socket(addrinfo_next->ai_family, type, addrinfo_next->ai_protocol);
21- }
22+ fd= socket(addrinfo_next->ai_family, addrinfo_next->ai_socktype|SOCK_CLOEXEC|SOCK_NONBLOCK, addrinfo_next->ai_protocol);
23
24 if (fd == INVALID_SOCKET)
25 {

Subscribers

People subscribed via source and target branches

to all changes: