Merge branch 'maint'

Conflicts:
	OTP_VERSION
	erts/emulator/sys/unix/sys.c
	erts/vsn.mk

6 files changed, 124 insertions, 77 deletions

diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl
index 53b776c4e7..54425740b5 100644
--- a/lib/inets/src/http_lib/http_internal.hrl
+++ b/lib/inets/src/http_lib/http_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2015. 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
@@ -28,6 +28,7 @@
 -define(HTTP_MAX_URI_SIZE,    nolimit).
 -define(HTTP_MAX_VERSION_STRING, 8).
 -define(HTTP_MAX_METHOD_STRING, 20).
+-define(HTTP_MAX_CONTENT_LENGTH, 100000000).
 
 -ifndef(HTTP_DEFAULT_SSL_KIND).
 -define(HTTP_DEFAULT_SSL_KIND, essl).
diff --git a/lib/inets/src/http_lib/http_request.erl b/lib/inets/src/http_lib/http_request.erl
index f295453bdd..a0833ddf01 100644
--- a/lib/inets/src/http_lib/http_request.erl
+++ b/lib/inets/src/http_lib/http_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2015. 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
@@ -21,8 +21,16 @@
 
 -include("http_internal.hrl").
 
--export([headers/2, http_headers/1, is_absolut_uri/1]).
+-export([headers/2, http_headers/1, is_absolut_uri/1, key_value/1]).
 
+
+key_value(KeyValueStr) ->
+    case lists:splitwith(fun($:) -> false; (_) -> true end, KeyValueStr) of
+	{Key, [$: | Value]} ->
+	    {http_util:to_lower(string:strip(Key)),  string:strip(Value)};
+	{_, []} -> 
+	    undefined
+    end.
 %%-------------------------------------------------------------------------
 %% headers(HeaderList, #http_request_h{}) -> #http_request_h{}
 %%   HeaderList - ["HeaderField:Value"]     	
@@ -34,14 +42,12 @@
 %%-------------------------------------------------------------------------
 headers([], Headers) ->
     Headers;
-headers([Header | Tail], Headers) ->  
-    case lists:splitwith(fun($:) -> false; (_) -> true end, Header) of
-	{Key, [$: | Value]}  ->
-	    headers(Tail, headers(http_util:to_lower(string:strip(Key)), 
-				  string:strip(Value), Headers));
-	{_, []} -> 
-	    headers(Tail, Headers)
-    end.
+headers([{Key, Value} | Tail], Headers) ->  
+    headers(Tail, headers(Key, Value, Headers));
+headers([undefined], Headers) -> 
+    Headers;
+headers(KeyValues, Headers) -> 
+    headers([key_value(KeyValue) || KeyValue <-  KeyValues], Headers).
 
 %%-------------------------------------------------------------------------
 %% headers(#http_request_h{}) -> HeaderList
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index 8f68d9fcd5..78dda794db 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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
@@ -205,13 +205,13 @@ load("MaxURISize " ++ MaxHeaderSize, []) ->
                           " is an invalid number of MaxHeaderSize")}
     end;
 
-load("MaxBodySize " ++ MaxBodySize, []) ->
-    case make_integer(MaxBodySize) of
+load("MaxContentLength " ++ Max, []) ->
+    case make_integer(Max) of
         {ok, Integer} ->
-            {ok, [], {max_body_size,Integer}};
+            {ok, [], {max_content_length, Integer}};
         {error, _} ->
-            {error, ?NICE(clean(MaxBodySize) ++
-                          " is an invalid number of MaxBodySize")}
+            {error, ?NICE(clean(Max) ++
+			      " is an invalid number of MaxContentLength")}
     end;
 
 load("ServerName " ++ ServerName, []) ->
@@ -337,7 +337,7 @@ load("MaxKeepAliveRequest " ++  MaxRequests, []) ->
 load("KeepAliveTimeout " ++ Timeout, []) ->
     case make_integer(Timeout) of
 	{ok, Integer} ->
-	    {ok, [], {keep_alive_timeout, Integer*1000}};
+	    {ok, [], {keep_alive_timeout, Integer}};
 	{error, _} ->
 	    {error, ?NICE(clean(Timeout)++" is an invalid KeepAliveTimeout")}
     end;
