authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-05 12:45:39-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-05 12:45:39-04:00
log0a2104689b4c3c686f2268b5053ad38fd01c1d55
tree24233d8b1ead2b4fc76efb166fd41c174e3c43fc
parente6955688ac2255d3813e8d2994b6661bc651369b

fix incorrect flags being set in os.setSockFlags

fixes networking stuff on darwin

1 files changed, 2 insertions(+), 2 deletions(-)

lib/std/os.zig+2-2
......@@ -3283,7 +3283,7 @@ fn setSockFlags(fd: fd_t, flags: u32) !void {
32833283 error.Locked => unreachable,
32843284 else => |e| return e,
32853285 };
3286 if ((flags & SOCK_NONBLOCK) != 0) fd_flags |= FD_CLOEXEC;
3286 if ((flags & SOCK_CLOEXEC) != 0) fd_flags |= FD_CLOEXEC;
32873287 _ = fcntl(fd, F_SETFD, fd_flags) catch |err| switch (err) {
32883288 error.FileBusy => unreachable,
32893289 error.Locked => unreachable,
......@@ -3296,7 +3296,7 @@ fn setSockFlags(fd: fd_t, flags: u32) !void {
32963296 error.Locked => unreachable,
32973297 else => |e| return e,
32983298 };
3299 if ((flags & SOCK_CLOEXEC) != 0) fl_flags |= O_NONBLOCK;
3299 if ((flags & SOCK_NONBLOCK) != 0) fl_flags |= O_NONBLOCK;
33003300 _ = fcntl(fd, F_SETFL, fl_flags) catch |err| switch (err) {
33013301 error.FileBusy => unreachable,
33023302 error.Locked => unreachable,