Merge branch 'maint' into sverk/trace-process_dump-matchstate

Conflicts:
	erts/emulator/beam/erl_printf_term.c
	erts/emulator/beam/erl_term.c
	erts/emulator/beam/utils.c

1 files changed, 23 insertions, 19 deletions

diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index 3da0343401..763ddae524 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -3,16 +3,17 @@
 %%
 %% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -28,7 +29,7 @@
 -export([start/2, start_link/2, start_link/3, start_link/4, 
 	 stop/1, reload/2]).
 -export([new_connection/1]).
--export([config_match/2, config_match/3]).
+-export([config_match/3, config_match/4]).
 -export([block/2, block/3, unblock/1]).
 
 %% gen_server exports
@@ -54,7 +55,8 @@
 start(ConfigFile, ConfigList) ->
     Port = proplists:get_value(port,ConfigList,80),
     Addr = proplists:get_value(bind_address, ConfigList),
-    Name = make_name(Addr,Port),
+    Profile = proplists:get_value(profile, ConfigList, default),
+    Name = make_name(Addr, Port, Profile),
     gen_server:start({local,Name},?MODULE,
 		     [ConfigFile, ConfigList, 15000, Addr, Port],[]).
 
@@ -65,7 +67,8 @@ start_link(ConfigFile, ConfigList) ->
 start_link(ConfigFile, ConfigList, AcceptTimeout) ->
     Port = proplists:get_value(port, ConfigList, 80),
     Addr = proplists:get_value(bind_address, ConfigList),
-    Name = make_name(Addr, Port),
+    Profile = proplists:get_value(profile, ConfigList, default),
+    Name = make_name(Addr, Port, Profile),
     
     gen_server:start_link({local, Name},?MODULE,
 			  [ConfigFile, ConfigList, 
@@ -74,7 +77,8 @@ start_link(ConfigFile, ConfigList, AcceptTimeout) ->
 start_link(ConfigFile, ConfigList, AcceptTimeout, ListenSocket) ->
     Port = proplists:get_value(port, ConfigList, 80),
     Addr = proplists:get_value(bind_address, ConfigList),
-    Name = make_name(Addr, Port),
+    Profile = proplists:get_value(profile, ConfigList, default),
+    Name = make_name(Addr, Port, Profile),
     
     gen_server:start_link({local, Name},?MODULE,
 			  [ConfigFile, ConfigList, AcceptTimeout, Addr, 
@@ -97,10 +101,10 @@ unblock(ServerRef) ->
 new_connection(Manager) ->
     call(Manager, {new_connection, self()}).
 
-config_match(Port, Pattern) ->
-    config_match(undefined,Port,Pattern).
-config_match(Addr, Port, Pattern) ->
-    Name = httpd_util:make_name("httpd",Addr,Port),
+config_match(Port, Profile, Pattern) ->
+    config_match(undefined,Port, Profile, Pattern).
+config_match(Addr, Port, Profile, Pattern) ->
+    Name = httpd_util:make_name("httpd",Addr,Port, Profile),
     call(whereis(Name), {config_match, Pattern}).
 
 %%%--------------------------------------------------------------------
@@ -446,8 +450,8 @@ get_ustate(ConnectionCnt,State) ->
 	    active
     end.
 
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd",Addr,Port).
+make_name(Addr, Port, Profile) ->
+    httpd_util:make_name("httpd", Addr, Port, Profile).
 
 
 report_error(State,String) ->