@@ -569,6 +569,12 @@ validate_config_params([{max_body_size, Value} | Rest])
 validate_config_params([{max_body_size, Value} | _]) -> 
     throw({max_body_size, Value});
 
+validate_config_params([{max_content_length, Value} | Rest]) 
+  when is_integer(Value) andalso (Value > 0) ->
+    validate_config_params(Rest);
+validate_config_params([{max_content_length, Value} | _]) -> 
+    throw({max_content_length, Value});
+
 validate_config_params([{server_name, Value} | Rest])  
   when is_list(Value) ->
     validate_config_params(Rest);
@@ -635,7 +641,7 @@ validate_config_params([{max_keep_alive_request, Value} | Rest])
   when is_integer(Value) andalso (Value > 0) ->
     validate_config_params(Rest);
 validate_config_params([{max_keep_alive_request, Value} | _]) ->
-    throw({max_header_size, Value});
+    throw({max_keep_alive_request, Value});
 
 validate_config_params([{keep_alive_timeout, Value} | Rest]) 
   when is_integer(Value) andalso (Value >= 0) ->
@@ -799,7 +805,7 @@ store({server_tokens, ServerTokens} = Entry, _ConfigList) ->
     Server = server(ServerTokens), 
     {ok, [Entry, {server, Server}]};
 store({keep_alive_timeout, KeepAliveTimeout}, _ConfigList) ->
-    {ok, {keep_alive_timeout, KeepAliveTimeout * 1000}};
+    {ok, {keep_alive_timeout, KeepAliveTimeout}};
 store(ConfigListEntry, _ConfigList) ->
     {ok, ConfigListEntry}.
 
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 712c73599f..6985065c3e 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2015. 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
@@ -118,18 +118,17 @@ validate(Method, Uri, Version) ->
 %% create it.
 %% ----------------------------------------------------------------------
 update_mod_data(ModData, Method, RequestURI, HTTPVersion, Headers)-> 
-    ParsedHeaders =  tagup_header(Headers),
-    PersistentConn = get_persistens(HTTPVersion, ParsedHeaders, 
+    PersistentConn = get_persistens(HTTPVersion, Headers, 
 				    ModData#mod.config_db),
     {ok, ModData#mod{data = [],
 		     method = Method,
 		     absolute_uri = format_absolute_uri(RequestURI, 
-							ParsedHeaders),
+							Headers),
 		     request_uri = format_request_uri(RequestURI),
 		     http_version = HTTPVersion,
 		     request_line = Method ++ " " ++ RequestURI ++ 
 		     " " ++ HTTPVersion,
-		     parsed_header = ParsedHeaders,
+		     parsed_header = Headers,
 		     connection = PersistentConn}}.
 
 %%%========================================================================
@@ -146,14 +145,14 @@ parse_method(_, _, _, Max, _, _) ->
     %% We do not know the version of the client as it comes after the
     %% method send the lowest version in the response so that the client
     %% will be able to handle it.
-    {error, {too_long, Max, 413, "Method unreasonably long"}, lowest_version()}.
+    {error, {size_error, Max, 413, "Method unreasonably long"}, lowest_version()}.
 
 parse_uri(_, _, Current, MaxURI, _, _) 
   when (Current > MaxURI) andalso (MaxURI =/= nolimit) -> 
     %% We do not know the version of the client as it comes after the
     %% uri send the lowest version in the response so that the client
     %% will be able to handle it.
-    {error, {too_long, MaxURI, 414, "URI unreasonably long"},lowest_version()};
+    {error, {size_error, MaxURI, 414, "URI unreasonably long"},lowest_version()};
 parse_uri(<<>>, URI, Current, Max, MaxSizes, Result) ->
     {?MODULE, parse_uri, [URI, Current, Max, MaxSizes, Result]};
 parse_uri(<<?SP, Rest/binary>>, URI, _, _, MaxSizes, Result) -> 
@@ -179,12 +178,12 @@ parse_version(<<?CR>> = Data, Version, Current, Max, MaxSizes, Result) ->
 parse_version(<<Octet, Rest/binary>>, Version, Current, Max, MaxSizes, Result)  when Current =< Max ->
     parse_version(Rest, [Octet | Version], Current + 1, Max, MaxSizes, Result);
 parse_version(_, _, _, Max,_,_) ->
