diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-02-15 21:07:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-02-15 21:07:44 -0500 |
| commit | a220a08139890048ac9a11855be5367865ed15f4 (patch) | |
| tree | a0f89cb4c4dc408714351d5dd0d179d3bde591fd /bufferevent_sock.c | |
| parent | a63ed161864bf5d2fb4c6c72e1ce9bf39d4f368d (diff) | |
| parent | 2b0a2c45193ea16684729712a6fc7d9596c88927 (diff) | |
| download | libevent-a220a08139890048ac9a11855be5367865ed15f4.tar.gz | |
Merge remote-tracking branch 'github/21_fast_syscalls'
Diffstat (limited to 'bufferevent_sock.c')
| -rw-r--r-- | bufferevent_sock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bufferevent_sock.c b/bufferevent_sock.c index bf9e35e0..431ece05 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -365,11 +365,10 @@ bufferevent_socket_connect(struct bufferevent *bev, if (fd < 0) { if (!sa) goto done; - fd = socket(sa->sa_family, SOCK_STREAM, 0); + fd = evutil_socket(sa->sa_family, + SOCK_STREAM|EVUTIL_SOCK_NONBLOCK, 0); if (fd < 0) goto done; - if (evutil_make_socket_nonblocking(fd)<0) - goto done; ownfd = 1; } if (sa) { |