merge default ⇨ bug 21673

6 files changed, 13 insertions, 15 deletions

diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile
index 243864e1f1..d5633955b9 100644
--- a/packaging/macports/Makefile
+++ b/packaging/macports/Makefile
@@ -38,10 +38,6 @@ macports: dirs $(DEST)/Portfile
 	sed -i -e 's|@SU_RABBITMQ_SH_C@|sudo -E -u rabbitmq -H /bin/sh -c|' \
 	    $(DEST)/files/rabbitmq-script-wrapper
 	cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files
-
-# This target ssh's into the OSX host in order to finalize the
-# macports repo
-macports_index:
 	if [ -n "$(MACPORTS_USERHOST)" ] ; then \
 	  tar cf - -C $(MACPORTS_DIR) . | ssh $(SSH_OPTS) lshift@macrabbit ' \
 	    d="/tmp/mkportindex.$$$$" ; \
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index f17fe77742..c9e818ac8b 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -22,7 +22,7 @@ dist:
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)
 	pod2text --loose rabbitmq-service.pod $(TARGET_DIR)/readme-service.txt
-	unix2dos $(TARGET_DIR)/readme-service.txt
+	todos $(TARGET_DIR)/readme-service.txt
 	zip -r $(TARGET_ZIP).zip $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)
 
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 907dce36c8..8341d35c8c 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -40,8 +40,8 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq
 
 DEFAULT_NODE_IP_ADDRESS=0.0.0.0
 DEFAULT_NODE_PORT=5672
-[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
 then
     if [ "x" != "x$RABBITMQ_NODE_PORT" ]
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index dde0dea238..638498c1e2 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -44,8 +44,8 @@ SERVER_START_ARGS=
 
 DEFAULT_NODE_IP_ADDRESS=0.0.0.0
 DEFAULT_NODE_PORT=5672
-[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
 then
     if [ "x" != "x$RABBITMQ_NODE_PORT" ]
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index dddffee700..9cb2c03cd7 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -222,9 +222,8 @@ run_rabbitmq_server() ->
              {win32, fun run_rabbitmq_server_win32/0}]).
 
 run_rabbitmq_server_unix() ->
-    FullPath = getenv("RABBITMQ_SCRIPT_HOME") ++ "/rabbitmq-server",
-    erlang:open_port({spawn_executable, FullPath},
-                     [{arg0, FullPath}, {args, ["-noinput"]}, nouse_stdio]).
+    CmdLine = getenv("RABBITMQ_SCRIPT_HOME") ++ "/rabbitmq-server -noinput",
+    erlang:open_port({spawn, CmdLine}, [nouse_stdio]).
 
 run_rabbitmq_server_win32() ->
     Cmd = filename:nativename(os:find_executable("cmd")),
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index ec736199f5..f77640dff4 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -31,7 +31,7 @@
 
 -module(rabbit_tests).
 
--compile(export_all).
+-compile([export_all]).
 
 -export([all_tests/0, test_parsing/0]).
 
@@ -277,7 +277,7 @@ test_simple_n_element_queue(N) ->
 test_pg_local() ->
     [P, Q] = [spawn(fun () -> receive X -> X end end) || _ <- [x, x]],
     check_pg_local(ok, [], []),
-    check_pg_local(pg_local:join(a, P), [P], []), 
+    check_pg_local(pg_local:join(a, P), [P], []),
     check_pg_local(pg_local:join(b, P), [P], [P]),
     check_pg_local(pg_local:join(a, P), [P, P], [P]),
     check_pg_local(pg_local:join(a, Q), [P, P, Q], [P]),
@@ -287,7 +287,10 @@ test_pg_local() ->
     check_pg_local(pg_local:leave(b, P), [P, Q], [Q, Q]),
     check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]),
     check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]),
-    [X ! done || X <- [P, Q]],
+    [begin X ! done,
+           Ref = erlang:monitor(process, X),
+           receive {'DOWN', Ref, process, X, _Info} -> ok end
+     end  || X <- [P, Q]],
     check_pg_local(ok, [], []),
     passed.