Set socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after

socket is created rather than waiting until after connect/listen.

Version 2.1.1d

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5514 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/version.m4 b/version.m4
index 5723d3c50eb91623e7a959bed92e9a2389b30ea3..f9c399b77c0134b61dd13f21260fe0daa6273d45 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,6 @@
 dnl define the OpenVPN version
 define(PRODUCT_VERSION,[2.1.1g])
+>>>>>>> Set socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])