summaryrefslogtreecommitdiffstats
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-05-16 19:27:31 +0200
commit69adb93d03199a9701953d2e911b30c9e93bbc29 (patch)
tree288e6e0e5145964c81e43996059b3f7c00eefec7
parent9ffa93d36d92279a45566c43b9181db7cd7ca524 (diff)
downloadopenvpn-69adb93d03199a9701953d2e911b30c9e93bbc29.tar.gz
openvpn-69adb93d03199a9701953d2e911b30c9e93bbc29.tar.xz
openvpn-69adb93d03199a9701953d2e911b30c9e93bbc29.zip
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])