From b8bcf0c87de73b144a6de739aee83831c379f266 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Mon, 26 Jun 2017 14:53:19 +0100
Subject: [PATCH 1/2] No longer merge proxy and remaining args.

`proxy_parse_args` is currently called:

- once, all the time
- again, if Docker is configured with TLS.

If a second call to `proxy_parse_args` happens, given the way we append to `PROXY_ARGS` and merge proxy and remaining args, genuine arguments like peers can be mixed with flags/options/etc. hence forming an invalid peers list and crashing Weave Net.
---
 weave | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/weave b/weave
index a6be905c..d1a4f716 100755
--- a/weave
+++ b/weave
@@ -1059,7 +1059,6 @@ host_arg() {
 }
 
 proxy_parse_args() {
-    args=""
     while [ $# -gt 0 ]; do
         case "$1" in
           -H)
@@ -1098,16 +1097,15 @@ proxy_parse_args() {
             tls_arg "${1%%=*}" "${1#*=}" key
             ;;
           *)
-            args="$args $1"
+            REMAINING_ARGS="$REMAINING_ARGS $1"
             ;;
         esac
         shift
     done
-    # Merge proxy options and other args, keeping $args at the end, as these could contain peers:
-    PROXY_ARGS="$PROXY_ARGS $args"
 }
 
 proxy_args() {
+    REMAINING_ARGS=""
     PROXY_VOLUMES=""
     PROXY_ARGS=""
     PROXY_TLS_ENABLED=""
@@ -1291,7 +1289,8 @@ launch() {
         --http-addr $HTTP_ADDR \
         --status-addr $STATUS_ADDR \
         --resolv-conf "/var/run/weave/etc/$RESOLV_CONF_BASE" \
-        $PROXY_ARGS)
+        $PROXY_ARGS \
+        $REMAINING_ARGS)
     wait_for_status $CONTAINER_NAME http_call $HTTP_ADDR
 }
 

From 81c4a0ffce33e150b824736d0c9a60579c177c4c Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Tue, 27 Jun 2017 10:23:36 +0100
Subject: [PATCH 2/2] Temporarily increase tests' timeout.

---
 test/run_all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/run_all.sh b/test/run_all.sh
index 7d8c6edd..bb2cfcf2 100755
--- a/test/run_all.sh
+++ b/test/run_all.sh
@@ -23,4 +23,4 @@ if [ -n "$CIRCLECI" -o -n "$PARALLEL" ]; then
     RUNNER_ARGS="$RUNNER_ARGS -parallel"
 fi
 
-HOSTS="$HOSTS" "${DIR}/../tools/runner/runner" $RUNNER_ARGS $TESTS
+HOSTS="$HOSTS" "${DIR}/../tools/runner/runner" -timeout=240 $RUNNER_ARGS $TESTS