-    {error, {too_long, Max, 413, "Version string unreasonably long"}, lowest_version()}.
+    {error, {size_error, Max, 413, "Version string unreasonably long"}, lowest_version()}.
 
 parse_headers(_, _, _, Current, Max, _, Result) 
   when Max =/= nolimit andalso Current > Max -> 
     HttpVersion = lists:nth(3, lists:reverse(Result)),
-    {error, {too_long, Max, 413, "Headers unreasonably long"}, HttpVersion};
+    {error, {size_error, Max, 413, "Headers unreasonably long"}, HttpVersion};
 
 parse_headers(<<>>, Header, Headers, Current, Max, MaxSizes, Result) ->
     {?MODULE, parse_headers, [<<>>, Header, Headers, Current, Max, 
@@ -204,14 +203,22 @@ parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], _, _,  _, Result) ->
 					     Result])),
     {ok, NewResult};
 parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, _, _,
-	      _, Result) ->
-    HTTPHeaders = [lists:reverse(Header) | Headers],
-    RequestHeaderRcord = 
-	http_request:headers(HTTPHeaders, #http_request_h{}),
-    NewResult = 
-	list_to_tuple(lists:reverse([Body, {RequestHeaderRcord, 
-						    HTTPHeaders} | Result])),
-    {ok, NewResult};
+	      MaxSizes, Result) ->
+    case http_request:key_value(lists:reverse(Header)) of
+	undefined -> %% Skip headers with missing :
+	    {ok, list_to_tuple(lists:reverse([Body, {http_request:headers(Headers, #http_request_h{}), Headers} | Result]))};
+	NewHeader ->
+	    case check_header(NewHeader, MaxSizes) of 
+		ok ->
+		    {ok, list_to_tuple(lists:reverse([Body, {http_request:headers([NewHeader | Headers], 
+										  #http_request_h{}),  
+							     [NewHeader | Headers]} | Result]))};
+		
+		{error, Reason} ->
+		    HttpVersion = lists:nth(3, lists:reverse(Result)),
+		    {error, Reason, HttpVersion}
+	    end
+    end;
 
 parse_headers(<<?CR,?LF,?CR>> = Data, Header, Headers, Current, Max, 
 	      MaxSizes, Result) ->
@@ -243,8 +250,21 @@ parse_headers(<<?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
 		  MaxSizes, Result); 
 parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, _, Max,
 	      MaxSizes, Result) ->
-    parse_headers(Rest, [Octet], [lists:reverse(Header) | Headers], 
-		  0, Max, MaxSizes, Result);
+    case http_request:key_value(lists:reverse(Header)) of
+	undefined -> %% Skip headers with missing :
+	    parse_headers(Rest, [Octet], Headers, 
+			  0, Max, MaxSizes, Result);
+	NewHeader ->
+	    case check_header(NewHeader, MaxSizes) of 
+		ok ->
+		    parse_headers(Rest, [Octet], [NewHeader | Headers], 
+				  0, Max, MaxSizes, Result);
+		{error, Reason} ->
+		    HttpVersion = lists:nth(3, lists:reverse(Result)),
+		    {error, Reason, HttpVersion}
+	    end
+    end;
+	
 parse_headers(<<?CR>> = Data, Header, Headers, Current, Max,  
 	      MaxSizes, Result) ->
     {?MODULE, parse_headers, [Data, Header, Headers, Current, Max, 
@@ -388,29 +408,25 @@ get_persistens(HTTPVersion,ParsedHeader,ConfigDB)->
 	    false
     end.
 
-
-%%----------------------------------------------------------------------
-%% tagup_header
-%%
-%% Parses the header of a HTTP request and returns a key,value tuple 
-%% list containing Name and Value of each header directive as of:
-%%
-%% Content-Type: multipart/mixed -> {"Content-Type", "multipart/mixed"}
-%%
-%% But in http/1.1 the field-names are case insencitive so now it must be 
-%% Content-Type: multipart/mixed -> {"content-type", "multipart/mixed"}
-%% The standard furthermore says that leading and traling white space 
-%% is not a part of the fieldvalue and shall therefore be removed.
-%%----------------------------------------------------------------------
-tagup_header([]) ->          [];
-tagup_header([Line|Rest]) -> [tag(Line, [])|tagup_header(Rest)].
-
-tag([], Tag) ->
-    {http_util:to_lower(lists:reverse(Tag)), ""};
-tag([$:|Rest], Tag) ->
-    {http_util:to_lower(lists:reverse(Tag)), string:strip(Rest)};
-tag([Chr|Rest], Tag) ->
-    tag(Rest, [Chr|Tag]).
-
 lowest_version()->    
     "HTTP/0.9".
+
+check_header({"content-length", Value}, Maxsizes) ->
+    Max = proplists:get_value(max_content_length, Maxsizes),
+    MaxLen = length(integer_to_list(Max)),
+    case length(Value) =< MaxLen of
+	true ->
+	    try 
+		_ = list_to_integer(Value),
+		ok
+	    catch _:_ ->
+		    {error, {size_error, Max, 411, "content-length not an integer"}}
+	    end;
+	false ->
+	    {error, {size_error, Max, 413, "content-length unreasonably long"}}
+    end;
+check_header(_, _) ->
+    ok.
+	    
+	    
+	    
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index 9bea58cc9e..f7a9fe5d49 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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
@@ -96,8 +96,9 @@ init([Manager, ConfigDB, AcceptTimeout]) ->
     proc_lib:init_ack({ok, self()}),
     
     {SocketType, Socket} = await_socket_ownership_transfer(AcceptTimeout),
- 
-    KeepAliveTimeOut = httpd_util:lookup(ConfigDB, keep_alive_timeout, 150000),
+    
+    %%Timeout value is in seconds we want it in milliseconds
+    KeepAliveTimeOut = 1000 * httpd_util:lookup(ConfigDB, keep_alive_timeout, 150),
     
     case http_transport:negotiate(SocketType, Socket, ?HANDSHAKE_TIMEOUT) of
 	{error, _Error} ->
@@ -119,11 +120,15 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
     MaxHeaderSize = max_header_size(ConfigDB), 
     MaxURISize    = max_uri_size(ConfigDB), 
     NrOfRequest   = max_keep_alive_request(ConfigDB), 
-    
+    MaxContentLen = max_content_length(ConfigDB),
+
     {_, Status} = httpd_manager:new_connection(Manager),
     
     MFA = {httpd_request, parse, [[{max_uri, MaxURISize}, {max_header, MaxHeaderSize},
-				   {max_version, ?HTTP_MAX_VERSION_STRING}, {max_method, ?HTTP_MAX_METHOD_STRING}]]}, 
+				   {max_version, ?HTTP_MAX_VERSION_STRING}, 
+				   {max_method, ?HTTP_MAX_METHOD_STRING},
+				   {max_content_length, MaxContentLen}
+				  ]]}, 
 
     State = #state{mod                    = Mod, 
 		   manager                = Manager, 
@@ -207,7 +212,7 @@ handle_info({Proto, Socket, Data},
 			       set_new_data_size(cancel_request_timeout(State), NewDataSize)
 		       end,
             handle_http_msg(Result, NewState); 
-	{error, {too_long, MaxSize, ErrCode, ErrStr}, Version} ->
+	{error, {size_error, MaxSize, ErrCode, ErrStr}, Version} ->
 	    NewModData =  ModData#mod{http_version = Version},
 	    httpd_response:send_status(NewModData, ErrCode, ErrStr),
 	    Reason = io_lib:format("~p: ~p max size is ~p~n", 
@@ -444,8 +449,7 @@ handle_body(#state{headers = Headers, body = Body, mod = ModData} = State,
 	    error_log(Reason, ModData),
 	    {stop, normal, State#state{response_sent = true}};
 	_ -> 
-	    Length = 
-		list_to_integer(Headers#http_request_h.'content-length'),
+	    Length = list_to_integer(Headers#http_request_h.'content-length'),	    
 	    case ((Length =< MaxBodySize) or (MaxBodySize == nolimit)) of
 		true ->
 		    case httpd_request:whole_body(Body, Length) of 
@@ -454,7 +458,7 @@ handle_body(#state{headers = Headers, body = Body, mod = ModData} = State,
 						   ModData#mod.socket, 
 						   [{active, once}]),
 			    {noreply, State#state{mfa = 
-						  {Module, Function, Args}}};
+						      {Module, Function, Args}}};
 			
 			{ok, NewBody} ->
 			    handle_response(
@@ -471,7 +475,7 @@ handle_body(#state{headers = Headers, body = Body, mod = ModData} = State,
 handle_expect(#state{headers = Headers, mod = 
 		     #mod{config_db = ConfigDB} = ModData} = State, 
 	      MaxBodySize) ->
-    Length = Headers#http_request_h.'content-length',
+    Length = list_to_integer(Headers#http_request_h.'content-length'),
     case expect(Headers, ModData#mod.http_version, ConfigDB) of
 	continue when (MaxBodySize > Length) orelse (MaxBodySize =:= nolimit) ->
 	    httpd_response:send_status(ModData, 100, ""),
@@ -545,9 +549,13 @@ handle_next_request(#state{mod = #mod{connection = true} = ModData,
  		      init_data   = ModData#mod.init_data},
     MaxHeaderSize = max_header_size(ModData#mod.config_db), 
     MaxURISize    = max_uri_size(ModData#mod.config_db), 
+    MaxContentLen = max_content_length(ModData#mod.config_db),
 
     MFA = {httpd_request, parse, [[{max_uri, MaxURISize}, {max_header, MaxHeaderSize},
-				   {max_version, ?HTTP_MAX_VERSION_STRING}, {max_method, ?HTTP_MAX_METHOD_STRING}]]}, 
+				   {max_version, ?HTTP_MAX_VERSION_STRING}, 
+				   {max_method, ?HTTP_MAX_METHOD_STRING},
+				   {max_content_length, MaxContentLen}
+				  ]]}, 
     TmpState = State#state{mod                    = NewModData,
 			   mfa                    = MFA,
 			   max_keep_alive_request = decrease(Max),
@@ -630,3 +638,5 @@ max_body_size(ConfigDB) ->
 max_keep_alive_request(ConfigDB) ->
     httpd_util:lookup(ConfigDB, max_keep_alive_request, infinity).
 
+max_content_length(ConfigDB) ->    
+    httpd_util:lookup(ConfigDB, max_content_length, ?HTTP_MAX_CONTENT_LENGTH).
diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl
index 0b9fe4cfe0..5039cd56b5 100644
--- a/lib/inets/src/http_server/mod_alias.erl
+++ b/lib/inets/src/http_server/mod_alias.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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
@@ -55,6 +55,7 @@ do(#mod{data = Data} = Info) ->
 
 do_alias(#mod{config_db   = ConfigDB, 
 	      request_uri = ReqURI,
+	      socket_type = SocketType,
 	      data        = Data}) ->
     {ShortPath, Path, AfterPath} = 
 	real_name(ConfigDB, ReqURI, which_alias(ConfigDB)),
@@ -70,8 +71,9 @@ do_alias(#mod{config_db   = ConfigDB,
 			     (LastChar =/= $/)) ->
 	    ?hdrt("directory and last-char is a /", []),
 	    ServerName = which_server_name(ConfigDB), 
-	    Port = port_string( which_port(ConfigDB) ),
-	    URL = "http://" ++ ServerName ++ Port ++ ReqURI ++ "/",
+	    Port = port_string(which_port(ConfigDB)),
+	    Protocol = get_protocol(SocketType),
+	    URL = Protocol ++ ServerName ++ Port ++ ReqURI ++ "/",
 	    ReasonPhrase = httpd_util:reason_phrase(301),
 	    Message = httpd_util:message(301, URL, ConfigDB),
 	    {proceed,
@@ -94,6 +96,12 @@ port_string(80) ->
 port_string(Port) ->
     ":" ++ integer_to_list(Port).
 
+get_protocol(ip_comm) ->
+    "http://";
+get_protocol(_) ->
+    %% Should clean up to have only one ssl type essl vs ssl is not relevant any more
+    "https://".
+
 %% real_name
 
 real_name(ConfigDB, RequestURI, []) ->