aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2010-03-30 04:20:55 +0000
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-04-29 20:21:20 +0200
commitda34ad97ecb87d7dbc4d48cfd79586099e2ebdd5 (patch)
tree5b1706fd4ad561667b28434658a694b0cec6b2c7
parentAdded mapping files from SVN commit ID to more descriptive commit IDs. (diff)
downloadopenvpn-da34ad97ecb87d7dbc4d48cfd79586099e2ebdd5.tar.xz
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
-rw-r--r--version.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/version.m4 b/version.m4
index 5723d3c..f9c399b 100644
--- 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])