From 83fbcdfb0e4d3587185a1f1ee0d06bfb462bbc59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstro=CC=88m?= <erik@hedenstroem.com>
Date: Mon, 11 Apr 2016 16:53:58 +0200
Subject: [PATCH] Added packet framing for hijack
---
apps/consul_proxy/src/consul_proxy.app.src | 2 +-
apps/consul_proxy/src/consul_proxy_middleware_hijack.erl | 1 +
rebar.config | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/consul_proxy/src/consul_proxy.app.src b/apps/consul_proxy/src/consul_proxy.app.src
index fdc2b86..08a0d24 100644
--- a/apps/consul_proxy/src/consul_proxy.app.src
+++ b/apps/consul_proxy/src/consul_proxy.app.src
@@ -1,6 +1,6 @@
{application, consul_proxy, [
{description, "Proxy for docker swarm using consul and vegur"},
- {vsn, "0.4.4"},
+ {vsn, "0.5.0"},
{registered, []},
{mod, {consul_proxy_app, []}},
{applications, [
diff --git a/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl b/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl
index da8199f..f168d91 100644
--- a/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl
+++ b/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl
@@ -78,6 +78,7 @@ execute(Req, Env) ->
%%====================================================================
start_link(Ref, Socket, Transport, Opts) ->
+ ok = Transport:setopts(Socket, [binary, {active, false}, {packet, 4}, {reuseaddr, true}, {nodelay, true}]),
Pid = spawn_link(?MODULE, init, [Ref, Socket, Transport, Opts]),
{ok, Pid}.
diff --git a/rebar.config b/rebar.config
index 4c58255..058fc06 100644
--- a/rebar.config
+++ b/rebar.config
@@ -18,7 +18,7 @@
]}.
{relx, [
- {release, {consul_proxy, "0.4.4"}, [consul_proxy]}, {sys_config, "./config/sys.config"},
+ {release, {consul_proxy, "0.5.0"}, [consul_proxy]}, {sys_config, "./config/sys.config"},
{vm_args, "./config/vm.args"},
{dev_mode, true},
{include_erts, false},
--
GitLab