diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-05-16 19:35:08 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-05-16 19:35:08 +0200 |
| commit | 942e05525ac2cbf4a258c7b8f514a058cd00486b (patch) | |
| tree | a0c2ffb02472271b5bf84855c050a1b8fe1ae2b2 /socket.c | |
| parent | Avoid repetition of "this config may cache passwords in memory" (v2) (diff) | |
| parent | Cleaning up after rebase (diff) | |
| download | openvpn-942e05525ac2cbf4a258c7b8f514a058cd00486b.tar.xz | |
Merge branch 'master' into bugfix2.1
Conflicts:
openvpn.8
--http-proxy is enhanced with auth-nct for auth (no-clear-text)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'socket.c')
| -rw-r--r-- | socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -485,7 +485,7 @@ socket_set_buffers (int fd, const struct socket_buffer_size *sbs) static bool socket_set_tcp_nodelay (int sd, int state) { -#if defined(HAVE_SETSOCKOPT) && defined(IPPROTO_TCP) && defined(TCP_NODELAY) +#if defined(WIN32) || (defined(HAVE_SETSOCKOPT) && defined(IPPROTO_TCP) && defined(TCP_NODELAY)) if (setsockopt (sd, IPPROTO_TCP, TCP_NODELAY, (void *) &state, sizeof (state)) != 0) { msg (M_WARN, "NOTE: setsockopt TCP_NODELAY=%d failed", state); |